From 1d7bd1ff3bd49d7d1348005bed8bba56431329f5 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 7 Aug 2010 02:08:17 +0200 Subject: remove unnecessary fileserver variable (#2460) --- manifests/base.pp | 10 +++++----- manifests/centos.pp | 8 ++++---- manifests/debian.pp | 8 ++++---- manifests/linux.pp | 4 ++-- manifests/puppetmaster/base.pp | 10 +++++----- manifests/puppetmaster/centos.pp | 8 ++++---- manifests/puppetmaster/checklastrun.pp | 4 ++-- 7 files changed, 26 insertions(+), 26 deletions(-) (limited to 'manifests') diff --git a/manifests/base.pp b/manifests/base.pp index 598fb9e..267be61 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -3,11 +3,11 @@ class puppet::base { file { 'puppet_config': path => "$puppet_config", - source => [ "puppet://$server/modules/site-puppet/client/${fqdn}/puppet.conf", - "puppet://$server/modules/site-puppet/client/puppet.conf.$operatingsystem", - "puppet://$server/modules/site-puppet/client/puppet.conf", - "puppet://$server/modules/puppet/client/puppet.conf.$operatingsystem", - "puppet://$server/modules/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.conf.$operatingsystem", + "puppet:///modules/puppet/client/puppet.conf" ], notify => Service[puppet], # if puppetmasterd is deployed by apache2/passenger it needs to read puppet.conf # therefore it must be readable by puppet diff --git a/manifests/centos.pp b/manifests/centos.pp index e0ba1f1..6fdde9e 100644 --- a/manifests/centos.pp +++ b/manifests/centos.pp @@ -1,9 +1,9 @@ class puppet::centos inherits puppet::linux { file{'/etc/sysconfig/puppet': - source => [ "puppet://$server/modules/site-puppet/sysconfig/${fqdn}/puppet", - "puppet://$server/modules/site-puppet/sysconfig/${domain}/puppet", - "puppet://$server/modules/site-puppet/sysconfig/puppet", - "puppet://$server/modules/puppet/sysconfig/puppet" ], + source => [ "puppet:///modules/site-puppet/sysconfig/${fqdn}/puppet", + "puppet:///modules/site-puppet/sysconfig/${domain}/puppet", + "puppet:///modules/site-puppet/sysconfig/puppet", + "puppet:///modules/puppet/sysconfig/puppet" ], notify => Service[puppet], owner => root, group => 0, mode => 0644; } diff --git a/manifests/debian.pp b/manifests/debian.pp index f4bfee7..fba7beb 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -1,9 +1,9 @@ class puppet::debian inherits puppet::linux { file{'/etc/default/puppet': - source => [ "puppet://$server/modules/site-puppet/client/debian/${fqdn}/puppet", - "puppet://$server/modules/site-puppet/client/debian/${domain}/puppet", - "puppet://$server/modules/site-puppet/client/debian/puppet", - "puppet://$server/modules/puppet/client/debian/puppet" ], + source => [ "puppet:///modules/site-puppet/client/debian/${fqdn}/puppet", + "puppet:///modules/site-puppet/client/debian/${domain}/puppet", + "puppet:///modules/site-puppet/client/debian/puppet", + "puppet:///modules/puppet/client/debian/puppet" ], notify => Service[puppet], owner => root, group => 0, mode => 0644; } diff --git a/manifests/linux.pp b/manifests/linux.pp index d8095f8..a217f66 100644 --- a/manifests/linux.pp +++ b/manifests/linux.pp @@ -17,8 +17,8 @@ class puppet::linux inherits puppet::base { } file{'/etc/cron.d/puppetd.cron': - source => [ "puppet://$server/modules/puppet/cron.d/puppetd.${operatingsystem}", - "puppet://$server/modules/puppet/cron.d/puppetd" ], + source => [ "puppet:///modules/puppet/cron.d/puppetd.${operatingsystem}", + "puppet:///modules/puppet/cron.d/puppetd" ], owner => root, group => 0, mode => 0644, } } 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': -- cgit v1.2.3