From cc782be3aed069c1c538e90358f0f0647bb2e425 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Sat, 17 Mar 2012 10:53:59 +0000
Subject: split web class into a module, and clean it

---
 modules/bcd/manifests/init.pp | 23 -----------------------
 modules/bcd/manifests/web.pp  | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 23 deletions(-)
 create mode 100644 modules/bcd/manifests/web.pp

(limited to 'modules')

diff --git a/modules/bcd/manifests/init.pp b/modules/bcd/manifests/init.pp
index b4c7a03b..2dfd88df 100644
--- a/modules/bcd/manifests/init.pp
+++ b/modules/bcd/manifests/init.pp
@@ -41,27 +41,4 @@ class bcd {
 
     }
 
-    class web inherits base {
-        apache::vhost_base { "bcd.$domain":
-	    location => "$bcd_home/public_html",
-	    content => template('bcd/vhost_bcd.conf'),
-	}
-	file {"htaccess":
-	    path => "$bcd_home/public_html/.htaccess",
-	    ensure => present,
-	    owner => bcd,
-	    group => bcd,
-	    mode => 755,
-	    content => template("bcd/.htaccess")
-	}
-	file {"htpasswd":
-            path => "$bcd_home/public_html/.htpasswd",
-            ensure => present,
-            owner => bcd,
-            group => bcd,
-            mode => 755,
-            content => template("bcd/.htpasswd")
-        }
-    }
-
 }
diff --git a/modules/bcd/manifests/web.pp b/modules/bcd/manifests/web.pp
new file mode 100644
index 00000000..fba6df1c
--- /dev/null
+++ b/modules/bcd/manifests/web.pp
@@ -0,0 +1,20 @@
+class bcd::web {
+    include bcd::base 
+    $bcd_home = $bcd::variable::bcd_home
+
+    apache::vhost_base { "bcd.$::domain":
+	    location => "$bcd_home/public_html",
+	    content  => template('bcd/vhost_bcd.conf'),
+	}
+
+    # TODO should be merged with main file
+	file { "$bcd_home/public_html/.htaccess":
+	    content => template('bcd/.htaccess')
+	}
+
+    # not sure if that's useful, since the file is public and trivially 
+    # bruteforced
+	file { "$bcd_home/public_html/.htpasswd":
+        content => template('bcd/.htpasswd')
+    }
+}
-- 
cgit v1.2.1