From 86d81d320ace9111b19c6153d0c4a4c9fe4d6593 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 24 Feb 2008 17:36:10 +0000 Subject: added a new try for shorewall subscription git-svn-id: https://svn/ipuppet/trunk/modules/shorewall@834 d66ca3ae-40d7-4aa7-90d4-87d79ca94279 --- manifests/init.pp | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index c917951..98be44c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -32,19 +32,19 @@ class shorewall { service { shorewall: ensure => running, enable => true, -# subscribe => [ -# Exec[concat_zones], -# Exec[concat_interfaces], -# Exec[concat_hosts], -# Exec[concat_policy], -# Exec[concat_rules], -# Exec[concat_masq], -# Exec[concat_proxyarp], -# Exec[concat_nat], -# Exec[concat_blacklist], -# Exec[concat_rfc1918], -# Exec[concat_routestopped] -# ], + subscribe => [ + Exec["concat_/var/lib/puppet/modules/shorewall/zones], + Exec["concat_/var/lib/puppet/modules/shorewall/interfaces], + Exec["concat_/var/lib/puppet/modules/shorewall/hosts], + Exec["concat_/var/lib/puppet/modules/shorewall/policy], + Exec["concat_/var/lib/puppet/modules/shorewall/rules], + Exec["concat_/var/lib/puppet/modules/shorewall/masq], + Exec["concat_/var/lib/puppet/modules/shorewall/proxyarp], + Exec["concat_/var/lib/puppet/modules/shorewall/nat], + Exec["concat_/var/lib/puppet/modules/shorewall/blacklist], + Exec["concat_/var/lib/puppet/modules/shorewall/rfc1918], + Exec["concat_/var/lib/puppet/modules/shorewall/routestopped] + ], } file { @@ -58,11 +58,10 @@ class shorewall { define managed_file () { $dir = "/var/lib/puppet/modules/shorewall/${name}.d" - file { - "${dir}": - ensure => directory, - force => true, - mode => 0755, owner => root, group => 0; + file {"${dir}": + ensure => directory, + force => true, + mode => 0755, owner => root, group => 0; } -- cgit v1.2.3