diff options
| author | mh <mh@immerda.ch> | 2013-01-02 19:46:18 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2013-01-02 19:46:18 +0100 |
| commit | 3d2e75b8b438dff6f32ce22664b148b6a5ca365e (patch) | |
| tree | 8776b0c07243096a00dc2d0f18752a958895414d /manifests/base.pp | |
| parent | 58103ed409fc61d8e653babb73fcaf510969f3db (diff) | |
| parent | e511291a111db7a7d88a8820c5423aa5b92304e0 (diff) | |
| download | puppet-shorewall-3d2e75b8b438dff6f32ce22664b148b6a5ca365e.tar.gz puppet-shorewall-3d2e75b8b438dff6f32ce22664b148b6a5ca365e.tar.bz2 | |
Merge remote-tracking branch 'riseup/master'
Conflicts:
files/shorewall.conf.CentOS.6
files/shorewall.conf.Debian.wheezy
Diffstat (limited to 'manifests/base.pp')
| -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, |