From 331e0c1d17b9ce3d07c0a4d7c191bff75881afd6 Mon Sep 17 00:00:00 2001
From: xiagw <fxiaxiaoyu@gmail.com>
Date: Mon, 8 Jan 2018 16:56:35 +0800
Subject: [PATCH] merged from master

---
 edit-in-master.sh  | 769 +++++++++++++++++++++++++++++++++++++++++++++
 openvpn-install.sh | 192 ++++++-----
 origin-upstream.sh | 693 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 1569 insertions(+), 85 deletions(-)
 create mode 100644 edit-in-master.sh
 create mode 100644 origin-upstream.sh

diff --git a/edit-in-master.sh b/edit-in-master.sh
new file mode 100644
index 0000000..ab0c534
--- /dev/null
+++ b/edit-in-master.sh
@@ -0,0 +1,769 @@
+#!/bin/bash
+
+# Secure OpenVPN server installer for Debian, Ubuntu, CentOS and Arch Linux
+# https://github.com/Angristan/OpenVPN-install
+
+
+if [[ "$EUID" -ne 0 ]]; then
+	echo "Sorry, you need to run this as root"
+	exit 1
+fi
+
+if [[ ! -e /dev/net/tun ]]; then
+	echo "TUN is not available"
+	exit 2
+fi
+
+if grep -qs "CentOS release 5" "/etc/redhat-release"; then
+	echo "CentOS 5 is too old and not supported"
+	exit 3
+fi
+
+## Global variables
+dir_openvpn='/etc/openvpn'
+dir_easy="${dir_openvpn}/easy-rsa"
+dir_pki="${dir_easy}/pki"
+bin_easy="${dir_easy}/easyrsa"
+conf_client_tpl="${dir_openvpn}/client-template.txt"
+conf_server="${dir_openvpn}/server.conf"
+conf_iptables='/etc/sysconfig/iptables.rules'
+
+## function: config the firewall
+set_firewall(){
+
+# Create the sysctl configuration file if needed (mainly for Arch Linux)
+if [[ ! -e $SYSCTL ]]; then
+	touch $SYSCTL
+fi
+
+# Enable net.ipv4.ip_forward for the system
+sed -i '/\<net.ipv4.ip_forward\>/c\net.ipv4.ip_forward=1' $SYSCTL
+if ! grep -q "\<net.ipv4.ip_forward\>" $SYSCTL; then
+	echo 'net.ipv4.ip_forward=1' >> $SYSCTL
+fi
+# Avoid an unneeded reboot
+echo 1 > /proc/sys/net/ipv4/ip_forward
+# Set NAT for the VPN subnet
+iptables -t nat -A POSTROUTING -o $NIC -s 10.8.0.0/24 -j MASQUERADE
+# Save persitent iptables rules
+iptables-save > $conf_iptables
+if pgrep firewalld; then
+	# We don't use --add-service=openvpn because that would only work with
+	# the default port. Using both permanent and not permanent rules to
+	# avoid a firewalld reload.
+	firewall-cmd --zone=public --add-port=$PORT/${PROTOCOL}
+	firewall-cmd --permanent --zone=public --add-port=$PORT/${PROTOCOL}
+	firewall-cmd --zone=trusted --add-source=10.8.0.0/24
+	firewall-cmd --permanent --zone=trusted --add-source=10.8.0.0/24
+fi
+if iptables -L -n | grep -qE 'REJECT|DROP'; then
+	# If iptables has at least one REJECT rule, we asume this is needed.
+	# Not the best approach but I can't think of other and this shouldn't
+	# cause problems.
+	iptables -I INPUT -p ${PROTOCOL} --dport $PORT -j ACCEPT
+	iptables -I FORWARD -s 10.8.0.0/24 -j ACCEPT
+	iptables -I FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
+	# Save persitent OpenVPN rules
+	iptables-save > $conf_iptables
+fi
+# If SELinux is enabled and a custom port was selected, we need this
+if hash sestatus 2>/dev/null; then
+	if sestatus | grep "Current mode" | grep -qs "enforcing"; then
+		if [[ "$PORT" != '1194' ]]; then
+			# semanage isn't available in CentOS 6 by default
+			if ! hash semanage 2>/dev/null; then
+				yum install policycoreutils-python -y
+			fi
+			semanage port -a -t openvpn_port_t -p ${PROTOCOL} $PORT
+		fi
+	fi
+fi
+}
+
+## function: generate the new client??.ovpn
+generate_newclient() {
+
+echo ""
+echo "Tell me a name for the client cert"
+echo "Please, use one word only, no special characters"
+echo "Here are the files that already exist,do not repeat that"
+tail -n +2 ${file_index} | grep "^V" | cut -d '=' -f 2 | nl -s ') '
+read -p "Client name: " -e -i client CLIENT
+cd ${dir_easy}
+${bin_easy} build-client-full $CLIENT nopass
+
+# Generates the custom client.ovpn
+# Where to write the custom client.ovpn?
+if [ -e /home/$CLIENT ]; then  # if $CLIENT is a user name
+	homeDir="/home/$CLIENT"
+elif [ ${SUDO_USER} ]; then   # if not, use SUDO_USER
+	homeDir="/home/${SUDO_USER}"
+else  # if not SUDO_USER, use /root
+	homeDir="${dir_openvpn}"
+fi
+# Generates the custom client.ovpn
+file_client="$homeDir/$CLIENT.ovpn"
+cp ${conf_client_tpl} ${file_client}
+echo "<ca>" >> ${file_client}
+cat ${dir_pki}/ca.crt >> ${file_client}
+echo "</ca>" >> ${file_client}
+echo "<cert>" >> ${file_client}
+cat ${dir_pki}/issued/$CLIENT.crt >> ${file_client}
+echo "</cert>" >> ${file_client}
+echo "<key>" >> ${file_client}
+cat ${dir_pki}/private/$CLIENT.key >> ${file_client}
+echo "</key>" >> ${file_client}
+echo "key-direction 1" >> ${file_client}
+echo "<tls-auth>" >> ${file_client}
+cat ${dir_openvpn}/tls-auth.key >> ${file_client}
+echo "</tls-auth>" >> ${file_client}
+
+echo ""
+echo "Client $CLIENT added, certs available at $homeDir/$CLIENT.ovpn"
+
+}
+
+## function: revoke a exist client??.ovpn
+revoke_openvpn_client(){
+
+NUMBEROFCLIENTS=$(tail -n +2 ${file_index} | grep -c "^V")
+if [[ "$NUMBEROFCLIENTS" = '0' ]]; then
+	echo ""
+	echo "You have no existing clients!"
+	exit 5
+fi
+echo ""
+echo "Select the existing client certificate you want to revoke"
+tail -n +2 ${file_index} | grep "^V" | cut -d '=' -f 2 | nl -s ') '
+if [[ "$NUMBEROFCLIENTS" = '1' ]]; then
+	read -p "Select one client [1]: " CLIENTNUMBER
+else
+	read -p "Select one client [1-$NUMBEROFCLIENTS]: " CLIENTNUMBER
+fi
+CLIENT=$(tail -n +2 ${file_index} | grep "^V" | cut -d '=' -f 2 | sed -n "${CLIENTNUMBER:?empty-var}"p)
+cd ${dir_easy}
+${bin_easy} --batch revoke $CLIENT
+EASYRSA_CRL_DAYS=3650 ${bin_easy} gen-crl
+rm -f ${dir_pki}/reqs/$CLIENT.req ${dir_pki}/private/$CLIENT.key ${dir_pki}/issued/$CLIENT.crt 
+#rm -f ${dir_openvpn}/crl.pem
+/bin/cp -f ${dir_pki}/crl.pem ${dir_openvpn}/crl.pem
+chmod 644 ${dir_openvpn}/crl.pem
+echo ""
+echo "Certificate for client $CLIENT revoked"
+echo "Exiting..."
+}
+
+## function: install easyrsa 3.0.3
+install_easyrsa(){
+
+# An old version of easy-rsa was available by default in some openvpn packages
+rm -rf ${dir_easy}
+mkdir -p ${dir_easy}
+# Get easy-rsa
+url_easy='https://github.com/OpenVPN/easy-rsa/releases/download/v3.0.3/EasyRSA-3.0.3.tgz'
+file_easy=${url_easy##*/}
+wget -c -O ~/${file_easy} ${url_easy}
+tar xzf ~/${file_easy} -C ~/
+mv ~/${file_easy%.tgz}/* ${dir_easy}/
+chown -R root:root ${dir_easy}/
+rm -rf ~/${file_easy}
+}
+
+## function: install iptables for debian
+systemd_ipt_service(){
+
+dir_ipt='/etc/iptables'
+file_ipt_svc='/etc/systemd/system/iptables.service'
+file_ipt_sh="${dir_ipt}/flush-iptables.sh"
+# Install iptables service
+if [[ ! -e ${file_ipt_svc} ]]; then
+	mkdir ${dir_ipt}
+	iptables-save > ${conf_iptables}
+	echo "#!/bin/sh
+iptables -F
+iptables -X
+iptables -t nat -F
+iptables -t nat -X
+iptables -t mangle -F
+iptables -t mangle -X
+iptables -P INPUT ACCEPT
+iptables -P FORWARD ACCEPT
+iptables -P OUTPUT ACCEPT" > ${file_ipt_sh}
+	chmod +x ${file_ipt_sh}
+	echo "[Unit]
+Description=Packet Filtering Framework
+DefaultDependencies=no
+Before=network-pre.target
+Wants=network-pre.target
+[Service]
+Type=oneshot
+ExecStart=/sbin/iptables-restore ${conf_iptables}
+ExecReload=/sbin/iptables-restore ${conf_iptables}
+ExecStop=/etc/iptables/flush-iptables.sh
+RemainAfterExit=yes
+[Install]
+WantedBy=multi-user.target" > ${file_ipt_svc}
+	systemctl daemon-reload
+	systemctl enable iptables.service
+	if [[ "$OS" = 'centos7' || "$OS" = 'fedora' ]]; then
+		# Disable firewalld to allow iptables to start upon reboot
+		systemctl disable firewalld
+		systemctl mask firewalld
+	fi
+fi
+}
+
+##
+config_iptables(){
+	echo "Please manually set the firewall"
+	read -p "press any key continue..."
+}
+
+##
+config_firewalld(){
+	echo "Please manually set the firewall"
+	read -p "press any key continue..."
+}
+
+	
+## function: install openvpn server
+install_openvpn(){
+
+clear
+cat <<EOF
+Welcome to the secure OpenVPN installer (github.com/Angristan/OpenVPN-install)
+
+I need to ask you a few questions before starting the setup
+You can leave the default options and just press enter if you are ok with them
+"
+I need to know the IPv4 address of the network interface you want OpenVPN listening to.
+If your server is running behind a NAT, (e.g. LowEndSpirit, Scaleway) leave the IP address as it is. (local/private IP)
+Otherwise, it should be your public IPv4 address.
+EOF
+read -p "IP address: " -e -i $IP IP
+
+echo ""
+echo "What port do you want for OpenVPN?"
+read -p "Port: " -e -i 1194 PORT
+
+echo ""
+echo "1/6.What protocol do you want for OpenVPN?"
+echo "Unless UDP is blocked, you should not use TCP (unnecessarily slower)"
+while [[ $PROTOCOL != "udp" && $PROTOCOL != "tcp" ]]; do
+	read -p "Protocol [udp/tcp]: " -e -i udp PROTOCOL
+done
+
+cat <<EOF
+2/6.What DNS do you want to use with the VPN?
+   1) Current system resolvers (from /etc/resolv.conf)
+   2) Quad9 (Anycast: worldwide)
+   3) FDN (France)
+   4) DNS.WATCH (Germany)
+   5) OpenDNS (Anycast: worldwide)
+   6) Google (Anycast: worldwide)
+   7) Yandex Basic (Russia)
+   8) AdGuard DNS (Russia)
+EOF
+while [[ $DNS != [1-8] ]]; do
+	read -p "DNS [1-8]: " -e -i 1 DNS
+done
+
+cat <<EOF
+See https://github.com/Angristan/OpenVPN-install#encryption to learn more about 
+the encryption in OpenVPN and the choices I made in this script.
+Please note that all the choices proposed are secure (to a different degree)
+and are still viable to date, unlike some default OpenVPN options
+
+3/6.Choose which cipher you want to use for the data channel:
+   1) AES-128-CBC (fastest and sufficiently secure for everyone, recommended)
+   2) AES-192-CBC
+   3) AES-256-CBC
+Alternatives to AES, use them only if you know what you're doing.
+They are relatively slower but as secure as AES.
+   4) CAMELLIA-128-CBC
+   5) CAMELLIA-192-CBC
+   6) CAMELLIA-256-CBC
+   7) SEED-CBC
+EOF
+while [[ $CIPHER != [1-7] ]]; do
+	read -p "Cipher [1-7]: " -e -i 1 CIPHER
+done
+case $CIPHER in
+	1)
+	CIPHER="cipher AES-128-CBC"
+	;;
+	2)
+	CIPHER="cipher AES-192-CBC"
+	;;
+	3)
+	CIPHER="cipher AES-256-CBC"
+	;;
+	4)
+	CIPHER="cipher CAMELLIA-128-CBC"
+	;;
+	5)
+	CIPHER="cipher CAMELLIA-192-CBC"
+	;;
+	6)
+	CIPHER="cipher CAMELLIA-256-CBC"
+	;;
+	7)
+	CIPHER="cipher SEED-CBC"
+	;;
+esac
+
+echo ""
+echo "4/6.Choose what size of Diffie-Hellman key you want to use:"
+echo "   1) 2048 bits (fastest)"
+echo "   2) 3072 bits (recommended, best compromise)"
+echo "   3) 4096 bits (most secure)"
+while [[ $DH_KEY_SIZE != [1-3] ]]; do
+	read -p "DH key size [1-3]: " -e -i 2 DH_KEY_SIZE
+done
+case $DH_KEY_SIZE in
+	1)
+	DH_KEY_SIZE="2048"
+	;;
+	2)
+	DH_KEY_SIZE="3072"
+	;;
+	3)
+	DH_KEY_SIZE="4096"
+	;;
+esac
+
+echo ""
+echo "5/6.Choose what size of RSA key you want to use:"
+echo "   1) 2048 bits (fastest)"
+echo "   2) 3072 bits (recommended, best compromise)"
+echo "   3) 4096 bits (most secure)"
+while [[ $RSA_KEY_SIZE != [1-3] ]]; do
+	read -p "RSA key size [1-3]: " -e -i 2 RSA_KEY_SIZE
+done
+case $RSA_KEY_SIZE in
+	1)
+	RSA_KEY_SIZE="2048"
+	;;
+	2)
+	RSA_KEY_SIZE="3072"
+	;;
+	3)
+	RSA_KEY_SIZE="4096"
+	;;
+esac
+
+echo ""
+echo "6/6.Finally, tell me a name for the client certificate and configuration"
+while [[ $CLIENT = "" ]]; do
+	echo "Please, use one word only, no special characters"
+	read -p "Client name: " -e -i client CLIENT
+done
+
+echo ""
+echo "Okay, that was all I needed. We are ready to setup your OpenVPN server now"
+read -n1 -r -p "Press any key to continue..."
+
+if [[ "$OS" = 'debian' ]]; then
+	apt-get install ca-certificates -y
+	# We add the OpenVPN repo to get the latest version.
+	case $VERSION_ID in 
+	'7')  # Debian 7
+		echo "deb http://build.openvpn.net/debian/openvpn/stable wheezy main" > /etc/apt/sources.list.d/openvpn.list
+		wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add -
+		apt-get update
+		;;
+	'8')  # Debian 8
+		echo "deb http://build.openvpn.net/debian/openvpn/stable jessie main" > /etc/apt/sources.list.d/openvpn.list
+		wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add -
+		apt update
+		;;
+	'12.04')  # Ubuntu 12.04
+		echo "deb http://build.openvpn.net/debian/openvpn/stable precise main" > /etc/apt/sources.list.d/openvpn.list
+		wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add -
+		apt-get update
+		;;
+	'14.04')  # Ubuntu 14.04
+		echo "deb http://build.openvpn.net/debian/openvpn/stable trusty main" > /etc/apt/sources.list.d/openvpn.list
+		wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add -
+		apt-get update
+	esac
+	# Ubuntu >= 16.04 and Debian > 8 have OpenVPN > 2.3.3 without the need of a third party repository.
+	## The we install OpenVPN
+	apt-get install openvpn iptables openssl wget ca-certificates curl -y
+	systemd_ipt_service ## call function
+elif [[ "$OS" = 'centos6' || "$OS" = 'centos7' || "$OS" = 'fedora' ]]; then
+	if [[ "$OS" != 'fedora' ]]; then
+		yum install epel-release -y
+	fi
+	yum --enablerepo=epel install openvpn iptables openssl wget ca-certificates curl -y
+	if [[ "$OS" = 'centos6' ]]; then 
+		config_iptables ## call function
+	else
+		config_firewalld ## call function
+	fi
+else
+	# Else, the distro is ArchLinux
+	echo ""
+	echo ""
+	echo "As you're using ArchLinux, I need to update the packages on your system to install those I need."
+	echo "Not doing that could cause problems between dependencies, or missing files in repositories."
+	echo ""
+	echo "Continuing will update your installed packages and install needed ones."
+	while [[ $CONTINUE != [yn] ]]; do
+		read -p "Continue ? [y/n]: " -e -i y CONTINUE
+	done
+	if [[ "$CONTINUE" = "n" ]]; then
+		echo "Ok, bye !"
+		exit 4
+	fi
+
+	if [[ "$OS" = 'arch' ]]; then
+		# Install dependencies
+		pacman -Syu openvpn iptables openssl wget ca-certificates curl --needed --noconfirm
+		iptables-save > ${conf_iptables} # iptables won't start if this file does not exist
+		systemctl daemon-reload
+		systemctl enable iptables
+		systemctl start iptables
+	fi
+fi
+
+
+# Find out if the machine uses nogroup or nobody for the permissionless group
+if grep -qs "^nogroup:" /etc/group; then
+	NOGROUP=nogroup
+else
+	NOGROUP=nobody
+fi
+
+install_easyrsa ## call function 
+
+cd ${dir_easy}/
+echo "set_var EASYRSA_KEY_SIZE $RSA_KEY_SIZE" > vars
+# Create the PKI, set up the CA, the DH params and the server + client certificates
+${dir_easy}/easyrsa init-pki
+${dir_easy}/easyrsa --batch build-ca nopass
+openssl dhparam -out dh.pem $DH_KEY_SIZE
+${dir_easy}/easyrsa build-server-full server nopass
+${dir_easy}/easyrsa build-client-full $CLIENT nopass
+EASYRSA_CRL_DAYS=3650 ./easyrsa gen-crl
+## generate tls-auth key
+openvpn --genkey --secret ${dir_openvpn}/tls-auth.key
+## Move all the generated files
+cp ${dir_pki}/ca.crt ${dir_pki}/private/ca.key dh.pem ${dir_pki}/issued/server.crt ${dir_pki}/private/server.key ${dir_pki}/crl.pem ${dir_openvpn}/
+## Make cert revocation list readable for non-root
+chmod 644 ${dir_openvpn}/crl.pem
+
+## Generate server.conf
+echo "port $PORT
+proto ${PROTOCOL}
+dev tun
+user nobody
+group $NOGROUP
+persist-key
+persist-tun
+keepalive 10 120
+topology subnet
+server 10.8.0.0 255.255.255.0
+ifconfig-pool-persist ipp.txt
+#client-config-dir ccd
+#route 10.8.0.0 255.255.255.252" >> ${conf_server}
+# DNS resolvers
+case $DNS in
+	1)
+	# Obtain the resolvers from resolv.conf and use them for OpenVPN
+	grep -v '#' /etc/resolv.conf | grep 'nameserver' | grep -E -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | while read line; do
+		echo "push \"dhcp-option DNS $line\"" 
+	done
+	;;
+	2) #Quad9
+	echo 'push "dhcp-option DNS 9.9.9.9"' 
+	;;
+	3) #FDN
+	echo 'push "dhcp-option DNS 80.67.169.12"'
+	echo 'push "dhcp-option DNS 80.67.169.40"'
+	;;
+	4) #DNS.WATCH
+	echo 'push "dhcp-option DNS 84.200.69.80"'
+	echo 'push "dhcp-option DNS 84.200.70.40"'
+	;;
+	5) #OpenDNS
+	echo 'push "dhcp-option DNS 208.67.222.222"'
+	echo 'push "dhcp-option DNS 208.67.220.220"'
+	;;
+	6) #Google
+	echo 'push "dhcp-option DNS 8.8.8.8"'
+	echo 'push "dhcp-option DNS 8.8.4.4"'
+	;;
+	7) #Yandex Basic
+	echo 'push "dhcp-option DNS 77.88.8.8"'
+	echo 'push "dhcp-option DNS 77.88.8.1"'
+	;;
+	8) #AdGuard DNS
+	echo 'push "dhcp-option DNS 176.103.130.130"'
+	echo 'push "dhcp-option DNS 176.103.130.131"'
+	;;
+esac >> ${conf_server}
+echo 'push "redirect-gateway def1 bypass-dhcp" '>> ${conf_server}
+echo "client-to-client
+crl-verify crl.pem
+ca ca.crt
+cert server.crt
+key server.key
+tls-auth tls-auth.key 0
+dh dh.pem
+auth SHA256
+$CIPHER
+tls-server
+tls-version-min 1.2
+tls-cipher TLS-DHE-RSA-WITH-AES-128-GCM-SHA256
+status openvpn-status.log
+log openvpn.log
+log-append openvpn.log
+verb 3" >> ${conf_server}
+
+set_firewall ## call function
+	
+# And finally, restart OpenVPN
+if [[ "$OS" = 'debian' ]]; then
+	# Little hack to check for systemd
+	if pgrep systemd-journal; then
+			#Workaround to fix OpenVPN service on OpenVZ
+			sed -i 's|LimitNPROC|#LimitNPROC|' /lib/systemd/system/openvpn\@.service
+			sed -i 's|/etc/openvpn/server|/etc/openvpn|' /lib/systemd/system/openvpn\@.service
+			sed -i 's|%i.conf|server.conf|' /lib/systemd/system/openvpn\@.service
+			systemctl daemon-reload
+			systemctl restart openvpn
+			systemctl enable openvpn
+	else
+		/etc/init.d/openvpn restart
+	fi
+else
+	if pgrep systemd-journal; then
+		if [[ "$OS" = 'arch' || "$OS" = 'fedora' ]]; then
+			#Workaround to avoid rewriting the entire script for Arch & Fedora
+			sed -i 's|/etc/openvpn/server|/etc/openvpn|' /usr/lib/systemd/system/openvpn-server@.service
+			sed -i 's|%i.conf|server.conf|' /usr/lib/systemd/system/openvpn-server@.service
+			systemctl daemon-reload
+			systemctl restart openvpn-server@openvpn.service
+			systemctl enable openvpn-server@openvpn.service
+		else
+			systemctl restart openvpn@server.service
+			systemctl enable openvpn@server.service
+		fi
+	else
+		service openvpn restart
+		chkconfig openvpn on
+	fi
+fi
+
+# Try to detect a NATed connection and ask about it to potential LowEndSpirit/Scaleway users
+EXTERNALIP=$(wget -qO- ipv4.icanhazip.com)
+if [[ "$IP" != "$EXTERNALIP" ]]; then
+	echo ""
+	echo "Looks like your server is behind a NAT!"
+	echo ""
+	echo "If your server is NATed (e.g. LowEndSpirit, Scaleway, or behind a router),"
+	echo "then I need to know the address that can be used to access it from outside."
+	echo "If that's not the case, just ignore this and leave the next field blank"
+	read -p "External IP or domain name: " -e USEREXTERNALIP
+	if [[ "$USEREXTERNALIP" != "" ]]; then
+		IP=$USEREXTERNALIP
+	fi
+fi
+	
+# client-template.txt is created so we have a template to add further users later
+echo "client" > ${conf_client_tpl}
+if [[ "$PROTOCOL" = 'udp' ]]; then
+	echo "proto ${PROTOCOL}" >> ${conf_client_tpl}
+elif [[ "$PROTOCOL" = 'tcp' ]]; then
+	echo "proto ${PROTOCOL}-client" >> ${conf_client_tpl}
+fi
+echo "remote $IP $PORT
+dev tun
+resolv-retry infinite
+nobind
+persist-key
+persist-tun
+remote-cert-tls server
+auth SHA256
+auth-nocache
+$CIPHER
+tls-client
+tls-version-min 1.2
+tls-cipher TLS-DHE-RSA-WITH-AES-128-GCM-SHA256
+setenv opt block-outside-dns
+verb 3" >> ${conf_client_tpl}
+
+# call function Generate the custom client.ovpn
+generate_newclient "$CLIENT"
+echo ""
+echo "Finished!"
+echo ""
+echo "Your client config is available at $homeDir/$CLIENT.ovpn"
+echo "If you want to add more clients, you simply need to run this script again!"
+}
+
+## function: remove openvpn server and config dir 
+remove_openvpn(){
+
+echo ""
+read -p "Do you really want to remove OpenVPN? [y/n]: " -e -i n REMOVE
+if [[ 'y' = "$REMOVE" ]]; then
+	PORT=$(grep '^port ' ${conf_server} | cut -d " " -f 2)
+	PROTOCOL=$(grep '^proto ' ${conf_server} | cut -d " " -f 2)
+	if pgrep firewalld; then
+		# Using both permanent and not permanent rules to avoid a firewalld reload.
+		firewall-cmd --zone=public --remove-port=$PORT/${PROTOCOL}
+		firewall-cmd --zone=trusted --remove-source=10.8.0.0/24
+		firewall-cmd --permanent --zone=public --remove-port=$PORT/${PROTOCOL}
+		firewall-cmd --permanent --zone=trusted --remove-source=10.8.0.0/24
+	fi
+	if iptables -L -n | grep -qE 'REJECT|DROP'; then
+		iptables -D INPUT -p ${PROTOCOL} --dport $PORT -j ACCEPT
+		iptables -D FORWARD -s 10.8.0.0/24 -j ACCEPT
+		iptables-save > $conf_iptables
+	fi
+	iptables -t nat -D POSTROUTING -o $NIC -s 10.8.0.0/24 -j MASQUERADE
+	iptables-save > $conf_iptables
+	if hash sestatus 2>/dev/null; then
+		if sestatus | grep "Current mode" | grep -qs "enforcing"; then
+			if [[ "$PORT" != '1194' ]]; then
+				semanage port -d -t openvpn_port_t -p ${PROTOCOL} $PORT
+			fi
+		fi
+	fi
+	if [[ "$OS" = 'debian' ]]; then
+		apt-get autoremove --purge -y openvpn
+	elif [[ "$OS" = 'arch' ]]; then
+		pacman -R openvpn --noconfirm
+	else
+		yum remove openvpn -y
+	fi
+	rm -rf ${dir_openvpn} /usr/share/doc/openvpn*
+	echo ""
+	echo "OpenVPN removed!"
+else
+	echo ""
+	echo "Removal aborted!"
+fi
+}
+
+config_openvpn_server(){
+:
+}
+
+config_openvpn_client(){
+:
+}
+
+config_openvpn(){
+
+while :
+do
+	clear
+	cat <<EOF
+OpenVPN-install (github.com/xiagw/OpenVPN-install)
+
+Looks like OpenVPN is already installed
+
+What do you want to do?
+   1) Add a cert for a new user
+   2) Revoke existing user cert
+   3) Remove OpenVPN
+   4) Exit
+EOF
+	file_index="${dir_pki}/index.txt"
+	read -p 'Select an option [1-4]: ' option
+	case $option in
+		1)
+		generate_newclient
+		exit
+		;;
+		2)
+		revoke_openvpn_client
+		exit
+		;;
+		3)
+		remove_openvpn ## call function 
+		exit
+		;;
+		4) exit;;
+	esac
+done
+
+}
+
+## function: determine the operating system version
+detect_os_ver(){
+
+if [[ -e /etc/debian_version ]]; then
+	OS="debian"
+	# Getting the version number, to verify that a recent version of OpenVPN is available
+	# VERSION_ID=$(grep "VERSION_ID" /etc/os-release)
+	source /etc/os-release
+	SYSCTL='/etc/sysctl.conf'
+	case "$VERSION_ID" in 
+	7|8|9|12.04|14.04|16.04|16.10|17.04)
+		:
+		;;
+	*)
+		echo 'Your version of Debian/Ubuntu is not supported.'
+		echo "I can't install a recent version of OpenVPN on your system."
+		echo ''
+		echo "However, if you're using Debian unstable/testing, or Ubuntu beta,"
+		echo 'then you can continue, a recent version of OpenVPN is available on these.'
+		echo 'Keep in mind they are not supported, though.'
+		while [[ "$CONTINUE" != [yn]  ]]; do
+			read -p 'Continue ? [y/n]: ' -e CONTINUE
+		done
+		if [[ 'n' = "$CONTINUE" ]]; then
+			echo 'Ok, bye !'
+			exit 4
+		fi
+	esac
+	# fi
+elif [[ -e /etc/centos-release || -e /etc/redhat-release && ! -e /etc/fedora-release ]]; then
+	# rpm -q --queryformat '%{VERSION}' centos-release
+	# rpm -q --queryformat '%{RELEASE}' redhat-release-server | awk -F. '{print $1}'
+	# grep -oE '[0-9]+\.[0-9]+' /etc/redhat-release	
+	OS="centos$(rpm -q --queryformat '%{VERSION}' centos-release)"
+	SYSCTL='/etc/sysctl.conf'
+elif [[ -e /etc/arch-release ]]; then
+	OS='arch'
+	SYSCTL='/etc/sysctl.d/openvpn.conf'
+elif [[ -e /etc/fedora-release ]]; then
+	OS='fedora'
+	SYSCTL='/etc/sysctl.d/openvpn.conf'
+else
+	echo "Looks like you aren't running this installer on a Debian, Ubuntu, CentOS or ArchLinux system"
+	exit 4
+fi
+}
+
+detect_IP_NIC(){
+
+# Try to get our IP from the system and fallback to the Internet.
+# I do this to make the script compatible with NATed servers (LowEndSpirit/Scaleway)
+# and to avoid getting an IPv6.
+IP=$(ip addr | grep 'inet' | grep -v inet6 | grep -vE '127\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | grep -o -E '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | head -1)
+if [[ "$IP" = "" ]]; then
+	IP=$(wget -qO- ipv4.icanhazip.com)
+fi
+# Get Internet network interface with default route
+NIC=$(ip -4 route ls | grep default | grep -Po '(?<=dev )(\S+)' | head -1)
+}
+
+################################# main #################################
+main(){
+detect_os_ver ## call function
+detect_IP_NIC ## call function
+
+## OpenVPN setup and first user creation
+if [[ -e ${conf_server} ]]; then
+	config_openvpn ## call function
+else
+	install_openvpn ## call function
+fi
+}
+
+main $@
diff --git a/openvpn-install.sh b/openvpn-install.sh
index 28078f5..ab0c534 100644
--- a/openvpn-install.sh
+++ b/openvpn-install.sh
@@ -24,9 +24,9 @@ dir_openvpn='/etc/openvpn'
 dir_easy="${dir_openvpn}/easy-rsa"
 dir_pki="${dir_easy}/pki"
 bin_easy="${dir_easy}/easyrsa"
-file_client_tpl="${dir_openvpn}/client-template.txt"
-file_openvpn_conf="${dir_openvpn}/server.conf"
-file_iptables='/etc/sysconfig/iptables.rules'
+conf_client_tpl="${dir_openvpn}/client-template.txt"
+conf_server="${dir_openvpn}/server.conf"
+conf_iptables='/etc/sysconfig/iptables.rules'
 
 ## function: config the firewall
 set_firewall(){
@@ -46,7 +46,7 @@ echo 1 > /proc/sys/net/ipv4/ip_forward
 # Set NAT for the VPN subnet
 iptables -t nat -A POSTROUTING -o $NIC -s 10.8.0.0/24 -j MASQUERADE
 # Save persitent iptables rules
-iptables-save > $file_iptables
+iptables-save > $conf_iptables
 if pgrep firewalld; then
 	# We don't use --add-service=openvpn because that would only work with
 	# the default port. Using both permanent and not permanent rules to
@@ -64,7 +64,7 @@ if iptables -L -n | grep -qE 'REJECT|DROP'; then
 	iptables -I FORWARD -s 10.8.0.0/24 -j ACCEPT
 	iptables -I FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
 	# Save persitent OpenVPN rules
-	iptables-save > $file_iptables
+	iptables-save > $conf_iptables
 fi
 # If SELinux is enabled and a custom port was selected, we need this
 if hash sestatus 2>/dev/null; then
@@ -83,42 +83,82 @@ fi
 ## function: generate the new client??.ovpn
 generate_newclient() {
 
+echo ""
+echo "Tell me a name for the client cert"
+echo "Please, use one word only, no special characters"
+echo "Here are the files that already exist,do not repeat that"
+tail -n +2 ${file_index} | grep "^V" | cut -d '=' -f 2 | nl -s ') '
+read -p "Client name: " -e -i client CLIENT
+cd ${dir_easy}
+${bin_easy} build-client-full $CLIENT nopass
+
+# Generates the custom client.ovpn
 # Where to write the custom client.ovpn?
-if [ -e /home/$1 ]; then  # if $1 is a user name
-	homeDir="/home/$1"
+if [ -e /home/$CLIENT ]; then  # if $CLIENT is a user name
+	homeDir="/home/$CLIENT"
 elif [ ${SUDO_USER} ]; then   # if not, use SUDO_USER
 	homeDir="/home/${SUDO_USER}"
 else  # if not SUDO_USER, use /root
 	homeDir="${dir_openvpn}"
 fi
 # Generates the custom client.ovpn
-file_client="$homeDir/$1.ovpn"
-cp ${file_client_tpl} ${file_client}
+file_client="$homeDir/$CLIENT.ovpn"
+cp ${conf_client_tpl} ${file_client}
 echo "<ca>" >> ${file_client}
 cat ${dir_pki}/ca.crt >> ${file_client}
 echo "</ca>" >> ${file_client}
 echo "<cert>" >> ${file_client}
-cat ${dir_pki}/issued/$1.crt >> ${file_client}
+cat ${dir_pki}/issued/$CLIENT.crt >> ${file_client}
 echo "</cert>" >> ${file_client}
 echo "<key>" >> ${file_client}
-cat ${dir_pki}/private/$1.key >> ${file_client}
+cat ${dir_pki}/private/$CLIENT.key >> ${file_client}
 echo "</key>" >> ${file_client}
 echo "key-direction 1" >> ${file_client}
 echo "<tls-auth>" >> ${file_client}
 cat ${dir_openvpn}/tls-auth.key >> ${file_client}
 echo "</tls-auth>" >> ${file_client}
+
+echo ""
+echo "Client $CLIENT added, certs available at $homeDir/$CLIENT.ovpn"
+
+}
+
+## function: revoke a exist client??.ovpn
+revoke_openvpn_client(){
+
+NUMBEROFCLIENTS=$(tail -n +2 ${file_index} | grep -c "^V")
+if [[ "$NUMBEROFCLIENTS" = '0' ]]; then
+	echo ""
+	echo "You have no existing clients!"
+	exit 5
+fi
+echo ""
+echo "Select the existing client certificate you want to revoke"
+tail -n +2 ${file_index} | grep "^V" | cut -d '=' -f 2 | nl -s ') '
+if [[ "$NUMBEROFCLIENTS" = '1' ]]; then
+	read -p "Select one client [1]: " CLIENTNUMBER
+else
+	read -p "Select one client [1-$NUMBEROFCLIENTS]: " CLIENTNUMBER
+fi
+CLIENT=$(tail -n +2 ${file_index} | grep "^V" | cut -d '=' -f 2 | sed -n "${CLIENTNUMBER:?empty-var}"p)
+cd ${dir_easy}
+${bin_easy} --batch revoke $CLIENT
+EASYRSA_CRL_DAYS=3650 ${bin_easy} gen-crl
+rm -f ${dir_pki}/reqs/$CLIENT.req ${dir_pki}/private/$CLIENT.key ${dir_pki}/issued/$CLIENT.crt 
+#rm -f ${dir_openvpn}/crl.pem
+/bin/cp -f ${dir_pki}/crl.pem ${dir_openvpn}/crl.pem
+chmod 644 ${dir_openvpn}/crl.pem
+echo ""
+echo "Certificate for client $CLIENT revoked"
+echo "Exiting..."
 }
 
 ## function: install easyrsa 3.0.3
 install_easyrsa(){
 
 # An old version of easy-rsa was available by default in some openvpn packages
-if [[ -d ${dir_easy}/ ]]; then
-	rm -rf ${dir_easy}/
-	mkdir -p ${dir_easy}
-else
-	mkdir -p ${dir_easy}
-fi
+rm -rf ${dir_easy}
+mkdir -p ${dir_easy}
 # Get easy-rsa
 url_easy='https://github.com/OpenVPN/easy-rsa/releases/download/v3.0.3/EasyRSA-3.0.3.tgz'
 file_easy=${url_easy##*/}
@@ -130,7 +170,7 @@ rm -rf ~/${file_easy}
 }
 
 ## function: install iptables for debian
