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

1 files changed, 9 insertions, 8 deletions

diff --git a/README b/README
index 50a2bb9..2487f20 100644
--- a/README
+++ b/README
@@ -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