From edfb6b3beff7747750ca9a8ed1675e7d4e79fac1 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 18 May 2016 15:31:24 +0000
Subject: [PATCH] Move cert/key paths into the cert class

The snakeoil fallback defaults need to be set in the cert class,
not as defaults in the module init.

Change-Id: Id1f5dd081fa085775b96c0e374055aded203148a
Depends-On: Ifc92d78f081fc69d804c29033e96e1c94462213b
---
 manifests/cert.pp | 4 ++--
 manifests/init.pp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/cert.pp b/manifests/cert.pp
index a82b20c..27e5f2e 100644
--- a/manifests/cert.pp
+++ b/manifests/cert.pp
@@ -21,10 +21,10 @@
 #
 class storyboard::cert (
   $ssl_cert_content = undef,
-  $ssl_cert         = '/etc/ssl/certs/storyboard.pem',
+  $ssl_cert         = '/etc/ssl/certs/ssl-cert-snakeoil.pem',
 
   $ssl_key_content  = undef,
-  $ssl_key          = '/etc/ssl/private/storyboard.key',
+  $ssl_key          = '/etc/ssl/private/ssl-cert-snakeoil.key',
 
   $ssl_ca_content   = undef,
   $ssl_ca           = undef, # '/etc/ssl/certs/ca.pem'
diff --git a/manifests/init.pp b/manifests/init.pp
index 5ddcf5d..a095f26 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -33,9 +33,9 @@ class storyboard (
   $openid_url          = 'https://login.launchpad.net/+openid',
 
   $ssl_cert_content    = undef,
-  $ssl_cert            = '/etc/ssl/certs/ssl-cert-snakeoil.pem',
+  $ssl_cert            = undef,
   $ssl_key_content     = undef,
-  $ssl_key             = '/etc/ssl/private/ssl-cert-snakeoil.key',
+  $ssl_key             = undef,
   $ssl_ca_content      = undef,
   $ssl_ca              = undef,
 ) {