Merge branch 'next' of https://github.com/ipfire/ipfire-2.x into feature_firewalllog_...

[people/teissler/ipfire-2.x.git] / config / etc / sysctl.conf

diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf
index 8e06701ee630883e2b39159057f436d8cff8763b..d6a2f75048123728f5b44b7a245d200761e67c5f 100644 (file)
--- a/config/etc/sysctl.conf
+++ b/config/etc/sysctl.conf
@@ -20,9 +20,14 @@ net.ipv4.conf.all.accept_redirects = 0
 net.ipv4.conf.all.accept_source_route = 0
 net.ipv4.conf.all.log_martians = 1
 
-net.netfilter.nf_conntrack_acct = 1
-
 kernel.printk = 1 4 1 7
 vm.swappiness=0
 vm.mmap_min_addr = 4096
 vm.min_free_kbytes = 8192
+
+# Disable IPv6 by default.
+net.ipv6.conf.all.disable_ipv6 = 1
+net.ipv6.conf.default.disable_ipv6 = 1
+
+# Enable netfilter accounting
+net.netfilter.nf_conntrack_acct=1