summaryrefslogtreecommitdiff
path: root/testing/iptables/iptables.conf.d
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-07-25 11:33:12 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-07-25 11:33:12 -0300
commit8b3071c77c79bbf0f373ca9b8ce0795c55d03669 (patch)
tree0b9c9ccac567cbaf87b22dcd32f10ceed2db065c /testing/iptables/iptables.conf.d
parent0d18015803bebeb58911bf791653597291056095 (diff)
parent43983783a3e8bf61896eb93a2858a14bbaf3a53b (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/compiz-bcop/PKGBUILD community/compiz-fusion-plugins-extra/PKGBUILD community/compiz-fusion-plugins-main/PKGBUILD community/emerald/PKGBUILD community/gmic/PKGBUILD community/libcompizconfig/PKGBUILD core/xinetd/PKGBUILD extra/archboot/PKGBUILD extra/kdeplasma-addons/PKGBUILD extra/kipi-plugins/PKGBUILD extra/libmpdclient/PKGBUILD extra/live-media/PKGBUILD extra/mysql/PKGBUILD extra/pyopenssl/PKGBUILD extra/r/PKGBUILD extra/telepathy-mission-control/PKGBUILD libre/libretools/PKGBUILD multilib-testing/lib32-mesa/PKGBUILD multilib/lib32-libldap/PKGBUILD multilib/lib32-libldap/ntlm.patch multilib/wine/PKGBUILD testing/mesa/PKGBUILD
Diffstat (limited to 'testing/iptables/iptables.conf.d')
-rw-r--r--testing/iptables/iptables.conf.d14
1 files changed, 9 insertions, 5 deletions
diff --git a/testing/iptables/iptables.conf.d b/testing/iptables/iptables.conf.d
index 07bc11aa1..1c6cc7b5d 100644
--- a/testing/iptables/iptables.conf.d
+++ b/testing/iptables/iptables.conf.d
@@ -1,8 +1,12 @@
# Configuration for iptables rules
-
-IPTABLES=/usr/sbin/iptables
-IP6TABLES=/usr/sbin/ip6tables
-
IPTABLES_CONF=/etc/iptables/iptables.rules
IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-IPTABLES_FORWARD=0 # enable IP forwarding?
+
+# Enable IP forwarding (both IPv4 and IPv6)
+# NOTE: this is not the recommended way to do this, and is supported only for
+# backward compatibility. Instead, use /etc/sysctl.conf and set the following
+# options:
+# * net.ipv4.ip_forward=1
+# * net.ipv6.conf.default.forwarding=1
+# * net.ipv6.conf.all.forwarding=1
+#IPTABLES_FORWARD=0