summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-11-09 12:25:37 -0200
committerSilvio Rhatto <rhatto@riseup.net>2015-11-09 12:25:37 -0200
commit493d371a4410b0a6886fbe7cfe36180cb2120f60 (patch)
tree426779c6462b5bae30a8b61fd66cfb2db6137f88 /manifests
parentc27c00d6dd1adb3f568276fd36358883da64eefa (diff)
downloadpuppet-apache-493d371a4410b0a6886fbe7cfe36180cb2120f60.tar.gz
puppet-apache-493d371a4410b0a6886fbe7cfe36180cb2120f60.tar.bz2
Apache itk package for jessie onwards
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp15
1 files changed, 13 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index f63103c..4e6efb9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -46,9 +46,20 @@ class apache(
include ssl
+ package { 'libapache2-mpm-itk':
+ ensure => $::lsbdistcodename ? {
+ wheezy => absent,
+ default => present,
+ },
+ }
+
package { "apache":
- name => "apache2-mpm-itk",
- ensure => installed,
+ name => $::lsbdistcodename ? {
+ wheezy => 'apache2-mpm-itk',
+ default => 'apache2',
+ },
+ ensure => installed,
+ require => Package['libapache2-mpm-itk'],
}
file { "$conf_d":