From ab98a9e6b01246b86ee6e62bfb6afa034cc7145d Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Thu, 21 Jan 2016 17:00:51 -0600
Subject: [PATCH] Clean up sysctl.conf settings

---
 vpnsetup.sh        | 9 +++------
 vpnsetup_centos.sh | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/vpnsetup.sh b/vpnsetup.sh
index 1c761f4..ef0ee50 100644
--- a/vpnsetup.sh
+++ b/vpnsetup.sh
@@ -17,6 +17,8 @@
 # Attribution required: please include my name in any derivative and let me
 # know how you have improved it! 
 
+# ------------------------------------------------------------
+
 # Please define your own values for these variables
 # - All values MUST be quoted using 'single quotes'
 # - DO NOT use these characters inside values:  \ " '
@@ -28,7 +30,7 @@ VPN_PASSWORD='your_very_secure_password'
 # Be sure to read *important notes* at the URL below:
 # https://github.com/hwdsl2/setup-ipsec-vpn#important-notes
 
-### Do not edit below this line
+# ------------------------------------------------------------
 
 if [ "$(uname)" = "Darwin" ]; then
   echo 'DO NOT run this script on your Mac! It should only be run on a newly-created EC2 instance'
@@ -233,20 +235,15 @@ if ! grep -qs "hwdsl2 VPN script" /etc/sysctl.conf; then
 cat >> /etc/sysctl.conf <<EOF
 
 # Added by hwdsl2 VPN script
-kernel.sysrq = 0
-kernel.core_uses_pid = 1
 kernel.msgmnb = 65536
 kernel.msgmax = 65536
 kernel.shmmax = 68719476736
 kernel.shmall = 4294967296
-kernel.randomize_va_space = 1
 
 net.ipv4.ip_forward = 1
 net.ipv4.tcp_syncookies = 1
 net.ipv4.conf.all.accept_source_route = 0
 net.ipv4.conf.default.accept_source_route = 0
-net.ipv4.conf.all.log_martians = 1
-net.ipv4.conf.default.log_martians = 1
 net.ipv4.conf.all.accept_redirects = 0
 net.ipv4.conf.default.accept_redirects = 0
 net.ipv4.conf.all.send_redirects = 0
diff --git a/vpnsetup_centos.sh b/vpnsetup_centos.sh
index 0be8cdd..02bf7f1 100644
--- a/vpnsetup_centos.sh
+++ b/vpnsetup_centos.sh
@@ -16,6 +16,8 @@
 # Attribution required: please include my name in any derivative and let me
 # know how you have improved it! 
 
+# ------------------------------------------------------------
+
 # Please define your own values for these variables
 # - All values MUST be quoted using 'single quotes'
 # - DO NOT use these characters inside values:  \ " '
@@ -27,7 +29,7 @@ VPN_PASSWORD='your_very_secure_password'
 # Be sure to read *important notes* at the URL below:
 # https://github.com/hwdsl2/setup-ipsec-vpn#important-notes
 
-### Do not edit below this line
+# ------------------------------------------------------------
 
 if [ "$(uname)" = "Darwin" ]; then
   echo 'DO NOT run this script on your Mac! It should only be run on a dedicated server / VPS'
@@ -272,20 +274,15 @@ if ! grep -qs "hwdsl2 VPN script" /etc/sysctl.conf; then
 cat >> /etc/sysctl.conf <<EOF
 
 # Added by hwdsl2 VPN script
-kernel.sysrq = 0
-kernel.core_uses_pid = 1
 kernel.msgmnb = 65536
 kernel.msgmax = 65536
 kernel.shmmax = 68719476736
 kernel.shmall = 4294967296
-kernel.randomize_va_space = 1
 
 net.ipv4.ip_forward = 1
 net.ipv4.tcp_syncookies = 1
 net.ipv4.conf.all.accept_source_route = 0
 net.ipv4.conf.default.accept_source_route = 0
-net.ipv4.conf.all.log_martians = 1
-net.ipv4.conf.default.log_martians = 1
 net.ipv4.conf.all.accept_redirects = 0
 net.ipv4.conf.default.accept_redirects = 0
 net.ipv4.conf.all.send_redirects = 0