From ec079061b0867a02486a8f48c10c59fa4ed2d96e Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Sun, 25 Mar 2012 12:20:18 +0000
Subject: split mod_ssl in a separate file ( and directory to not clutter
 toplevel )

---
 modules/apache/manifests/init.pp    | 20 --------------------
 modules/apache/manifests/mod/ssl.pp | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 modules/apache/manifests/mod/ssl.pp

diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp
index d1bddc4b..6abade4f 100644
--- a/modules/apache/manifests/init.pp
+++ b/modules/apache/manifests/init.pp
@@ -57,26 +57,6 @@ class apache {
         package { "apache-mod_fastcgi": }
     }
 
-    class mod_ssl inherits base {
-        file { "/etc/ssl/apache/":
-            ensure => directory
-        }
-
-        openssl::self_signed_cert{ 'localhost':
-            directory => '/etc/ssl/apache/',
-            before => Apache::Config['/etc/httpd/conf/vhosts.d/01_default_ssl_vhost.conf'],
-        }
- 
-        package { "apache-mod_ssl": }
-
-        apache::config {
-            '/etc/httpd/conf/vhosts.d/01_default_ssl_vhost.conf':
-                content => template("apache/01_default_ssl_vhost.conf");
-            "/etc/httpd/conf.d/ssl.conf":
-                content => template("apache/ssl.conf");
-        }
-    }
-
     class mod_wsgi inherits base {
         package { "apache-mod_wsgi": }
 
diff --git a/modules/apache/manifests/mod/ssl.pp b/modules/apache/manifests/mod/ssl.pp
new file mode 100644
index 00000000..8ebb382d
--- /dev/null
+++ b/modules/apache/manifests/mod/ssl.pp
@@ -0,0 +1,20 @@
+class apache::mod::ssl {
+    include apache::base
+    file { '/etc/ssl/apache/':
+        ensure => directory
+    }
+
+    openssl::self_signed_cert{ 'localhost':
+        directory => '/etc/ssl/apache/',
+        before    => Apache::Config['/etc/httpd/conf/vhosts.d/01_default_ssl_vhost.conf'],
+    }
+
+    package { 'apache-mod_ssl': }
+
+    apache::config {
+        '/etc/httpd/conf/vhosts.d/01_default_ssl_vhost.conf':
+            content => template('apache/01_default_ssl_vhost.conf');
+        '/etc/httpd/conf.d/ssl.conf':
+            content => template('apache/ssl.conf');
+    }
+}
-- 
cgit v1.2.1