From dd380fa91507155d5cfe8ea87023903eb91a18b0 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 27 Jun 2012 22:58:41 -0400 Subject: 2.7 underscore rename: site-puppet --- manifests/puppetmaster/base.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'manifests/puppetmaster/base.pp') 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; } -- cgit v1.2.3