-install_ipt_service(){
+systemd_ipt_service(){
 
 dir_ipt='/etc/iptables'
 file_ipt_svc='/etc/systemd/system/iptables.service'
@@ -138,7 +178,7 @@ file_ipt_sh="${dir_ipt}/flush-iptables.sh"
 # Install iptables service
 if [[ ! -e ${file_ipt_svc} ]]; then
 	mkdir ${dir_ipt}
-	iptables-save > ${file_iptables}
+	iptables-save > ${conf_iptables}
 	echo "#!/bin/sh
 iptables -F
 iptables -X
@@ -157,8 +197,8 @@ Before=network-pre.target
 Wants=network-pre.target
 [Service]
 Type=oneshot
-ExecStart=/sbin/iptables-restore ${file_iptables}
-ExecReload=/sbin/iptables-restore ${file_iptables}
+ExecStart=/sbin/iptables-restore ${conf_iptables}
+ExecReload=/sbin/iptables-restore ${conf_iptables}
 ExecStop=/etc/iptables/flush-iptables.sh
 RemainAfterExit=yes
 [Install]
@@ -173,6 +213,19 @@ WantedBy=multi-user.target" > ${file_ipt_svc}
 fi
 }
 
+##
+config_iptables(){
+	echo "Please manually set the firewall"
+	read -p "press any key continue..."
+}
+
+##
+config_firewalld(){
+	echo "Please manually set the firewall"
+	read -p "press any key continue..."
+}
+
+	
 ## function: install openvpn server
 install_openvpn(){
 
@@ -337,19 +390,17 @@ if [[ "$OS" = 'debian' ]]; then
 	# Ubuntu >= 16.04 and Debian > 8 have OpenVPN > 2.3.3 without the need of a third party repository.
 	## The we install OpenVPN
 	apt-get install openvpn iptables openssl wget ca-certificates curl -y
-	install_ipt_service ## call function
-elif [[ "$OS" = 'centos7' || "$OS" = 'fedora' ]]; then
-	if [[ "$OS" = 'centos7'  ]]; then
+	systemd_ipt_service ## call function
+elif [[ "$OS" = 'centos6' || "$OS" = 'centos7' || "$OS" = 'fedora' ]]; then
+	if [[ "$OS" != 'fedora' ]]; then
 		yum install epel-release -y
 	fi
 	yum --enablerepo=epel install openvpn iptables openssl wget ca-certificates curl -y
-	# install_ipt_service ## call function
-	read -p "Please manually set the firewall,press anykey continue"
-elif [[ "$OS" = 'centos6' ]]; then
-	yum install epel-release -y
-	yum --enablerepo=epel install openvpn iptables openssl wget ca-certificates curl -y
-	# install_ipt_service ## call function
-	read -p "Please manually set the firewall,press anykey continue"
+	if [[ "$OS" = 'centos6' ]]; then 
+		config_iptables ## call function
+	else
+		config_firewalld ## call function
+	fi
 else
 	# Else, the distro is ArchLinux
 	echo ""
@@ -369,13 +420,14 @@ else
 	if [[ "$OS" = 'arch' ]]; then
 		# Install dependencies
 		pacman -Syu openvpn iptables openssl wget ca-certificates curl --needed --noconfirm
-		iptables-save > ${file_iptables} # iptables won't start if this file does not exist
+		iptables-save > ${conf_iptables} # iptables won't start if this file does not exist
 		systemctl daemon-reload
 		systemctl enable iptables
 		systemctl start iptables
 	fi
 fi
 
+
 # Find out if the machine uses nogroup or nobody for the permissionless group
 if grep -qs "^nogroup:" /etc/group; then
 	NOGROUP=nogroup
@@ -414,7 +466,7 @@ topology subnet
 server 10.8.0.0 255.255.255.0
 ifconfig-pool-persist ipp.txt
 #client-config-dir ccd
-#route 10.8.0.0 255.255.255.252" >> ${file_openvpn_conf}
+#route 10.8.0.0 255.255.255.252" >> ${conf_server}
 # DNS resolvers
 case $DNS in
 	1)
@@ -450,8 +502,8 @@ case $DNS in
 	echo 'push "dhcp-option DNS 176.103.130.130"'
 	echo 'push "dhcp-option DNS 176.103.130.131"'
 	;;
-esac >> ${file_openvpn_conf}
-echo 'push "redirect-gateway def1 bypass-dhcp" '>> ${file_openvpn_conf}
+esac >> ${conf_server}
+echo 'push "redirect-gateway def1 bypass-dhcp" '>> ${conf_server}
 echo "client-to-client
 crl-verify crl.pem
 ca ca.crt
@@ -467,7 +519,7 @@ tls-cipher TLS-DHE-RSA-WITH-AES-128-GCM-SHA256
 status openvpn-status.log
 log openvpn.log
 log-append openvpn.log
-verb 3" >> ${file_openvpn_conf}
+verb 3" >> ${conf_server}
 
 set_firewall ## call function
 	
@@ -520,11 +572,11 @@ if [[ "$IP" != "$EXTERNALIP" ]]; then
 fi
 	
 # client-template.txt is created so we have a template to add further users later
-echo "client" > ${file_client_tpl}
+echo "client" > ${conf_client_tpl}
 if [[ "$PROTOCOL" = 'udp' ]]; then
-	echo "proto ${PROTOCOL}" >> ${file_client_tpl}
+	echo "proto ${PROTOCOL}" >> ${conf_client_tpl}
 elif [[ "$PROTOCOL" = 'tcp' ]]; then
-	echo "proto ${PROTOCOL}-client" >> ${file_client_tpl}
+	echo "proto ${PROTOCOL}-client" >> ${conf_client_tpl}
 fi
 echo "remote $IP $PORT
 dev tun
@@ -540,7 +592,7 @@ tls-client
 tls-version-min 1.2
 tls-cipher TLS-DHE-RSA-WITH-AES-128-GCM-SHA256
 setenv opt block-outside-dns
-verb 3" >> ${file_client_tpl}
+verb 3" >> ${conf_client_tpl}
 
 # call function Generate the custom client.ovpn
 generate_newclient "$CLIENT"
@@ -557,8 +609,8 @@ remove_openvpn(){
 echo ""
 read -p "Do you really want to remove OpenVPN? [y/n]: " -e -i n REMOVE
 if [[ 'y' = "$REMOVE" ]]; then
-	PORT=$(grep '^port ' ${file_openvpn_conf} | cut -d " " -f 2)
-	PROTOCOL=$(grep '^proto ' ${file_openvpn_conf} | cut -d " " -f 2)
+	PORT=$(grep '^port ' ${conf_server} | cut -d " " -f 2)
+	PROTOCOL=$(grep '^proto ' ${conf_server} | cut -d " " -f 2)
 	if pgrep firewalld; then
 		# Using both permanent and not permanent rules to avoid a firewalld reload.
 		firewall-cmd --zone=public --remove-port=$PORT/${PROTOCOL}
@@ -569,10 +621,10 @@ if [[ 'y' = "$REMOVE" ]]; then
 	if iptables -L -n | grep -qE 'REJECT|DROP'; then
 		iptables -D INPUT -p ${PROTOCOL} --dport $PORT -j ACCEPT
 		iptables -D FORWARD -s 10.8.0.0/24 -j ACCEPT
-		iptables-save > $file_iptables
+		iptables-save > $conf_iptables
 	fi
 	iptables -t nat -D POSTROUTING -o $NIC -s 10.8.0.0/24 -j MASQUERADE
-	iptables-save > $file_iptables
+	iptables-save > $conf_iptables
 	if hash sestatus 2>/dev/null; then
 		if sestatus | grep "Current mode" | grep -qs "enforcing"; then
 			if [[ "$PORT" != '1194' ]]; then
@@ -596,6 +648,13 @@ else
 fi
 }
 
+config_openvpn_server(){
+:
+}
+
+config_openvpn_client(){
+:
+}
 
 config_openvpn(){
 
@@ -603,7 +662,7 @@ while :
 do
 	clear
 	cat <<EOF
-OpenVPN-install (github.com/Angristan/OpenVPN-install)
+OpenVPN-install (github.com/xiagw/OpenVPN-install)
 
 Looks like OpenVPN is already installed
 
@@ -617,46 +676,11 @@ EOF
 	read -p 'Select an option [1-4]: ' option
 	case $option in
 		1)
-		echo ""
-		echo "Tell me a name for the client cert"
-		echo "Please, use one word only, no special characters"
-		echo "Here are the files that already exist,do not repeat that"
-		tail -n +2 ${file_index} | grep "^V" | cut -d '=' -f 2 | nl -s ') '
-		read -p "Client name: " -e -i client CLIENT
-		cd ${dir_easy}
-		${bin_easy} build-client-full $CLIENT nopass
-		# Generates the custom client.ovpn
-		generate_newclient "$CLIENT"
-		echo ""
-		echo "Client $CLIENT added, certs available at $homeDir/$CLIENT.ovpn"
+		generate_newclient
 		exit
 		;;
 		2)
