projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9041ced
)
Revert "we can use our own idiom"
author
Stephen Gran
<steve@lobefin.net>
Fri, 18 May 2012 19:52:47 +0000
(20:52 +0100)
committer
Stephen Gran
<steve@lobefin.net>
Fri, 18 May 2012 19:52:47 +0000
(20:52 +0100)
This reverts commit
9041cedfeb58ddc5340713c709e6c8decd86cbbd
.
modules/apache2/manifests/init.pp
patch
|
blob
|
history
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
dec6a4a
..
d2e4998
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-69,9
+69,11
@@
class 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'],
+ notify => Service['apache2'],
}
}