aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2013-01-02 20:12:40 +0100
committermh <mh@immerda.ch>2013-01-02 20:12:40 +0100
commit00783476d162088eaf7a15a287316c2233ae5465 (patch)
tree7c06c2345292190747d5053256053e23ac337cc9 /manifests
parenteac5a3c28c4773531964f77e25291c88efcc5e12 (diff)
downloadpuppet-shorewall-00783476d162088eaf7a15a287316c2233ae5465.tar.gz
puppet-shorewall-00783476d162088eaf7a15a287316c2233ae5465.tar.bz2
cleanup a merge issue
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp3
1 files changed, 1 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 13eea89..5a7f740 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -63,8 +63,7 @@ class shorewall(
shorewall::managed_file { providers: }
# See http://www.shorewall.net/manpages/shorewall-tunnels.html
shorewall::managed_file { tunnel: }
-
+ # See http://www.shorewall.net/MultiISP.html
shorewall::managed_file { rtrules: }
- shorewall::managed_file { providers: }
}