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 branch 'master' into staging
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
6eb8c6b
..
f3a598b
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-186,9
+186,7
@@
class apache2 {
notify => Exec['service apache2 reload'],
}
notify => Exec['service apache2 reload'],
}
- file { '/etc/cron.d/puppet-export-scheduled-shutdown':
- ensure => absent,
- }
+ file { '/etc/cron.d/puppet-export-scheduled-shutdown': ensure => absent, }
concat::fragment { 'dsa-puppet-stuff--apache-export-shutdown':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)
concat::fragment { 'dsa-puppet-stuff--apache-export-shutdown':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)