Merge branch 'develop'

3 files changed, 57 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/debian/itk.pp b/puppet/modules/apache/manifests/debian/itk.pp
new file mode 100644
index 00000000..718a81b3
--- /dev/null
+++ b/puppet/modules/apache/manifests/debian/itk.pp
@@ -0,0 +1,9 @@
+class apache::debian::itk inherits apache::debian {
+  File['htpasswd_dir']{
+    group => 0,
+    mode => 0644,
+  }
+  Package['apache']{
+    name => 'apache2-mpm-itk',
+  }
+}
diff --git a/puppet/modules/apache/manifests/debian/module.pp b/puppet/modules/apache/manifests/debian/module.pp
new file mode 100644
index 00000000..ed255155
--- /dev/null
+++ b/puppet/modules/apache/manifests/debian/module.pp
@@ -0,0 +1,48 @@
+# install/remove apache module on debian/ubuntu systems
+define apache::debian::module(
+  $ensure = present,
+  $package_name = 'absent',
+  $conf_source = '',
+  $conf_content = '',
+){
+  $modules_dir = "${apache::debian::config_dir}/mods"
+
+  if ($package_name != 'absent') {
+    package { $package_name:
+      ensure  => $ensure,
+      notify  => Service['apache'],
+      require => [ File['modules_dir'], Package['apache'] ],
+    }
+    $required_packages = [ 'apache', $package_name ]
+  }
+  else {
+    $required_packages = [ 'apache' ]
+  }
+
+  file {
+    "${modules_dir}-enabled/${name}.load":
+      ensure  => "../mods-available/${name}.load",
+      notify  => Service['apache'],
+      require => [ File['modules_dir'], Package[$required_packages] ];
+    "${modules_dir}-enabled/${name}.conf":
+      ensure  => "../mods-available/${name}.conf",
+      notify  => Service['apache'],
+      require => [ File['modules_dir'], Package[$required_packages] ];
+    "${modules_dir}-available/${name}.conf":
+      ensure  => file,
+      notify  => Service['apache'],
+      require => [ File['modules_dir'], Package[$required_packages] ];
+  }
+
+  if $conf_content != '' {
+    File["${modules_dir}-available/${name}.conf"] {
+      content => $conf_content,
+    }
+  }
+  elsif $conf_source != '' {
+    File["${modules_dir}-available/${name}.conf"] {
+      source => $conf_source,
+    }
+  }
+
+}