From e563c5add3e02758c128fe6b5df31ea65f393f54 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 7 Aug 2010 02:12:16 +0200 Subject: remove unnecessary fileserver variable (#2460) --- manifests/daemon.pp | 12 ++++++------ manifests/daemon/vhosts.pp | 6 +++--- manifests/web.pp | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/manifests/daemon.pp b/manifests/daemon.pp index 0d22adf..36c1302 100644 --- a/manifests/daemon.pp +++ b/manifests/daemon.pp @@ -6,16 +6,16 @@ class git::daemon { } file{'/etc/init.d/git-daemon': - source => [ "puppet://$server/modules/site-git/init.d/${fqdn}/git-daemon", - "puppet://$server/modules/site-git/init.d/git-daemon", - "puppet://$server/modules/git/init.d/git-daemon" ], + source => [ "puppet:///modules/site-git/init.d/${fqdn}/git-daemon", + "puppet:///modules/site-git/init.d/git-daemon", + "puppet:///modules/git/init.d/git-daemon" ], require => Package['git-daemon'], owner => root, group => 0, mode => 0755; } file{'/etc/sysconfig/git-daemon': - source => [ "puppet://$server/modules/site-git/sysconfig/${fqdn}/git-daemon", - "puppet://$server/modules/site-git/sysconfig/git-daemon", - "puppet://$server/modules/git/sysconfig/git-daemon" ], + source => [ "puppet:///modules/site-git/sysconfig/${fqdn}/git-daemon", + "puppet:///modules/site-git/sysconfig/git-daemon", + "puppet:///modules/git/sysconfig/git-daemon" ], require => Package['git-daemon'], owner => root, group => 0, mode => 0644; } diff --git a/manifests/daemon/vhosts.pp b/manifests/daemon/vhosts.pp index 4250a5e..3777fa1 100644 --- a/manifests/daemon/vhosts.pp +++ b/manifests/daemon/vhosts.pp @@ -1,7 +1,7 @@ class git::daemon::vhosts inherits git::daemon { File['/etc/sysconfig/git-daemon']{ - source => [ "puppet://$server/modules/site-git/sysconfig/${fqdn}/git-daemon.vhosts", - "puppet://$server/modules/site-git/sysconfig/git-daemon.vhosts", - "puppet://$server/modules/git/sysconfig/git-daemon.vhosts" ], + source => [ "puppet:///modules/site-git/sysconfig/${fqdn}/git-daemon.vhosts", + "puppet:///modules/site-git/sysconfig/git-daemon.vhosts", + "puppet:///modules/git/sysconfig/git-daemon.vhosts" ], } } diff --git a/manifests/web.pp b/manifests/web.pp index f82e8d3..73ed8f6 100644 --- a/manifests/web.pp +++ b/manifests/web.pp @@ -10,9 +10,9 @@ class git::web { owner => root, group => 0, mode => 0755; } file{'/etc/gitweb.conf': - source => [ "puppet://$server/modules/site-git/web/${fqdn}/gitweb.conf", - "puppet://$server/modules/site-git/web/gitweb.conf", - "puppet://$server/modules/git/web/gitweb.conf" ], + source => [ "puppet:///modules/site-git/web/${fqdn}/gitweb.conf", + "puppet:///modules/site-git/web/gitweb.conf", + "puppet:///modules/git/web/gitweb.conf" ], require => Package['gitweb'], owner => root, group => 0, mode => 0644; } -- cgit v1.2.3