Merge till Production

manifests/init.pp

@@ -72,11 +72,11 @@ class skadereg {
     before => Service['httpd']
   }
 
-  # include ::certdist
+  include ::certdist
 
-  # $cert = "/etc/pki/tls/certs/cert-${::fqdn}.pem"
-  # $chain = "/etc/pki/tls/certs/chain-${::fqdn}.pem"
-  # $key = "/etc/pki/tls/private/${::fqdn}.key"
+  $cert = "/etc/pki/tls/certs/cert-${::fqdn}.pem"
+  $chain = "/etc/pki/tls/certs/chain-${::fqdn}.pem"
+  $key = "/etc/pki/tls/private/${::fqdn}.key"
 
   apache::vhost { 'default:80':
     servername      => $::fqdn,
@@ -91,9 +91,9 @@ class skadereg {
     servername  => $::fqdn,
     port        => '443',
     ssl         => true,
-  #  ssl_cert   => $cert,
-  #  ssl_chain  => $chain,
-  #  ssl_key    => $key,
+    ssl_cert    => $cert,
+    ssl_chain   => $chain,
+    ssl_key     => $key,
     headers     => ['Set Strict-Transport-Security "max-age=31536000"',],
     docroot     => '/var/www/skadereg/public',
     directories => [