Add apache::mod::ssl and update vhosts appropriately

open-dai · Aug 17, 2012 · ee37f21 · ee37f21
1 parent e4c6689
commit ee37f21
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 17 deletions.
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
@@ -0,0 +1,3 @@
+class apache::mod::ssl {
+  apache::mod { 'ssl': }
+}
diff --git a/manifests/ssl.pp b/manifests/ssl.pp
@@ -13,18 +13,6 @@
 # Sample Usage:
 #
 class apache::ssl {
-
-  include apache
-
-  if $::osfamily == 'redhat' or $::operatingsystem == 'amazon' {
-    package { 'apache_ssl_package':
-      ensure  => installed,
-      name    => $apache::params::ssl_package,
-      require => Package['httpd'],
-    }
-  } elsif $::osfamily == 'debian' {
-    a2mod { 'ssl': ensure => present, }
-  } else {
-    fail( "${::operatingsystem} not defined in apache::ssl.")
-  }
+  warning('apache::ssl is deprecated; please use apache::mod::ssl')
+  include apache::mod::ssl
 }
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
@@ -68,7 +68,7 @@
   }
 
   if $ssl == true {
-    include apache::ssl
+    include apache::mod::ssl
   }
 
   # Since the template will use auth, redirect to https requires mod_rewrite

diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp
@@ -38,7 +38,7 @@
   $srvname = $name
 
   if $ssl == true {
-    include apache::ssl
+    include apache::mod::ssl
   }
 
   file { "${priority}-${name}":

diff --git a/tests/ssl.pp b/tests/ssl.pp