projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable puppet-as-a-service on systemd systemd
[mirror/dsa-puppet.git]
/
modules
/
debian-org
/
manifests
/
init.pp
diff --git
a/modules/debian-org/manifests/init.pp
b/modules/debian-org/manifests/init.pp
index
ca47380
..
33ab604
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-60,10
+60,14
@@
class debian-org {
ensure => installed,
}
ensure => installed,
}
- if $::lsbmajdistrelease
>
= 7 {
+ if $::lsbmajdistrelease
=
= 7 {
package { 'libfilesystem-ruby1.9.1':
ensure => installed,
}
package { 'libfilesystem-ruby1.9.1':
ensure => installed,
}
+ } elsif $::lsbmajdistrelease >= 8 {
+ package { 'ruby-filesystem':
+ ensure => installed,
+ }
}
munin::check { [
}
munin::check { [
@@
-146,7
+150,7
@@
class debian-org {
components => ['main','contrib','non-free']
}
components => ['main','contrib','non-free']
}
- #if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr,
rem,
pettersson]) or
+ #if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, pettersson]) or
# ($::hoster and ($::hoster in [bytemark, man-da, brown])) {
# site::aptrepo { 'proposed-updates':
# url => $mirror,
# ($::hoster and ($::hoster in [bytemark, man-da, brown])) {
# site::aptrepo { 'proposed-updates':
# url => $mirror,
@@
-232,6
+236,16
@@
class debian-org {
file { '/etc/default/puppet':
source => 'puppet:///modules/debian-org/puppet.default',
}
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'],
+ }
+
file { '/etc/cron.d/dsa-puppet-stuff':
source => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron',
require => Package['debian.org'],
file { '/etc/cron.d/dsa-puppet-stuff':
source => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron',
require => Package['debian.org'],
@@
-251,7
+265,7
@@
class debian-org {
file { '/etc/rc.local':
mode => '0755',
source => 'puppet:///modules/debian-org/rc.local',
file { '/etc/rc.local':
mode => '0755',
source => 'puppet:///modules/debian-org/rc.local',
- notify => Exec['rc.local start'],
+ notify => Exec['
service
rc.local start'],
}
file { '/etc/dsa':
ensure => directory,
}
file { '/etc/dsa':
ensure => directory,
@@
-305,18
+319,21
@@
class debian-org {
path => '/usr/bin:/usr/sbin:/bin:/sbin',
refreshonly => true
}
path => '/usr/bin:/usr/sbin:/bin:/sbin',
refreshonly => true
}
- exec { 'puppetmaster restart':
- path => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+ exec { 'service puppetmaster restart':
refreshonly => true
}
refreshonly => true
}
- exec { 'rc.local start':
- path => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+ exec { 'service rc.local start':
refreshonly => true
}
exec { 'init q':
refreshonly => true
}
refreshonly => true
}
exec { 'init q':
refreshonly => true
}
+ exec { 'systemctl daemon-reload':
+ refreshonly => true,
+ onlyif => "test -x /bin/systemctl"
+ }
+
tidy { '/var/lib/puppet/clientbucket/':
age => '2w',
recurse => 9,
tidy { '/var/lib/puppet/clientbucket/':
age => '2w',
recurse => 9,