tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed depency to augeas library from puppet::client class.

Browse source
This commit is contained in:
Timo Mkinen 2010-10-28 20:42:46 +03:00
parent a3ccca705a
commit f48011e958
3 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
puppet/files/puppet.disabled.default Normal file
View file

@ -0,0 +1,7 @@
# Defaults for puppet - sourced by /etc/init.d/puppet
# Start puppet on boot?
START=yes
# Startup options
DAEMON_OPTS=""

7
puppet/files/puppet.enabled.default Normal file
View file

@ -0,0 +1,7 @@
# Defaults for puppet - sourced by /etc/init.d/puppet
# Start puppet on boot?
START=yes
# Startup options
DAEMON_OPTS=""

18
puppet/manifests/init.pp
View file

@ -64,9 +64,13 @@ class puppet::client {
restart => "/usr/bin/pkill -HUP puppetd", restart => "/usr/bin/pkill -HUP puppetd",
subscribe => File["/etc/puppet/puppet.conf"], subscribe => File["/etc/puppet/puppet.conf"],
} }
augeas { "set-default-puppet": file { "/etc/default/puppet":
context => "/files/etc/default/puppet", ensure => present,
changes => ["set START yes"], source => "puppet:///puppet/puppet.enabled.default",
mode => 0644,
owner => root,
group => root,
notify => Service["puppet"],
} }
} }
default: { default: {
@ -106,8 +110,8 @@ class puppet::client {
class puppet::manual inherits puppet::client { class puppet::manual inherits puppet::client {
Service["puppet"] { Service["puppet"] {
ensure => undef, ensure => undef,
enable => false, enable => false,
} }
Cron["puppet-check"] { Cron["puppet-check"] {
@ -116,8 +120,8 @@ class puppet::manual inherits puppet::client {
case $operatingsystem { case $operatingsystem {
debian,ubuntu: { debian,ubuntu: {
Augeas["set-default-puppet"] { File["/etc/default/puppet"] {
changes => ["set START no"], source => "puppet:///puppet/puppet.disabled.default",
} }
} }
} }