projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kill munin-update jobs older than 2 hours
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
373b8fe
..
cd4f1f7
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-19,14
+19,7
@@
class apache2 {
apache2::module { 'info': }
apache2::module { 'status': }
apache2::module { 'headers': }
apache2::module { 'info': }
apache2::module { 'status': }
apache2::module { 'headers': }
-
- package { 'libapache2-mod-macro':
- ensure => installed
- }
-
- apache2::module { 'macro':
- require => Package['libapache2-mod-macro']
- }
+ apache2::module { 'macro': }
apache2::site { '00-default':
site => 'default-debian.org',
apache2::site { '00-default':
site => 'default-debian.org',
@@
-139,7
+132,7
@@
class apache2 {
script => 'ps_',
}
script => 'ps_',
}
- if $::hostname in [beach,buxtehude,picconi,pkgmirror-
1and1,pkgmirror-
csail] {
+ if $::hostname in [beach,buxtehude,picconi,pkgmirror-csail] {
include apache2::dynamic
} else {
@ferm::rule { 'dsa-http':
include apache2::dynamic
} else {
@ferm::rule { 'dsa-http':