diff options
| author | Micah Anderson <micah@riseup.net> | 2012-12-04 15:20:13 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-12-04 15:20:13 -0500 |
| commit | cf0f8bb58178df4b7ce54abab3684a2240c43855 (patch) | |
| tree | d21e18f8dfa6d3b1cf7c9c0213b10bc52f31aaee /manifests/base.pp | |
| parent | 5052233d92e97263eab292408ed2602db0836d98 (diff) | |
Stop shipping the default shorewall.conf file, instead we should let the
operatingsystem package install its default config (this lets us stop having to
keep this file updated), and instead tell people to configure their
shorewall.conf file using the augeas method.
It is possible still to distribute a shorewall.conf from a site-shorewall
directory, however if the file is distributed, then it is not possible to use
the augeas method.
https://labs.riseup.net/code/issues/2738
Diffstat (limited to 'manifests/base.pp')
| -rw-r--r-- | manifests/base.pp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 937b83b..0007e40 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -13,10 +13,6 @@ class shorewall::base { "puppet:///modules/site_shorewall/shorewall.conf.${::operatingsystem}.${::lsbdistcodename}", "puppet:///modules/site_shorewall/shorewall.conf.${::operatingsystem}", "puppet:///modules/site_shorewall/shorewall.conf", - "puppet:///modules/shorewall/shorewall.conf.${::operatingsystem}.${::lsbdistcodename}", - "puppet:///modules/shorewall/shorewall.conf.${::operatingsystem}.${::lsbmajdistrelease}", - "puppet:///modules/shorewall/shorewall.conf.${::operatingsystem}", - "puppet:///modules/shorewall/shorewall.conf" ], require => Package[shorewall], notify => Service[shorewall], |