diff options
| -rw-r--r-- | manifests/daemon.pp | 6 | ||||
| -rw-r--r-- | manifests/daemon/disabled.pp | 15 | ||||
| -rw-r--r-- | manifests/standalone.pp | 12 |
3 files changed, 21 insertions, 12 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp index 61475a4..6e7251a 100644 --- a/manifests/daemon.pp +++ b/manifests/daemon.pp @@ -1,9 +1,9 @@ # manage puppet service class puppet::daemon( $master = false, - $ensure = hiera('puppet::daemon::ensure', ''), - $port = hiera('puppet::daemon::port', "8140"), - $runinterval = hiera('puppet::daemon::runinterval', "7200"), + $ensure = hiera('puppet::daemon::ensure', ''), + $port = hiera('puppet::daemon::port', "8140"), + $runinterval = hiera('puppet::daemon::runinterval', "7200"), $configtimeout = hiera('puppet::daemon::configtimeout', "120"), $server = hiera('puppet::daemon::server', "puppet.${::domain}") ) { diff --git a/manifests/daemon/disabled.pp b/manifests/daemon/disabled.pp new file mode 100644 index 0000000..49354aa --- /dev/null +++ b/manifests/daemon/disabled.pp @@ -0,0 +1,15 @@ +class puppet::daemon::disabled { + service { "puppet": + enable => false, + ensure => stopped, + require => Package["puppet"]. + } + + file { [ "/etc/cron.d/puppetd", "/usr/local/sbin/check-puppetd.sh" ]: + ensure => absent, + } + + cron { [ "puppetd-check", "puppet-restart" ]: + ensure => absent, + } +} diff --git a/manifests/standalone.pp b/manifests/standalone.pp index b34f551..3550d99 100644 --- a/manifests/standalone.pp +++ b/manifests/standalone.pp @@ -1,16 +1,10 @@ # manage a puppet standalone installation with no agent class puppet::standalone { - - include puppet::base # agent will not start on boot by default + # Agent will not start on boot by default + include puppet::base + include puppet::daemon::disabled class { "puppet::repo": method => "standalone", } - - service { "puppet": - enable => false, - ensure => stopped, - hasrestart => true, - require => [ Package["puppet"], File["/etc/default/puppet"] ], - } } |