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:
6c01d70
)
Only put puppet.service in place if /etc/systemd/system exists
author
Tollef Fog Heen
<tfheen@err.no>
Thu, 27 Nov 2014 16:25:50 +0000
(17:25 +0100)
committer
Tollef Fog Heen
<tfheen@err.no>
Thu, 27 Nov 2014 16:25:50 +0000
(17:25 +0100)
modules/debian-org/manifests/init.pp
patch
|
blob
|
history
diff --git
a/modules/debian-org/manifests/init.pp
b/modules/debian-org/manifests/init.pp
index
910dbfd
..
15769e9
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-236,14
+236,11
@@
class debian-org {
file { '/etc/default/puppet':
source => 'puppet:///modules/debian-org/puppet.default',
}
- file { '/etc/systemd/system':
- ensure => directory,
- recurse => true,
- }
file { '/etc/systemd/system/puppet.service':
ensure => 'link',
target => '/dev/null',
notify => Exec['systemctl daemon-reload'],
+ onlyif => "test -d /etc/systemd/system",
}
file { '/etc/cron.d/dsa-puppet-stuff':