projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'stapelberg/dyn'
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
3f854a7
..
32d35eb
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',
@@
-138,8
+131,12
@@
class apache2 {
munin::check { 'ps_apache2':
script => 'ps_',
}
munin::check { 'ps_apache2':
script => 'ps_',
}
+ # The munin script needs this
+ package { 'libwww-perl':
+ ensure => installed,
+ }
- 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':
@@
-163,13
+160,8
@@
class apache2 {
require => Package['apache2'],
}
require => Package['apache2'],
}
- concat { '/etc/apache2/conf-available/puppet-ssl-key-pins.conf':
- owner => root,
- group => root,
- mode => '0644',
- require => Package['apache2'],
- }
apache2::config { 'puppet-ssl-key-pins':
apache2::config { 'puppet-ssl-key-pins':
- nocontentok => true,
+ content => template('apache2/ssl-key-pins.erb'),
+ notify => Exec['service apache2 reload'],
}
}
}
}