Adds ssl_manage_cert into apache::site

diff --git a/manifests/site.pp b/manifests/site.pp
index 586d5c14a45462fae5647e4d8268fe6d93f4b98b..0086f1fd9e1449c8f2b386a32bb6dd633f9fa108 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -25,6 +25,7 @@ define apache::site(
   $shell                = '/bin/false',
   $manage_user          = true,
   $ssl                  = false,
+  $ssl_manage_cert      = false,
   $listen               = '*',
   $https_redirect       = false,
   $canonical            = false,
@@ -75,19 +76,6 @@ define apache::site(
     shell          => $shell,
   }
 
-  if $ssl == true {
-    ssl::cert { "$name":
-      group    => $gid,
-      privmode => '0640',
-      ensure   => $ensure,
-    }
-
-    ssl::check { "$name":
-      file   => "/etc/ssl/certs/$name.crt",
-      ensure => $ensure,
-    }
-  }
-
   # Legacy configuration
   file { [ "${apache::conf_sites}-available/$vhost",
            "${apache::conf_sites}-enabled/$vhost" ]:
@@ -132,6 +120,15 @@ define apache::site(
     require        => Apache::Site::Config[$name],
   }
 
+  ssl::cert { "$name":
+    group    => $gid,
+    privmode => '0640',
+    ensure   => $ssl_manage_cert ? {
+      true    => present,
+      default => absent,
+    },
+  }
+
   if $certbot == true {
     certbot::manage { $name:
       pre_hook => '/usr/sbin/service apache2 reload',