-		NUMBEROFCLIENTS=$(tail -n +2 ${file_index} | grep -c "^V")
-		if [[ "$NUMBEROFCLIENTS" = '0' ]]; then
-			echo ""
-			echo "You have no existing clients!"
-			exit 5
-		fi
-		echo ""
-		echo "Select the existing client certificate you want to revoke"
-		tail -n +2 ${file_index} | grep "^V" | cut -d '=' -f 2 | nl -s ') '
-		if [[ "$NUMBEROFCLIENTS" = '1' ]]; then
-			read -p "Select one client [1]: " CLIENTNUMBER
-		else
-			read -p "Select one client [1-$NUMBEROFCLIENTS]: " CLIENTNUMBER
-		fi
-		CLIENT=$(tail -n +2 ${file_index} | grep "^V" | cut -d '=' -f 2 | sed -n "${CLIENTNUMBER:?empty-var}"p)
-		cd ${dir_easy}
-		${bin_easy} --batch revoke $CLIENT
-		EASYRSA_CRL_DAYS=3650 ${bin_easy} gen-crl
-		rm -f ${dir_pki}/reqs/$CLIENT.req ${dir_pki}/private/$CLIENT.key ${dir_pki}/issued/$CLIENT.crt 
-		#rm -f ${dir_openvpn}/crl.pem
-		/bin/cp -f ${dir_pki}/crl.pem ${dir_openvpn}/crl.pem
-		chmod 644 ${dir_openvpn}/crl.pem
-		echo ""
-		echo "Certificate for client $CLIENT revoked"
-		echo "Exiting..."
+		revoke_openvpn_client
 		exit
 		;;
 		3)
