summaryrefslogtreecommitdiff
path: root/manifests/puppetmaster/base.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-06-27 22:58:41 -0400
committerMicah Anderson <micah@riseup.net>2012-06-27 22:58:41 -0400
commitdd380fa91507155d5cfe8ea87023903eb91a18b0 (patch)
tree174526cdd6350bd4f7a325526348d7b58812d098 /manifests/puppetmaster/base.pp
parentfecafbacbbb820a01d1cc21b6cc69c24f3c60151 (diff)
2.7 underscore rename: site-puppet
Diffstat (limited to 'manifests/puppetmaster/base.pp')
-rw-r--r--manifests/puppetmaster/base.pp8
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp
index a7dc7a5..a313ff2 100644
--- a/manifests/puppetmaster/base.pp
+++ b/manifests/puppetmaster/base.pp
@@ -2,8 +2,8 @@ class puppet::puppetmaster::base inherits puppet::base {
File[puppet_config]{
source => [
- "puppet:///modules/site-puppet/master/${fqdn}/puppet.conf",
- "puppet:///modules/site-puppet/master/puppet.conf",
+ "puppet:///modules/site_puppet/master/${fqdn}/puppet.conf",
+ "puppet:///modules/site_puppet/master/puppet.conf",
"puppet:///modules/puppet/master/puppet.conf",
],
}
@@ -11,8 +11,8 @@ class puppet::puppetmaster::base inherits puppet::base {
if !$puppet_fileserverconfig { $puppet_fileserverconfig = "${puppet::default_config_dir}/fileserver.conf" }
file { "$puppet_fileserverconfig":
- source => [ "puppet:///modules/site-puppet/master/${fqdn}/fileserver.conf",
- "puppet:///modules/site-puppet/master/fileserver.conf",
+ source => [ "puppet:///modules/site_puppet/master/${fqdn}/fileserver.conf",
+ "puppet:///modules/site_puppet/master/fileserver.conf",
"puppet:///modules/puppet/master/fileserver.conf" ],
owner => root, group => puppet, mode => 640;
}