diff options
| author | Micah Anderson <micah@riseup.net> | 2012-12-04 15:39:15 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-12-04 15:39:15 -0500 |
| commit | 29e80fe61983821dc50ea54a05013c351206d5bd (patch) | |
| tree | a27a743dd01a2220eb41c291e0ffdc3a9e1a19de /manifests | |
| parent | cf0f8bb58178df4b7ce54abab3684a2240c43855 (diff) | |
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
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/base.pp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 0007e40..7dd025f 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -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; |