@@ -678,8 +702,6 @@ if [[ -e /etc/debian_version ]]; then
 	# VERSION_ID=$(grep "VERSION_ID" /etc/os-release)
 	source /etc/os-release
 	SYSCTL='/etc/sysctl.conf'
-	# if [[ "$VERSION_ID" != 'VERSION_ID="7"' ]] && [[ "$VERSION_ID" != 'VERSION_ID="8"' ]] && [[ "$VERSION_ID" != 'VERSION_ID="9"' ]] && [[ "$VERSION_ID" != 'VERSION_ID="12.04"' ]] && [[ "$VERSION_ID" != 'VERSION_ID="14.04"' ]] && [[ "$VERSION_ID" != 'VERSION_ID="16.04"' ]] && [[ "$VERSION_ID" != 'VERSION_ID="16.10"' ]] && [[ "$VERSION_ID" != 'VERSION_ID="17.04"' ]]; then
-	# if [[ "$VERSION_ID" != [789] && "$VERSION_ID" != '12.04' && "$VERSION_ID" != '14.04' && "$VERSION_ID" != '16.04' && "$VERSION_ID" != '16.10' && "$VERSION_ID" != '17.04' ]]; then
 	case "$VERSION_ID" in 
 	7|8|9|12.04|14.04|16.04|16.10|17.04)
 		:
