diff options
| author | Micah Anderson <micah@riseup.net> | 2012-08-22 13:43:08 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-08-22 13:43:08 -0400 |
| commit | 24e4503906c5ffef236814b003d1fd629989fc40 (patch) | |
| tree | 1721fb6c2387d6cab5c6e6aaa9ab937b52c559f3 /manifests/base.pp | |
| parent | 04d8317eb5b70aba62c2b18f6b1bd1d03aedeb5b (diff) | |
| parent | ed7d89163385a6eab4423aae7ce8b5d994339a2f (diff) | |
Merge remote-tracking branch 'riseup/master'
Conflicts:
manifests/puppetmaster/debian.pp
manifests/puppetmaster/linux.pp
manifests/puppetmaster/package/debian.pp
Diffstat (limited to 'manifests/base.pp')
| -rw-r--r-- | manifests/base.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 69a7568..6ff8fa5 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -6,7 +6,7 @@ class puppet::base { case $puppet_cleanup_clientbucket { # if not set, don't do anything - '': {} + '',undef: {} default: { tidy { "/var/lib/puppet/clientbucket": backup => false, @@ -20,9 +20,9 @@ class puppet::base { file { 'puppet_config': path => "$puppet_config", - source => [ "puppet:///modules/site-puppet/client/${fqdn}/puppet.conf", - "puppet:///modules/site-puppet/client/puppet.conf.$operatingsystem", - "puppet:///modules/site-puppet/client/puppet.conf", + source => [ "puppet:///modules/site_puppet/client/${fqdn}/puppet.conf", + "puppet:///modules/site_puppet/client/puppet.conf.$operatingsystem", + "puppet:///modules/site_puppet/client/puppet.conf", "puppet:///modules/puppet/client/${puppet_majorversion}/puppet.conf.$operatingsystem", "puppet:///modules/puppet/client/${puppet_majorversion}/puppet.conf", "puppet:///modules/puppet/client/puppet.conf.$operatingsystem", |