diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/base.pp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 97f94f5..52e77d8 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -7,18 +7,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", - "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], owner => root, group => 0, mode => 0644; @@ -28,6 +16,13 @@ class shorewall::base { owner => root, group => 0, mode => 0644; } + augeas { 'shorewall_module_config_path': + changes => 'set /files/etc/shorewall/shorewall.conf/CONFIG_PATH \'"/etc/shorewall/puppet:/etc/shorewall:/usr/share/shorewall"\'', + lens => 'Shellvars.lns', + incl => '/etc/shorewall/shorewall.conf', + notify => Service[shorewall]; + } + service{shorewall: ensure => running, enable => true, |