@@ -737,7 +759,7 @@ detect_os_ver ## call function
 detect_IP_NIC ## call function
 
 ## OpenVPN setup and first user creation
-if [[ -e ${file_openvpn_conf} ]]; then
+if [[ -e ${conf_server} ]]; then
 	config_openvpn ## call function
 else
 	install_openvpn ## call function
diff --git a/origin-upstream.sh b/origin-upstream.sh
new file mode 100644
index 0000000..51d7765
--- /dev/null
+++ b/origin-upstream.sh
@@ -0,0 +1,693 @@
+#!/bin/bash
+
+# Secure OpenVPN server installer for Debian, Ubuntu, CentOS and Arch Linux
+# https://github.com/Angristan/OpenVPN-install
+
+
+if [[ "$EUID" -ne 0 ]]; then
+	echo "Sorry, you need to run this as root"
+	exit 1
+fi
+
+if [[ ! -e /dev/net/tun ]]; then
+	echo "TUN is not available"
+	exit 2
+fi
+
+if grep -qs "CentOS release 5" "/etc/redhat-release"; then
+	echo "CentOS 5 is too old and not supported"
+	exit 3
+fi
+
+if [[ -e /etc/debian_version ]]; then
+	OS="debian"
+	# Getting the version number, to verify that a recent version of OpenVPN is available
+	VERSION_ID=$(cat /etc/os-release | grep "VERSION_ID")
+	IPTABLES='/etc/iptables/iptables.rules'
+	SYSCTL='/etc/sysctl.conf'
+	if [[ "$VERSION_ID" != 'VERSION_ID="7"' ]] && [[ "$VERSION_ID" != 'VERSION_ID="8"' ]] && [[ "$VERSION_ID" != 'VERSION_ID="9"' ]] && [[ "$VERSION_ID" != 'VERSION_ID="12.04"' ]] && [[ "$VERSION_ID" != 'VERSION_ID="14.04"' ]] && [[ "$VERSION_ID" != 'VERSION_ID="16.04"' ]] && [[ "$VERSION_ID" != 'VERSION_ID="16.10"' ]] && [[ "$VERSION_ID" != 'VERSION_ID="17.04"' ]]; then
+		echo "Your version of Debian/Ubuntu is not supported."
+		echo "I can't install a recent version of OpenVPN on your system."
+		echo ""
+		echo "However, if you're using Debian unstable/testing, or Ubuntu beta,"
+		echo "then you can continue, a recent version of OpenVPN is available on these."
+		echo "Keep in mind they are not supported, though."
+		while [[ $CONTINUE != "y" && $CONTINUE != "n" ]]; do
+			read -p "Continue ? [y/n]: " -e CONTINUE
+		done
+		if [[ "$CONTINUE" = "n" ]]; then
+			echo "Ok, bye !"
+			exit 4
+		fi
+	fi
+elif [[ -e /etc/centos-release || -e /etc/redhat-release && ! -e /etc/fedora-release ]]; then
+	OS=centos
+	IPTABLES='/etc/iptables/iptables.rules'
+	SYSCTL='/etc/sysctl.conf'
+elif [[ -e /etc/arch-release ]]; then
+	OS=arch
+	IPTABLES='/etc/iptables/iptables.rules'
+	SYSCTL='/etc/sysctl.d/openvpn.conf'
+elif [[ -e /etc/fedora-release ]]; then
+	OS=fedora
+	IPTABLES='/etc/iptables/iptables.rules'
+	SYSCTL='/etc/sysctl.d/openvpn.conf'
+else
+	echo "Looks like you aren't running this installer on a Debian, Ubuntu, CentOS or ArchLinux system"
+	exit 4
+fi
+
+newclient () {
+	# Where to write the custom client.ovpn?
+	if [ -e /home/$1 ]; then  # if $1 is a user name
+		homeDir="/home/$1"
+	elif [ ${SUDO_USER} ]; then   # if not, use SUDO_USER
+		homeDir="/home/${SUDO_USER}"
+	else  # if not SUDO_USER, use /root
+		homeDir="/root"
+	fi
+	# Generates the custom client.ovpn
+	file_client="$homeDir/$1.ovpn"
+	cp ${file_client_tpl} ${file_client}
+	echo "<ca>" >> ${file_client}
+	cat /etc/openvpn/easy-rsa/pki/ca.crt >> ${file_client}
+	echo "</ca>" >> ${file_client}
+	echo "<cert>" >> ${file_client}
+	cat /etc/openvpn/easy-rsa/pki/issued/$1.crt >> ${file_client}
+	echo "</cert>" >> ${file_client}
+	echo "<key>" >> ${file_client}
+	cat /etc/openvpn/easy-rsa/pki/private/$1.key >> ${file_client}
+	echo "</key>" >> ${file_client}
+	echo "key-direction 1" >> ${file_client}
+	echo "<tls-auth>" >> ${file_client}
+	cat /etc/openvpn/tls-auth.key >> ${file_client}
+	echo "</tls-auth>" >> ${file_client}
+}
+
+# Try to get our IP from the system and fallback to the Internet.
+# I do this to make the script compatible with NATed servers (LowEndSpirit/Scaleway)
+# and to avoid getting an IPv6.
+IP=$(ip addr | grep 'inet' | grep -v inet6 | grep -vE '127\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | grep -o -E '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | head -1)
+if [[ "$IP" = "" ]]; then
+	IP=$(wget -qO- ipv4.icanhazip.com)
+fi
+# Get Internet network interface with default route
+NIC=$(ip -4 route ls | grep default | grep -Po '(?<=dev )(\S+)' | head -1)
+
+if [[ -e /etc/openvpn/server.conf ]]; then
+	while :
+	do
+	clear
+		echo "OpenVPN-install (github.com/Angristan/OpenVPN-install)"
+		echo ""
+		echo "Looks like OpenVPN is already installed"
+		echo ""
+		echo "What do you want to do?"
+		echo "   1) Add a cert for a new user"
+		echo "   2) Revoke existing user cert"
+		echo "   3) Remove OpenVPN"
+		echo "   4) Exit"
+		read -p "Select an option [1-4]: " option
+		case $option in
+			1)
+			echo ""
+			echo "Tell me a name for the client cert"
+			echo "Please, use one word only, no special characters"
+			read -p "Client name: " -e -i client CLIENT
+			cd /etc/openvpn/easy-rsa/
+			./easyrsa build-client-full $CLIENT nopass
+			# Generates the custom client.ovpn
+			newclient "$CLIENT"
+			echo ""
+			echo "Client $CLIENT added, certs available at $homeDir/$CLIENT.ovpn"
+			exit
+			;;
+			2)
+			NUMBEROFCLIENTS=$(tail -n +2 /etc/openvpn/easy-rsa/pki/index.txt | grep -c "^V")
+			if [[ "$NUMBEROFCLIENTS" = '0' ]]; then
+				echo ""
+				echo "You have no existing clients!"
+				exit 5
+			fi
+			echo ""
+			echo "Select the existing client certificate you want to revoke"
+			tail -n +2 /etc/openvpn/easy-rsa/pki/index.txt | grep "^V" | cut -d '=' -f 2 | nl -s ') '
+			if [[ "$NUMBEROFCLIENTS" = '1' ]]; then
+				read -p "Select one client [1]: " CLIENTNUMBER
+			else
+				read -p "Select one client [1-$NUMBEROFCLIENTS]: " CLIENTNUMBER
+			fi
+			CLIENT=$(tail -n +2 /etc/openvpn/easy-rsa/pki/index.txt | grep "^V" | cut -d '=' -f 2 | sed -n "$CLIENTNUMBER"p)
+			cd /etc/openvpn/easy-rsa/
+			./easyrsa --batch revoke $CLIENT
+			EASYRSA_CRL_DAYS=3650 ./easyrsa gen-crl
+			rm -rf pki/reqs/$CLIENT.req
+			rm -rf pki/private/$CLIENT.key
+			rm -rf pki/issued/$CLIENT.crt
+			rm -rf /etc/openvpn/crl.pem
+			cp /etc/openvpn/easy-rsa/pki/crl.pem /etc/openvpn/crl.pem
+			chmod 644 /etc/openvpn/crl.pem
+			echo ""
+			echo "Certificate for client $CLIENT revoked"
+			echo "Exiting..."
+			exit
+			;;
+			3)
+			echo ""
+			read -p "Do you really want to remove OpenVPN? [y/n]: " -e -i n REMOVE
+			if [[ "$REMOVE" = 'y' ]]; then
+				PORT=$(grep '^port ' /etc/openvpn/server.conf | cut -d " " -f 2)
+				if pgrep firewalld; then
+					# Using both permanent and not permanent rules to avoid a firewalld reload.
+					firewall-cmd --zone=public --remove-port=$PORT/udp
+					firewall-cmd --zone=trusted --remove-source=10.8.0.0/24
+					firewall-cmd --permanent --zone=public --remove-port=$PORT/udp
+					firewall-cmd --permanent --zone=trusted --remove-source=10.8.0.0/24
+				fi
+				if iptables -L -n | grep -qE 'REJECT|DROP'; then
+					if [[ "$PROTOCOL" = 'udp' ]]; then
+						iptables -D INPUT -p udp --dport $PORT -j ACCEPT
+					else
+						iptables -D INPUT -p tcp --dport $PORT -j ACCEPT
+					fi
+					iptables -D FORWARD -s 10.8.0.0/24 -j ACCEPT
+					iptables-save > $IPTABLES
+				fi
+				iptables -t nat -D POSTROUTING -o $NIC -s 10.8.0.0/24 -j MASQUERADE
+				iptables-save > $IPTABLES
+				if hash sestatus 2>/dev/null; then
+					if sestatus | grep "Current mode" | grep -qs "enforcing"; then
+						if [[ "$PORT" != '1194' ]]; then
+							semanage port -d -t openvpn_port_t -p udp $PORT
+						fi
+					fi
+				fi
+				if [[ "$OS" = 'debian' ]]; then
+					apt-get autoremove --purge -y openvpn
+				elif [[ "$OS" = 'arch' ]]; then
+					pacman -R openvpn --noconfirm
+				else
+					yum remove openvpn -y
+				fi
+				rm -rf /etc/openvpn
+				rm -rf /usr/share/doc/openvpn*
+				echo ""
+				echo "OpenVPN removed!"
+			else
+				echo ""
+				echo "Removal aborted!"
+			fi
+			exit
+			;;
+			4) exit;;
+		esac
+	done
+else
+	clear
+	echo "Welcome to the secure OpenVPN installer (github.com/Angristan/OpenVPN-install)"
+	echo ""
+	# OpenVPN setup and first user creation
+	echo "I need to ask you a few questions before starting the setup"
+	echo "You can leave the default options and just press enter if you are ok with them"
+	echo ""
+	echo "I need to know the IPv4 address of the network interface you want OpenVPN listening to."
+	echo "If your server is running behind a NAT, (e.g. LowEndSpirit, Scaleway) leave the IP address as it is. (local/private IP)"
+	echo "Otherwise, it should be your public IPv4 address."
+	read -p "IP address: " -e -i $IP IP
+	echo ""
+	echo "What port do you want for OpenVPN?"
+	read -p "Port: " -e -i 1194 PORT
+	echo ""
+	echo "What protocol do you want for OpenVPN?"
+	echo "Unless UDP is blocked, you should not use TCP (unnecessarily slower)"
+	while [[ $PROTOCOL != "UDP" && $PROTOCOL != "TCP" ]]; do
+		read -p "Protocol [UDP/TCP]: " -e -i UDP PROTOCOL
+	done
+	echo ""
+	echo "What DNS do you want to use with the VPN?"
+	echo "   1) Current system resolvers (from /etc/resolv.conf)"
+	echo "   2) Quad9 (Anycast: worldwide)"
+	echo "   3) FDN (France)"
+	echo "   4) DNS.WATCH (Germany)"
+	echo "   5) OpenDNS (Anycast: worldwide)"
+	echo "   6) Google (Anycast: worldwide)"
+	echo "   7) Yandex Basic (Russia)"
+	echo "   8) AdGuard DNS (Russia)"
+	while [[ $DNS != "1" && $DNS != "2" && $DNS != "3" && $DNS != "4" && $DNS != "5" && $DNS != "6" && $DNS != "7" && $DNS != "8" ]]; do
+		read -p "DNS [1-8]: " -e -i 1 DNS
+	done
+	echo ""
+	echo "See https://github.com/Angristan/OpenVPN-install#encryption to learn more about "
+	echo "the encryption in OpenVPN and the choices I made in this script."
+	echo "Please note that all the choices proposed are secure (to a different degree)"
+	echo "and are still viable to date, unlike some default OpenVPN options"
+	echo ''
+	echo "Choose which cipher you want to use for the data channel:"
+	echo "   1) AES-128-CBC (fastest and sufficiently secure for everyone, recommended)"
+	echo "   2) AES-192-CBC"
+	echo "   3) AES-256-CBC"
+	echo "Alternatives to AES, use them only if you know what you're doing."
+	echo "They are relatively slower but as secure as AES."
+	echo "   4) CAMELLIA-128-CBC"
+	echo "   5) CAMELLIA-192-CBC"
+	echo "   6) CAMELLIA-256-CBC"
+	echo "   7) SEED-CBC"
+	while [[ $CIPHER != "1" && $CIPHER != "2" && $CIPHER != "3" && $CIPHER != "4" && $CIPHER != "5" && $CIPHER != "6" && $CIPHER != "7" ]]; do
+		read -p "Cipher [1-7]: " -e -i 1 CIPHER
+	done
+	case $CIPHER in
+		1)
+		CIPHER="cipher AES-128-CBC"
+		;;
+		2)
+		CIPHER="cipher AES-192-CBC"
+		;;
+		3)
+		CIPHER="cipher AES-256-CBC"
+		;;
+		4)
+		CIPHER="cipher CAMELLIA-128-CBC"
+		;;
+		5)
+		CIPHER="cipher CAMELLIA-192-CBC"
+		;;
+		6)
+		CIPHER="cipher CAMELLIA-256-CBC"
+		;;
+		7)
+		CIPHER="cipher SEED-CBC"
+		;;
+	esac
+	echo ""
+	echo "Choose what size of Diffie-Hellman key you want to use:"
+	echo "   1) 2048 bits (fastest)"
+	echo "   2) 3072 bits (recommended, best compromise)"
+	echo "   3) 4096 bits (most secure)"
+	while [[ $DH_KEY_SIZE != "1" && $DH_KEY_SIZE != "2" && $DH_KEY_SIZE != "3" ]]; do
+		read -p "DH key size [1-3]: " -e -i 2 DH_KEY_SIZE
+	done
+	case $DH_KEY_SIZE in
+		1)
+		DH_KEY_SIZE="2048"
+		;;
+		2)
+		DH_KEY_SIZE="3072"
+		;;
+		3)
+		DH_KEY_SIZE="4096"
+		;;
+	esac
+	echo ""
+	echo "Choose what size of RSA key you want to use:"
+	echo "   1) 2048 bits (fastest)"
+	echo "   2) 3072 bits (recommended, best compromise)"
+	echo "   3) 4096 bits (most secure)"
+	while [[ $RSA_KEY_SIZE != "1" && $RSA_KEY_SIZE != "2" && $RSA_KEY_SIZE != "3" ]]; do
+		read -p "RSA key size [1-3]: " -e -i 2 RSA_KEY_SIZE
+	done
+	case $RSA_KEY_SIZE in
+		1)
+		RSA_KEY_SIZE="2048"
+		;;
+		2)
+		RSA_KEY_SIZE="3072"
+		;;
+		3)
+		RSA_KEY_SIZE="4096"
+		;;
+	esac
+	echo ""
+	echo "Finally, tell me a name for the client certificate and configuration"
+	while [[ $CLIENT = "" ]]; do
+		echo "Please, use one word only, no special characters"
+		read -p "Client name: " -e -i client CLIENT
+	done
+	echo ""
+	echo "Okay, that was all I needed. We are ready to setup your OpenVPN server now"
+	read -n1 -r -p "Press any key to continue..."
+
+	if [[ "$OS" = 'debian' ]]; then
+		apt-get install ca-certificates -y
+		# We add the OpenVPN repo to get the latest version.
+		# Debian 7
+		if [[ "$VERSION_ID" = 'VERSION_ID="7"' ]]; then
+			echo "deb http://build.openvpn.net/debian/openvpn/stable wheezy main" > /etc/apt/sources.list.d/openvpn.list
+			wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add -
+			apt-get update
+		fi
+		# Debian 8
+		if [[ "$VERSION_ID" = 'VERSION_ID="8"' ]]; then
+			echo "deb http://build.openvpn.net/debian/openvpn/stable jessie main" > /etc/apt/sources.list.d/openvpn.list
+			wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add -
+			apt update
+		fi
+		# Ubuntu 12.04
+		if [[ "$VERSION_ID" = 'VERSION_ID="12.04"' ]]; then
+			echo "deb http://build.openvpn.net/debian/openvpn/stable precise main" > /etc/apt/sources.list.d/openvpn.list
+			wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add -
+			apt-get update
+		fi
+		# Ubuntu 14.04
+		if [[ "$VERSION_ID" = 'VERSION_ID="14.04"' ]]; then
+			echo "deb http://build.openvpn.net/debian/openvpn/stable trusty main" > /etc/apt/sources.list.d/openvpn.list
+			wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add -
+			apt-get update
+		fi
+		# Ubuntu >= 16.04 and Debian > 8 have OpenVPN > 2.3.3 without the need of a third party repository.
+		# The we install OpenVPN
+		apt-get install openvpn iptables openssl wget ca-certificates curl -y
+		# Install iptables service
+		if [[ ! -e /etc/systemd/system/iptables.service ]]; then
+			mkdir /etc/iptables
+			iptables-save > /etc/iptables/iptables.rules
+			echo "#!/bin/sh
+iptables -F
+iptables -X
+iptables -t nat -F
+iptables -t nat -X
+iptables -t mangle -F
+iptables -t mangle -X
+iptables -P INPUT ACCEPT
+iptables -P FORWARD ACCEPT
+iptables -P OUTPUT ACCEPT" > /etc/iptables/flush-iptables.sh
+			chmod +x /etc/iptables/flush-iptables.sh
+			echo "[Unit]
+Description=Packet Filtering Framework
+DefaultDependencies=no
+Before=network-pre.target
+Wants=network-pre.target
+[Service]
+Type=oneshot
+ExecStart=/sbin/iptables-restore /etc/iptables/iptables.rules
+ExecReload=/sbin/iptables-restore /etc/iptables/iptables.rules
+ExecStop=/etc/iptables/flush-iptables.sh
+RemainAfterExit=yes
+[Install]
+WantedBy=multi-user.target" > /etc/systemd/system/iptables.service
+			systemctl daemon-reload
+			systemctl enable iptables.service
+		fi
+	elif [[ "$OS" = 'centos' || "$OS" = 'fedora' ]]; then
+		if [[ "$OS" = 'centos' ]]; then
+			yum install epel-release -y
+		fi
+		yum install openvpn iptables openssl wget ca-certificates curl -y
+		# Install iptables service
+		if [[ ! -e /etc/systemd/system/iptables.service ]]; then
+			mkdir /etc/iptables
+			iptables-save > /etc/iptables/iptables.rules
+			echo "#!/bin/sh
+iptables -F
+iptables -X
+iptables -t nat -F
+iptables -t nat -X
+iptables -t mangle -F
+iptables -t mangle -X
+iptables -P INPUT ACCEPT
+iptables -P FORWARD ACCEPT
+iptables -P OUTPUT ACCEPT" > /etc/iptables/flush-iptables.sh
+			chmod +x /etc/iptables/flush-iptables.sh
+			echo "[Unit]
+Description=Packet Filtering Framework
+DefaultDependencies=no
+Before=network-pre.target
+Wants=network-pre.target
+[Service]
+Type=oneshot
+ExecStart=/sbin/iptables-restore /etc/iptables/iptables.rules
+ExecReload=/sbin/iptables-restore /etc/iptables/iptables.rules
+ExecStop=/etc/iptables/flush-iptables.sh
+RemainAfterExit=yes
+[Install]
+WantedBy=multi-user.target" > /etc/systemd/system/iptables.service
+			systemctl daemon-reload
+			systemctl enable iptables.service
+			# Disable firewalld to allow iptables to start upon reboot
+			systemctl disable firewalld
+			systemctl mask firewalld
+		fi
+	else
+		# Else, the distro is ArchLinux
+		echo ""
+		echo ""
+		echo "As you're using ArchLinux, I need to update the packages on your system to install those I need."
+		echo "Not doing that could cause problems between dependencies, or missing files in repositories."
+		echo ""
+		echo "Continuing will update your installed packages and install needed ones."
+		while [[ $CONTINUE != "y" && $CONTINUE != "n" ]]; do
+			read -p "Continue ? [y/n]: " -e -i y CONTINUE
+		done
+		if [[ "$CONTINUE" = "n" ]]; then
+			echo "Ok, bye !"
+			exit 4
+		fi
+
+		if [[ "$OS" = 'arch' ]]; then
+			# Install dependencies
+			pacman -Syu openvpn iptables openssl wget ca-certificates curl --needed --noconfirm
+			iptables-save > /etc/iptables/iptables.rules # iptables won't start if this file does not exist
+			systemctl daemon-reload
+			systemctl enable iptables
+			systemctl start iptables
+		fi
+	fi
+	# Find out if the machine uses nogroup or nobody for the permissionless group
+	if grep -qs "^nogroup:" /etc/group; then
+		NOGROUP=nogroup
+	else
+		NOGROUP=nobody
+	fi
+
+	# An old version of easy-rsa was available by default in some openvpn packages
+	if [[ -d /etc/openvpn/easy-rsa/ ]]; then
+		rm -rf /etc/openvpn/easy-rsa/
+	fi
+	# Get easy-rsa
+	wget -O ~/EasyRSA-3.0.3.tgz https://github.com/OpenVPN/easy-rsa/releases/download/v3.0.3/EasyRSA-3.0.3.tgz
+	tar xzf ~/EasyRSA-3.0.3.tgz -C ~/
+	mv ~/EasyRSA-3.0.3/ /etc/openvpn/
+	mv /etc/openvpn/EasyRSA-3.0.3/ /etc/openvpn/easy-rsa/
+	chown -R root:root /etc/openvpn/easy-rsa/
+	rm -rf ~/EasyRSA-3.0.3.tgz
+	cd /etc/openvpn/easy-rsa/
+	echo "set_var EASYRSA_KEY_SIZE $RSA_KEY_SIZE" > vars
+	# Create the PKI, set up the CA, the DH params and the server + client certificates
+	./easyrsa init-pki
+	./easyrsa --batch build-ca nopass
+	openssl dhparam -out dh.pem $DH_KEY_SIZE
+	./easyrsa build-server-full server nopass
+	./easyrsa build-client-full $CLIENT nopass
+	EASYRSA_CRL_DAYS=3650 ./easyrsa gen-crl
+	# generate tls-auth key
+	openvpn --genkey --secret /etc/openvpn/tls-auth.key
+	# Move all the generated files
+	cp pki/ca.crt pki/private/ca.key dh.pem pki/issued/server.crt pki/private/server.key /etc/openvpn/easy-rsa/pki/crl.pem /etc/openvpn
+	# Make cert revocation list readable for non-root
+	chmod 644 /etc/openvpn/crl.pem
+
+	# Generate server.conf
+	echo "port $PORT" > /etc/openvpn/server.conf
+	if [[ "$PROTOCOL" = 'UDP' ]]; then
+		echo "proto udp" >> /etc/openvpn/server.conf
+	elif [[ "$PROTOCOL" = 'TCP' ]]; then
+		echo "proto tcp" >> /etc/openvpn/server.conf
+	fi
+	echo "dev tun
+user nobody
+group $NOGROUP
+persist-key
+persist-tun
+keepalive 10 120
+topology subnet
+server 10.8.0.0 255.255.255.0
+ifconfig-pool-persist ipp.txt" >> /etc/openvpn/server.conf
+	# DNS resolvers
+	case $DNS in
+		1)
+		# Obtain the resolvers from resolv.conf and use them for OpenVPN
+		grep -v '#' /etc/resolv.conf | grep 'nameserver' | grep -E -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | while read line; do
+			echo "push \"dhcp-option DNS $line\"" >> /etc/openvpn/server.conf
+		done
+		;;
+		2) #Quad9
+		echo 'push "dhcp-option DNS 9.9.9.9"' >> /etc/openvpn/server.conf
+		;;
+		3) #FDN
+		echo 'push "dhcp-option DNS 80.67.169.12"' >> /etc/openvpn/server.conf
+		echo 'push "dhcp-option DNS 80.67.169.40"' >> /etc/openvpn/server.conf
+		;;
+		4) #DNS.WATCH
+		echo 'push "dhcp-option DNS 84.200.69.80"' >> /etc/openvpn/server.conf
+		echo 'push "dhcp-option DNS 84.200.70.40"' >> /etc/openvpn/server.conf
+		;;
+		5) #OpenDNS
+		echo 'push "dhcp-option DNS 208.67.222.222"' >> /etc/openvpn/server.conf
+		echo 'push "dhcp-option DNS 208.67.220.220"' >> /etc/openvpn/server.conf
+		;;
+		6) #Google
+		echo 'push "dhcp-option DNS 8.8.8.8"' >> /etc/openvpn/server.conf
+		echo 'push "dhcp-option DNS 8.8.4.4"' >> /etc/openvpn/server.conf
+		;;
+		7) #Yandex Basic
+		echo 'push "dhcp-option DNS 77.88.8.8"' >> /etc/openvpn/server.conf
+		echo 'push "dhcp-option DNS 77.88.8.1"' >> /etc/openvpn/server.conf
+		;;
+		8) #AdGuard DNS
+		echo 'push "dhcp-option DNS 176.103.130.130"' >> /etc/openvpn/server.conf
+		echo 'push "dhcp-option DNS 176.103.130.131"' >> /etc/openvpn/server.conf
+		;;
+	esac
+echo 'push "redirect-gateway def1 bypass-dhcp" '>> /etc/openvpn/server.conf
+echo "crl-verify crl.pem
+ca ca.crt
+cert server.crt
+key server.key
+tls-auth tls-auth.key 0
+dh dh.pem
+auth SHA256
+$CIPHER
+tls-server
+tls-version-min 1.2
+tls-cipher TLS-DHE-RSA-WITH-AES-128-GCM-SHA256
+status openvpn.log
+verb 3" >> /etc/openvpn/server.conf
+
+	# Create the sysctl configuration file if needed (mainly for Arch Linux)
+	if [[ ! -e $SYSCTL ]]; then
+		touch $SYSCTL
+	fi
+
+	# Enable net.ipv4.ip_forward for the system
+	sed -i '/\<net.ipv4.ip_forward\>/c\net.ipv4.ip_forward=1' $SYSCTL
+	if ! grep -q "\<net.ipv4.ip_forward\>" $SYSCTL; then
+		echo 'net.ipv4.ip_forward=1' >> $SYSCTL
+	fi
+	# Avoid an unneeded reboot
+	echo 1 > /proc/sys/net/ipv4/ip_forward
+	# Set NAT for the VPN subnet
+	iptables -t nat -A POSTROUTING -o $NIC -s 10.8.0.0/24 -j MASQUERADE
+	# Save persitent iptables rules
+	iptables-save > $IPTABLES
+	if pgrep firewalld; then
+		# We don't use --add-service=openvpn because that would only work with
+		# the default port. Using both permanent and not permanent rules to
+		# avoid a firewalld reload.
+		if [[ "$PROTOCOL" = 'UDP' ]]; then
+			firewall-cmd --zone=public --add-port=$PORT/udp
+			firewall-cmd --permanent --zone=public --add-port=$PORT/udp
+		elif [[ "$PROTOCOL" = 'TCP' ]]; then
+			firewall-cmd --zone=public --add-port=$PORT/tcp
+			firewall-cmd --permanent --zone=public --add-port=$PORT/tcp
+		fi
+		firewall-cmd --zone=trusted --add-source=10.8.0.0/24
+		firewall-cmd --permanent --zone=trusted --add-source=10.8.0.0/24
+	fi
+	if iptables -L -n | grep -qE 'REJECT|DROP'; then
+		# If iptables has at least one REJECT rule, we asume this is needed.
+		# Not the best approach but I can't think of other and this shouldn't
+		# cause problems.
+		if [[ "$PROTOCOL" = 'UDP' ]]; then
+			iptables -I INPUT -p udp --dport $PORT -j ACCEPT
+		elif [[ "$PROTOCOL" = 'TCP' ]]; then
+			iptables -I INPUT -p tcp --dport $PORT -j ACCEPT
+		fi
+		iptables -I FORWARD -s 10.8.0.0/24 -j ACCEPT
+		iptables -I FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
+		# Save persitent OpenVPN rules
+        iptables-save > $IPTABLES
+	fi
+	# If SELinux is enabled and a custom port was selected, we need this
+	if hash sestatus 2>/dev/null; then
+		if sestatus | grep "Current mode" | grep -qs "enforcing"; then
+			if [[ "$PORT" != '1194' ]]; then
+				# semanage isn't available in CentOS 6 by default
+				if ! hash semanage 2>/dev/null; then
+					yum install policycoreutils-python -y
+				fi
+				if [[ "$PROTOCOL" = 'UDP' ]]; then
+					semanage port -a -t openvpn_port_t -p udp $PORT
+				elif [[ "$PROTOCOL" = 'TCP' ]]; then
+					semanage port -a -t openvpn_port_t -p tcp $PORT
+				fi
+			fi
+		fi
+	fi
+	# And finally, restart OpenVPN
+	if [[ "$OS" = 'debian' ]]; then
+		# Little hack to check for systemd
+		if pgrep systemd-journal; then
+				#Workaround to fix OpenVPN service on OpenVZ
+				sed -i 's|LimitNPROC|#LimitNPROC|' /lib/systemd/system/openvpn\@.service
+				sed -i 's|/etc/openvpn/server|/etc/openvpn|' /lib/systemd/system/openvpn\@.service
+				sed -i 's|%i.conf|server.conf|' /lib/systemd/system/openvpn\@.service
+				systemctl daemon-reload
+				systemctl restart openvpn
+				systemctl enable openvpn
+		else
+			/etc/init.d/openvpn restart
+		fi
+	else
+		if pgrep systemd-journal; then
+			if [[ "$OS" = 'arch' || "$OS" = 'fedora' ]]; then
+				#Workaround to avoid rewriting the entire script for Arch & Fedora
+				sed -i 's|/etc/openvpn/server|/etc/openvpn|' /usr/lib/systemd/system/openvpn-server@.service
+				sed -i 's|%i.conf|server.conf|' /usr/lib/systemd/system/openvpn-server@.service
+				systemctl daemon-reload
+				systemctl restart openvpn-server@openvpn.service
+				systemctl enable openvpn-server@openvpn.service
+			else
+				systemctl restart openvpn@server.service
+				systemctl enable openvpn@server.service
+			fi
+		else
+			service openvpn restart
+			chkconfig openvpn on
+		fi
+	fi
+	# Try to detect a NATed connection and ask about it to potential LowEndSpirit/Scaleway users
+	EXTERNALIP=$(wget -qO- ipv4.icanhazip.com)
+	if [[ "$IP" != "$EXTERNALIP" ]]; then
+		echo ""
+		echo "Looks like your server is behind a NAT!"
+		echo ""
+        echo "If your server is NATed (e.g. LowEndSpirit, Scaleway, or behind a router),"
+        echo "then I need to know the address that can be used to access it from outside."
+        echo "If that's not the case, just ignore this and leave the next field blank"
+        read -p "External IP or domain name: " -e USEREXTERNALIP
+		if [[ "$USEREXTERNALIP" != "" ]]; then
+			IP=$USEREXTERNALIP
+		fi
+	fi
+	# client-template.txt is created so we have a template to add further users later
+	file_client_tpl=/etc/openvpn/client-template.txt
+	echo "client" > ${file_client_tpl}
+	if [[ "$PROTOCOL" = 'UDP' ]]; then
+		echo "proto udp" >> ${file_client_tpl}
+	elif [[ "$PROTOCOL" = 'TCP' ]]; then
+		echo "proto tcp-client" >> ${file_client_tpl}
+	fi
+	echo "remote $IP $PORT
+dev tun
+resolv-retry infinite
+nobind
+persist-key
+persist-tun
+remote-cert-tls server
+auth SHA256
+auth-nocache
+$CIPHER
+tls-client
+tls-version-min 1.2
+tls-cipher TLS-DHE-RSA-WITH-AES-128-GCM-SHA256
+setenv opt block-outside-dns
+verb 3" >> /etc/openvpn/client-template.txt
+
+	# Generate the custom client.ovpn
+	newclient "$CLIENT"
+	echo ""
+	echo "Finished!"
+	echo ""
+	echo "Your client config is available at $homeDir/$CLIENT.ovpn"
+	echo "If you want to add more clients, you simply need to run this script another time!"
+fi
+exit 0;