Merge branch 'develop'

2 files changed, 32 insertions, 0 deletions

diff --git a/puppet/modules/apache b/puppet/modules/apache
deleted file mode 160000
-Subproject 117bed9a9263c21d253d86b667eb165948efdc2
diff --git a/puppet/modules/apache/manifests/package.pp b/puppet/modules/apache/manifests/package.pp
new file mode 100644
index 00000000..3308b371
--- /dev/null
+++ b/puppet/modules/apache/manifests/package.pp
@@ -0,0 +1,32 @@
+# deploy apache as package
+class apache::package inherits apache::base {
+    package { 'apache':
+        name => 'apache',
+        ensure => present,
+    }
+    File['vhosts_dir']{
+        require => Package[apache],
+    }
+    File['config_dir']{
+        require => Package[apache],
+    }
+    Service['apache']{
+        require => Package[apache],
+    }
+    File['default_apache_index']{
+        require => Package[apache],
+    }
+    File['modules_dir']{
+        require => Package[apache],
+    }
+    File['include_dir']{
+        require => Package[apache],
+    }
+    File['web_dir']{
+        require => Package[apache],
+    }
+    File['htpasswd_dir']{
+        require => Package[apache],
+    }
+}
+