projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use rsyncd via systemd on wiki
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
707cd13
..
b0bde41
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-16,6
+16,7
@@
class apache2 {
require => Package['apache2'],
}
require => Package['apache2'],
}
+ apache2::module { 'reqtimeout': }
apache2::module { 'info': }
apache2::module { 'status': }
apache2::module { 'headers': }
apache2::module { 'info': }
apache2::module { 'status': }
apache2::module { 'headers': }
@@
-89,7
+90,11
@@
class apache2 {
}
apache2::config { 'pratchett':
}
apache2::config { 'pratchett':
- source => 'puppet:///modules/apache2/pratchett',
+ ensure => 'absent',
+ }
+
+ apache2::config { 'headers':
+ source => 'puppet:///modules/apache2/headers',
}
apache2::module { 'mpm_event': ensure => absent }
}
apache2::module { 'mpm_event': ensure => absent }
@@
-100,7
+105,7
@@
class apache2 {
apache2::module { 'mpm_prefork': ensure => absent }
apache2::module { 'mpm_worker': }
}
apache2::module { 'mpm_prefork': ensure => absent }
apache2::module { 'mpm_worker': }
}
- if
$::lsbmajdistrelease > 7
{
+ if
versioncmp($::lsbmajdistrelease, '7') > 0
{
file { '/etc/apache2/mods-available/mpm_worker.conf':
content => template('apache2/mpm_worker.erb'),
}
file { '/etc/apache2/mods-available/mpm_worker.conf':
content => template('apache2/mpm_worker.erb'),
}