diff options
| author | Micah Anderson <micah@riseup.net> | 2012-06-20 11:46:58 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-06-20 11:46:58 -0400 |
| commit | 58543cc4d02f9c47bec3c0d16561d53682881843 (patch) | |
| tree | faa78a536a84c5478cec31305826c9c0d04a6c4a /manifests/init.pp | |
| parent | 6cb88973f53aa7d92414797dd21952c1c1d5da98 (diff) | |
| parent | be37ed29e196008209431f1401c040dd200e3019 (diff) | |
Merge remote-tracking branch 'immerda/master' into riseup
NOTE: the conflicts in the files/shorewall.conf.Debian.squeeze I resolved by
favoring the actual debian squeeze shorewall.conf, there were a few options
in the immerda one that were not the same.
Conflicts:
README
files/shorewall.conf.Debian.squeeze
manifests/base.pp
manifests/blacklist.pp
manifests/debian.pp
manifests/host.pp
manifests/init.pp
manifests/interface.pp
manifests/masq.pp
manifests/nat.pp
manifests/params.pp
manifests/policy.pp
manifests/proxyarp.pp
manifests/rfc1918.pp
manifests/routestopped.pp
manifests/rule.pp
manifests/rule_section.pp
manifests/rules/out/ekeyd.pp
manifests/zone.pp
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index e5456d0..31cf5e4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,9 +1,8 @@ -class shorewall { +class shorewall( + $startup = '1' +) { - include common::moduledir - module_dir { "shorewall": } - - case $operatingsystem { + case $::operatingsystem { gentoo: { include shorewall::gentoo } debian: { include shorewall::debian @@ -11,7 +10,7 @@ class shorewall { } centos: { include shorewall::base } ubuntu: { - case $lsbdistcodename { + case $::lsbdistcodename { karmic: { include shorewall::ubuntu::karmic } default: { include shorewall::debian } } @@ -39,12 +38,6 @@ class shorewall { } $real_non_torified_users = uniq_flatten([ $tor_user, $non_torified_users ]) - file {"/var/lib/puppet/modules/shorewall": - ensure => directory, - force => true, - owner => root, group => 0, mode => 0755; - } - # See http://www.shorewall.net/3.0/Documentation.htm#Zones shorewall::managed_file{ zones: } # See http://www.shorewall.net/3.0/Documentation.htm#Interfaces @@ -67,7 +60,7 @@ class shorewall { shorewall::managed_file { rfc1918: } # See http://www.shorewall.net/3.0/Documentation.htm#Routestopped shorewall::managed_file { routestopped: } - # See http://www.shorewall.net/3.0/Documentation.htm#Variables + # See http://www.shorewall.net/3.0/Documentation.htm#Variables shorewall::managed_file { params: } # See http://www.shorewall.net/3.0/traffic_shaping.htm shorewall::managed_file { tcdevices: } @@ -75,5 +68,6 @@ class shorewall { shorewall::managed_file { tcrules: } # See http://www.shorewall.net/3.0/traffic_shaping.htm shorewall::managed_file { tcclasses: } - + # http://www.shorewall.net/manpages/shorewall-providers.html + shorewall::managed_file { providers: } } |