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 @admin.do
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
dec6a4a
..
a771558
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-69,13
+69,15
@@
class apache2 {
ensure => installed,
require => Package['apache2'],
}
ensure => installed,
require => Package['apache2'],
}
- apache2::config { 'suhosin.ini':
- content => 'puppet:///modules/apache2/suhosin.ini',
+
+ file { '/etc/php5/conf.d/suhosin.ini':
+ source => 'puppet:///modules/apache2/suhosin.ini',
require => Package['php5-suhosin'],
require => Package['php5-suhosin'],
+ notify => Service['apache2'],
}
}
}
}
- if $::hostname in [busoni,
duarte,holter,lindberg,master,powell
] {
+ if $::hostname in [busoni,
holter,lindberg,master,powell,beach,buxtehude,widor
] {
include apache2::dynamic
} else {
@ferm::rule { 'dsa-http':
include apache2::dynamic
} else {
@ferm::rule { 'dsa-http':