diff options
| author | mh <mh@immerda.ch> | 2010-08-07 02:08:17 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-08-07 02:08:17 +0200 |
| commit | 1d7bd1ff3bd49d7d1348005bed8bba56431329f5 (patch) | |
| tree | 3fa80bc59c0e85dd71da22ec7b96c2fdf9dd54cf /manifests/puppetmaster | |
| parent | adce830e8baf197cae3c4493f2b77e237643ecfa (diff) | |
remove unnecessary fileserver variable (#2460)
Diffstat (limited to 'manifests/puppetmaster')
| -rw-r--r-- | manifests/puppetmaster/base.pp | 10 | ||||
| -rw-r--r-- | manifests/puppetmaster/centos.pp | 8 | ||||
| -rw-r--r-- | manifests/puppetmaster/checklastrun.pp | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp index a2bc9d4..85e9f7c 100644 --- a/manifests/puppetmaster/base.pp +++ b/manifests/puppetmaster/base.pp @@ -1,16 +1,16 @@ class puppet::puppetmaster::base inherits puppet::base { File[puppet_config]{ - source => [ "puppet://$server/modules/site-puppet/master/puppet.conf", - "puppet://$server/modules/puppet/master/puppet.conf" ], + source => [ "puppet:///modules/site-puppet/master/puppet.conf", + "puppet:///modules/puppet/master/puppet.conf" ], notify => Service[puppetmaster], } if !$puppet_fileserverconfig { $puppet_fileserverconfig = '/etc/puppet/fileserver.conf' } file { "$puppet_fileserverconfig": - source => [ "puppet://$server/modules/site-puppet/master/${fqdn}/fileserver.conf", - "puppet://$server/modules/site-puppet/master/fileserver.conf", - "puppet://$server/modules/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 9a6cf91..0daa69b 100644 --- a/manifests/puppetmaster/centos.pp +++ b/manifests/puppetmaster/centos.pp @@ -2,10 +2,10 @@ class puppet::puppetmaster::centos inherits puppet::puppetmaster::package { file{'/etc/sysconfig/puppetmaster': - source => [ "puppet://$server/modules/site-puppet/sysconfig/${fqdn}/puppetmaster", - "puppet://$server/modules/site-puppet/sysconfig/${domain}/puppetmaster", - "puppet://$server/modules/site-puppet/sysconfig/puppetmaster", - "puppet://$server/modules/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/checklastrun.pp b/manifests/puppetmaster/checklastrun.pp index a8978f3..1cf5311 100644 --- a/manifests/puppetmaster/checklastrun.pp +++ b/manifests/puppetmaster/checklastrun.pp @@ -1,7 +1,7 @@ class puppet::puppetmaster::checklastrun { file{"/usr/local/bin/puppetlast": - source => [ "puppet://$server/modules/site-puppet/master/puppetlast", - "puppet://$server/modules/puppet/master/puppetlast" ], + source => [ "puppet:///modules/site-puppet/master/puppetlast", + "puppet:///modules/puppet/master/puppetlast" ], owner => root, group => 0, mode => 0700; } file{'/etc/cron.d/puppetlast.cron': |