Mercurial > repos > other > Puppet

changeset 11:4b42f65ae875

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make sure that alternate TLDs get certificate chain flowed through, and fix key file check for redirects
author IBBoard <dev@ibboard.co.uk>
date Sat, 08 Nov 2014 15:36:42 +0000
parents 440ea809487c
children 72466547cc79
files modules/website/manifests/https/multitld.pp modules/website/manifests/https/redir.pp
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/modules/website/manifests/https/multitld.pp	Sat Nov 08 15:35:38 2014 +0000
+++ b/modules/website/manifests/https/multitld.pp	Sat Nov 08 15:36:42 2014 +0000
@@ -44,9 +44,10 @@
     $base_extras = prefix($extra_tlds, "${base}.")
 
     website::https::multitldredir { $base_extras:
-      ip          => $ip,
-      main_domain => $main_domain,
-      docroot     => $docroot,
+      ip            => $ip,
+      main_domain   => $main_domain,
+      ssl_ca_chain  => $ssl_ca_chain,
+      docroot       => $docroot,
       docroot_owner => $docroot_owner,
       docroot_group => $docroot_group,
     }
--- a/modules/website/manifests/https/redir.pp	Sat Nov 08 15:35:38 2014 +0000
+++ b/modules/website/manifests/https/redir.pp	Sat Nov 08 15:36:42 2014 +0000
@@ -50,7 +50,7 @@
         ensure => present;
       }
     }
-    if ! defined(File["/etc/pki/custom/$ssl_chain"]) {
+    if ! defined(File[$sslkey]) {
       file { $sslkey:
         source => "puppet:///private/pki/custom/${shortdomain}.key",
         before => Apache::Vhost[$name],