diff options
| author | Micah Anderson <micah@riseup.net> | 2012-06-27 22:58:41 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-06-27 22:58:41 -0400 |
| commit | dd380fa91507155d5cfe8ea87023903eb91a18b0 (patch) | |
| tree | 174526cdd6350bd4f7a325526348d7b58812d098 /manifests/puppetmaster | |
| parent | fecafbacbbb820a01d1cc21b6cc69c24f3c60151 (diff) | |
2.7 underscore rename: site-puppet
Diffstat (limited to 'manifests/puppetmaster')
| -rw-r--r-- | manifests/puppetmaster/base.pp | 8 | ||||
| -rw-r--r-- | manifests/puppetmaster/centos.pp | 6 | ||||
| -rw-r--r-- | manifests/puppetmaster/debian.pp | 6 | ||||
| -rw-r--r-- | manifests/puppetmaster/passenger.pp | 2 |
4 files changed, 11 insertions, 11 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; } diff --git a/manifests/puppetmaster/centos.pp b/manifests/puppetmaster/centos.pp index 2673a4d..a6f5e23 100644 --- a/manifests/puppetmaster/centos.pp +++ b/manifests/puppetmaster/centos.pp @@ -2,9 +2,9 @@ class puppet::puppetmaster::centos inherits puppet::puppetmaster::package { file { '/etc/sysconfig/puppetmaster': - source => [ "puppet:///modules/site-puppet/sysconfig/${fqdn}/puppetmaster", - "puppet:///modules/site-puppet/sysconfig/${domain}/puppetmaster", - "puppet:///modules/site-puppet/sysconfig/puppetmaster", + source => [ "puppet:///modules/site_puppet/sysconfig/${fqdn}/puppetmaster", + "puppet:///modules/site_puppet/sysconfig/${domain}/puppetmaster", + "puppet:///modules/site_puppet/sysconfig/puppetmaster", "puppet:///modules/puppet/sysconfig/puppetmaster" ], notify => Service[puppetmaster], owner => root, group => 0, mode => 0644; diff --git a/manifests/puppetmaster/debian.pp b/manifests/puppetmaster/debian.pp index a7d7f0a..0c81a64 100644 --- a/manifests/puppetmaster/debian.pp +++ b/manifests/puppetmaster/debian.pp @@ -13,9 +13,9 @@ class puppet::puppetmaster::debian inherits puppet::puppetmaster::package { } file { '/etc/default/puppetmaster': - source => [ "puppet:///modules/site-puppet/master/debian/${fqdn}/puppetmaster", - "puppet:///modules/site-puppet/master/debian/${domain}/puppetmaster", - "puppet:///modules/site-puppet/master/debian/puppetmaster", + source => [ "puppet:///modules/site_puppet/master/debian/${fqdn}/puppetmaster", + "puppet:///modules/site_puppet/master/debian/${domain}/puppetmaster", + "puppet:///modules/site_puppet/master/debian/puppetmaster", "puppet:///modules/puppet/master/debian/puppetmaster" ], notify => $puppetmaster_default_nofity ? { '' => Service[puppetmaster], diff --git a/manifests/puppetmaster/passenger.pp b/manifests/puppetmaster/passenger.pp index c4bc062..584a559 100644 --- a/manifests/puppetmaster/passenger.pp +++ b/manifests/puppetmaster/passenger.pp @@ -13,7 +13,7 @@ class puppet::puppetmaster::passenger inherits puppet::puppetmaster::base { owner => root, group => 0, mode => 0755; '/etc/puppet/rack/config.ru': - source => [ "puppet:///modules/site-puppet/master/config.ru", + source => [ "puppet:///modules/site_puppet/master/config.ru", "puppet:///modules/puppet/master/config.ru" ], owner => puppet, group => 0, mode => 0644; } |