Commit f9c1086a authored by mh's avatar mh

remove unnecessary fileserver variable (#2460)

parent 4e80aa80
...@@ -7,14 +7,14 @@ class shorewall::base { ...@@ -7,14 +7,14 @@ class shorewall::base {
file { "/etc/shorewall/shorewall.conf": file { "/etc/shorewall/shorewall.conf":
# use OS specific defaults, but use Default if no other is found # use OS specific defaults, but use Default if no other is found
source => [ source => [
"puppet://$server/modules/site-shorewall/${fqdn}/shorewall.conf.$operatingsystem", "puppet:///modules/site-shorewall/${fqdn}/shorewall.conf.$operatingsystem",
"puppet://$server/modules/site-shorewall/${fqdn}/shorewall.conf", "puppet:///modules/site-shorewall/${fqdn}/shorewall.conf",
"puppet://$server/modules/site-shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename", "puppet:///modules/site-shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
"puppet://$server/modules/site-shorewall/shorewall.conf.$operatingsystem", "puppet:///modules/site-shorewall/shorewall.conf.$operatingsystem",
"puppet://$server/modules/site-shorewall/shorewall.conf", "puppet:///modules/site-shorewall/shorewall.conf",
"puppet://$server/modules/shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename", "puppet:///modules/shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
"puppet://$server/modules/shorewall/shorewall.conf.$operatingsystem", "puppet:///modules/shorewall/shorewall.conf.$operatingsystem",
"puppet://$server/modules/shorewall/shorewall.conf" "puppet:///modules/shorewall/shorewall.conf"
], ],
require => Package[shorewall], require => Package[shorewall],
notify => Service[shorewall], notify => Service[shorewall],
......
...@@ -3,7 +3,7 @@ class shorewall::debian inherits shorewall::base { ...@@ -3,7 +3,7 @@ class shorewall::debian inherits shorewall::base {
'': { $shorewall_startup = "1" } '': { $shorewall_startup = "1" }
} }
file{'/etc/default/shorewall': file{'/etc/default/shorewall':
#source => "puppet://$server/modules/shorewall/debian/default", #source => "puppet:///modules/shorewall/debian/default",
content => template("shorewall/debian_default.erb"), content => template("shorewall/debian_default.erb"),
require => Package['shorewall'], require => Package['shorewall'],
notify => Service['shorewall'], notify => Service['shorewall'],
......
...@@ -6,11 +6,11 @@ define shorewall::managed_file () { ...@@ -6,11 +6,11 @@ define shorewall::managed_file () {
} }
file { file {
"${dir}/000-header": "${dir}/000-header":
source => "puppet://$server/modules/shorewall/boilerplate/${name}.header", source => "puppet:///modules/shorewall/boilerplate/${name}.header",
mode => 0600, owner => root, group => 0, mode => 0600, owner => root, group => 0,
notify => Exec["concat_${dir}"]; notify => Exec["concat_${dir}"];
"${dir}/999-footer": "${dir}/999-footer":
source => "puppet://$server/modules/shorewall/boilerplate/${name}.footer", source => "puppet:///modules/shorewall/boilerplate/${name}.footer",
mode => 0600, owner => root, group => 0, mode => 0600, owner => root, group => 0,
notify => Exec["concat_${dir}"]; notify => Exec["concat_${dir}"];
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment