diff options
author | Micah <micah@riseup.net> | 2015-12-09 14:41:31 +0000 |
---|---|---|
committer | Micah <micah@riseup.net> | 2015-12-09 14:41:31 +0000 |
commit | edd5db0159d5075609c545fb3ee10727a1cf5271 (patch) | |
tree | d6a923dd8aaeed28210272c1895d9f23d8b250d3 /manifests/base.pp | |
parent | 1cfb479d642bc106ea71596a49b3c152dcb2f64f (diff) | |
parent | 6bca4007a104cc7f1736613679b171f19a706685 (diff) | |
download | puppet-shorewall-shared.tar.gz puppet-shorewall-shared.tar.bz2 |
Merge branch 'immerda_changes' into 'master'
shared
Immerda changes
See merge request !5
Diffstat (limited to 'manifests/base.pp')
-rw-r--r-- | manifests/base.pp | 69 |
1 files changed, 49 insertions, 20 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 7959f01..0cf3dc6 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -8,16 +8,16 @@ class shorewall::base { # This file has to be managed in place, so shorewall can find it file { '/etc/shorewall/shorewall.conf': - require => Package[shorewall], - notify => Service[shorewall], - owner => root, - group => 0, + require => Package['shorewall'], + notify => Exec['shorewall_check'], + owner => 'root', + group => 'root', mode => '0644'; '/etc/shorewall/puppet': ensure => directory, - require => Package[shorewall], - owner => root, - group => 0, + require => Package['shorewall'], + owner => 'root', + group => 'root', mode => '0644'; } @@ -27,22 +27,51 @@ class shorewall::base { } } else { - Class['augeas'] -> Class['shorewall::base'] + Class['augeas'] -> Class['shorewall::base'] - 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'], - require => Package['shorewall']; - } + 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 => Exec['shorewall_check'], + require => Package['shorewall']; + } } + exec{'shorewall_check': + command => 'shorewall check', + refreshonly => true, + notify => Service['shorewall'], + } service{'shorewall': - ensure => running, - enable => true, - hasstatus => true, - hasrestart => true, - require => Package['shorewall'], + ensure => running, + enable => true, + hasstatus => true, + hasrestart => true, + require => Package['shorewall'], + } + + file{'/etc/cron.daily/shorewall_check':} + if $shorewall::daily_check { + File['/etc/cron.daily/shorewall_check']{ + content => '#!/bin/bash + +output=$(shorewall check 2>&1) +if [ $? -gt 0 ]; then + echo "Error while checking firewall!" + echo $output + exit 1 +fi +exit 0 +', + owner => root, + group => 0, + mode => '0700', + require => Service['shorewall'], + } + } else { + File['/etc/cron.daily/shorewall_check']{ + ensure => absent, + } } } |