summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>2008-04-24 12:26:34 +0000
committermh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>2008-04-24 12:26:34 +0000
commit9b993d7a97361a5044e896e7cdf6ad22a1d05870 (patch)
treeffe51478b18c0c12526e1d523cc29928564bb420
parent20230c3ee5129778c136364c78ba7c45dbc68bf3 (diff)
downloadpuppet-shorewall-9b993d7a97361a5044e896e7cdf6ad22a1d05870.tar.gz
puppet-shorewall-9b993d7a97361a5044e896e7cdf6ad22a1d05870.tar.bz2
unified fileserver location, in the future the fileserver should only be accessed by $server
git-svn-id: https://svn/ipuppet/trunk/modules/shorewall@1251 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
-rw-r--r--manifests/init.pp10
1 files changed, 5 insertions, 5 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 04b06bb..5813a3c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -73,11 +73,11 @@ class shorewall {
}
file {
"${dir}/000-header":
- source => "puppet://$servername/shorewall/boilerplate/${name}.header",
+ source => "puppet://$server/shorewall/boilerplate/${name}.header",
mode => 0600, owner => root, group => 0,
notify => Exec["concat_${dir}"];
"${dir}/999-footer":
- source => "puppet://$servername/shorewall/boilerplate/${name}.footer",
+ source => "puppet://$server/shorewall/boilerplate/${name}.footer",
mode => 0600, owner => root, group => 0,
notify => Exec["concat_${dir}"];
}
@@ -98,9 +98,9 @@ class shorewall {
file { "/etc/shorewall/shorewall.conf":
# use OS specific defaults, but use Default if no other is found
source => [
- "puppet://$servername/shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
- "puppet://$servername/shorewall/shorewall.conf.$operatingsystem",
- "puppet://$servername/shorewall/shorewall.conf.Default"
+ "puppet://$server/shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
+ "puppet://$server/shorewall/shorewall.conf.$operatingsystem",
+ "puppet://$server/shorewall/shorewall.conf.Default"
],
mode => 0644, owner => root, group => 0,
notify => Service[shorewall],