diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-08-14 13:46:47 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-08-14 13:46:47 -0300 |
| commit | 9bc51a55045a80bc9d8917c67f6cb70f4e7ff6f2 (patch) | |
| tree | f3e1fba697a46068da45a1ba990cf608fd304929 | |
| parent | 2f2e3b6fca2d9c3080e85f531e576f83b791a692 (diff) | |
| download | puppet-puppet-9bc51a55045a80bc9d8917c67f6cb70f4e7ff6f2.tar.gz puppet-puppet-9bc51a55045a80bc9d8917c67f6cb70f4e7ff6f2.tar.bz2 | |
Misc fixes for standalone implementation
| -rw-r--r-- | manifests/base.pp | 13 | ||||
| -rw-r--r-- | manifests/daemon.pp | 4 | ||||
| -rw-r--r-- | templates/puppet.erb (renamed from files/puppet) | 0 |
3 files changed, 8 insertions, 9 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 299ecc6..95b5906 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,6 +1,7 @@ # manage puppet package class puppet::base( - $start_on_boot = false + $start_on_boot = false, + $ensure = '' ) { include puppet @@ -18,11 +19,11 @@ class puppet::base( } file { "/etc/default/puppet": - source => "puppet:///modules/puppet/puppet", - owner => "root", - group => "root", - mode => 0644, - ensure => present, + content => template('puppet/puppet.erb'), + owner => "root", + group => "root", + mode => 0644, + ensure => present, } } diff --git a/manifests/daemon.pp b/manifests/daemon.pp index 59d83ba..61475a4 100644 --- a/manifests/daemon.pp +++ b/manifests/daemon.pp @@ -11,9 +11,7 @@ class puppet::daemon( start_on_boot => true } - package { "cron": - ensure => installed, - } + include cron service { "puppet": enable => true, diff --git a/files/puppet b/templates/puppet.erb index 3b85c50..3b85c50 100644 --- a/files/puppet +++ b/templates/puppet.erb |