diff options
| author | Michael Scherer <misc@mageia.org> | 2012-02-11 14:45:07 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-02-11 14:45:07 +0000 |
| commit | d43c6cd4bd76ae5c86b606a655077d9840dd38cb (patch) | |
| tree | 5f2ebaea8cff8b6d5913a897ba0e0d98714b81f5 /modules/puppet | |
| parent | 394bbf20845eba2286ab19fa100b0a01b3a9692a (diff) | |
| download | puppet-d43c6cd4bd76ae5c86b606a655077d9840dd38cb.tar puppet-d43c6cd4bd76ae5c86b606a655077d9840dd38cb.tar.gz puppet-d43c6cd4bd76ae5c86b606a655077d9840dd38cb.tar.bz2 puppet-d43c6cd4bd76ae5c86b606a655077d9840dd38cb.tar.xz puppet-d43c6cd4bd76ae5c86b606a655077d9840dd38cb.zip | |
fix again the inheritance for puppet
Diffstat (limited to 'modules/puppet')
| -rw-r--r-- | modules/puppet/manifests/client.pp | 6 | ||||
| -rw-r--r-- | modules/puppet/manifests/init.pp | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/modules/puppet/manifests/client.pp b/modules/puppet/manifests/client.pp index 6d920a74..b9141ba1 100644 --- a/modules/puppet/manifests/client.pp +++ b/modules/puppet/manifests/client.pp @@ -1,12 +1,6 @@ class puppet::client inherits puppet { include puppet::stored_config - package { 'puppet': } - - File['/etc/puppet/puppet.conf'] { - content => template('puppet/puppet.conf','puppet/puppet.agent.conf'), - } - cron { 'puppet': ensure => present, command => '/usr/sbin/puppetd -o --no-daemonize -l syslog >/dev/null 2>&1', diff --git a/modules/puppet/manifests/init.pp b/modules/puppet/manifests/init.pp index 38c74bd2..2cb67856 100644 --- a/modules/puppet/manifests/init.pp +++ b/modules/puppet/manifests/init.pp @@ -1,6 +1,10 @@ class puppet { + + package { 'puppet': } + # only here to be subclassed file { '/etc/puppet/puppet.conf': require => Package[puppet], + content => template('puppet/puppet.conf','puppet/puppet.agent.conf'), } } |