aboutsummaryrefslogtreecommitdiff
path: root/files/shorewall.conf.Debian.etch
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2012-11-11 23:10:20 +0100
committerintrigeri <intrigeri@boum.org>2012-11-11 23:10:20 +0100
commit8080f1a892a69dc171187c8165d7e81f5b5b512d (patch)
tree6e610ec18aaa13f7797eedd08b03c852e49d8cfb /files/shorewall.conf.Debian.etch
parent911cc18e594bb5a3ab642ebb24615a0447050c32 (diff)
parent5052233d92e97263eab292408ed2602db0836d98 (diff)
downloadpuppet-shorewall-8080f1a892a69dc171187c8165d7e81f5b5b512d.tar.gz
puppet-shorewall-8080f1a892a69dc171187c8165d7e81f5b5b512d.tar.bz2
Merge remote-tracking branch 'riseup/master' into tmp
Conflicts: manifests/init.pp
Diffstat (limited to 'files/shorewall.conf.Debian.etch')
-rw-r--r--files/shorewall.conf.Debian.etch2
1 files changed, 1 insertions, 1 deletions
diff --git a/files/shorewall.conf.Debian.etch b/files/shorewall.conf.Debian.etch
index e5c722d..5907945 100644
--- a/files/shorewall.conf.Debian.etch
+++ b/files/shorewall.conf.Debian.etch
@@ -77,7 +77,7 @@ SUBSYSLOCK=""
MODULESDIR=
# add puppet delivered files in front
-CONFIG_PATH=/var/lib/puppet/modules/shorewall:/etc/shorewall:/usr/share/shorewall
+CONFIG_PATH=/etc/shorewall/puppet:/etc/shorewall:/usr/share/shorewall
RESTOREFILE=