From 784c5840807789d23b1b6a0faaaf9d2d530f91e3 Mon Sep 17 00:00:00 2001
From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Wed, 22 Apr 2009 14:20:26 +0200
Subject: [PATCH] Handle sysctl.conf upgrade.

---
 files/etc/sysctl.conf         |    6 ------
 files/etc/sysctl.conf.expect  |   30 ++++++++++++++++++++++++++++++
 files/etc/sysctl.conf.restore |   26 ++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 6 deletions(-)
 delete mode 100644 files/etc/sysctl.conf
 create mode 100644 files/etc/sysctl.conf.expect
 create mode 100644 files/etc/sysctl.conf.restore

diff --git a/files/etc/sysctl.conf b/files/etc/sysctl.conf
deleted file mode 100644
index 3ee7e4d..0000000
--- a/files/etc/sysctl.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# /etc/sysctl.conf - Configuration file for setting system variables
-# See sysctl.conf (5) for information.
-#
-#kernel.domainname = example.com
-#net/ipv4/icmp_echo_ignore_broadcasts=1
diff --git a/files/etc/sysctl.conf.expect b/files/etc/sysctl.conf.expect
new file mode 100644
index 0000000..9754851
--- /dev/null
+++ b/files/etc/sysctl.conf.expect
@@ -0,0 +1,30 @@
+#
+# /etc/sysctl.conf - Configuration file for setting system variables
+# See sysctl.conf (5) for information.
+#
+#kernel.domainname=example.com
+#kernel.printk=4 4 1 7
+#net.ipv4.conf.default.forwarding=1
+#net.ipv4.conf.default.rp_filter=1
+#net.ipv4.icmp_echo_ignore_broadcasts=1
+#net.ipv6.conf.default.forwarding=1
+kernel.maps_protect=1
+net.core.rmem_default=1048576
+net.core.wmem_default=1048576
+net.ipv4.conf.all.accept_redirects=0
+net.ipv4.conf.all.accept_source_route=0
+net.ipv4.conf.all.log_martians=1
+net.ipv4.conf.all.rp_filter=1
+net.ipv4.conf.all.secure_redirects=1
+net.ipv4.conf.all.send_redirects=0
+net.ipv4.icmp_echo_ignore_broadcasts=1
+net.ipv4.icmp_ignore_bogus_error_responses=1
+net.ipv4.ip_forward=0
+net.ipv4.ip_local_port_range=10000 65000
+net.ipv4.tcp_congestion_control=cubic
+net.ipv4.tcp_ecn=0
+net.ipv4.tcp_max_syn_backlog=8192
+net.ipv4.tcp_retries1=2
+net.ipv4.tcp_rfc1337=1
+net.ipv4.tcp_syncookies=0
+vm.mmap_min_addr=65536
diff --git a/files/etc/sysctl.conf.restore b/files/etc/sysctl.conf.restore
new file mode 100644
index 0000000..971d612
--- /dev/null
+++ b/files/etc/sysctl.conf.restore
@@ -0,0 +1,26 @@
+#
+# /etc/sysctl.conf - Configuration file for setting system variables
+# See sysctl.conf (5) for information.
+#
+
+#kernel.domainname = example.com
+#net/ipv4/icmp_echo_ignore_broadcasts=1
+
+# Uncomment the following to stop low-level messages on console
+#kernel.printk = 4 4 1 7
+
+##############################################################3
+# Functions previously found in netbase
+#
+
+# Uncomment the next line to enable Spoof protection (reverse-path filter)
+#net.ipv4.conf.default.rp_filter=1
+
+# Uncomment the next line to enable TCP/IP SYN cookies
+#net.ipv4.tcp_syncookies=1
+
+# Uncomment the next line to enable packet forwarding for IPv4
+#net.ipv4.conf.default.forwarding=1
+
+# Uncomment the next line to enable packet forwarding for IPv6
+#net.ipv6.conf.default.forwarding=1
-- 
1.7.10.4