Commit 29e80fe6 authored by Micah Anderson's avatar Micah Anderson

actually it is not possible to provide the site-shorewall sources for

shorewall.conf, because if they do not exist, you will get a puppet error.

this commit removes them, and updates the README to provide instructions for how
you can do it the old way, if you want
parent cf0f8bb5
......@@ -49,14 +49,15 @@ shorewall.conf, simply do this:
NOTE: this requires the augeas ruby bindings newer than 0.7.3.
If you need to, you can provide an entire shorewall.conf by placing it in one of
the following locations:
"puppet:///modules/site-shorewall/${fqdn}/shorewall.conf.$operatingsystem",
"puppet:///modules/site-shorewall/${fqdn}/shorewall.conf",
"puppet:///modules/site-shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
"puppet:///modules/site-shorewall/shorewall.conf.$operatingsystem",
"puppet:///modules/site-shorewall/shorewall.conf"
If you need to, you can provide an entire shorewall.conf by overriding the file
resource, for example:
class site_shorewall::config inherits shorewall::base {
File["/etc/shorewall/shorewall.conf"] {
source => "puppet:///modules/site_shorewall/${::fqdn}/shorewall.conf.${::operatingsystem}",
}
}
NOTE: if you distribute a file, you cannot also use augeas, puppet and augeas
will fight forever
......
......@@ -6,14 +6,6 @@ class shorewall::base {
# This file has to be managed in place, so shorewall can find it
file {
'/etc/shorewall/shorewall.conf':
# use OS specific defaults, but use Default if no other is found
source => [
"puppet:///modules/site_shorewall/${::fqdn}/shorewall.conf.${::operatingsystem}",
"puppet:///modules/site_shorewall/${::fqdn}/shorewall.conf",
"puppet:///modules/site_shorewall/shorewall.conf.${::operatingsystem}.${::lsbdistcodename}",
"puppet:///modules/site_shorewall/shorewall.conf.${::operatingsystem}",
"puppet:///modules/site_shorewall/shorewall.conf",
],
require => Package[shorewall],
notify => Service[shorewall],
owner => root, group => 0, mode => 0644;
......
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