Resolved merge conflicts

LatestUpdate.md

@@ -146,6 +146,19 @@ Updated LatestChanges
   - Currently apt pulls all packages from the unstable repo because the script intendation created the file 'limit-unstable' with tabs in it. Fixed using printf to create a multiline file.
 - Accept debug fixes using just the enter key
 
+## Nov 25th 2019 - On Master
+
+* Changed pivpn command exit codes from 1 to 0
+  - exit code 1 means general error hence should not be used for exiting successfully
+* added backup script to backup openvpn and pivpn generated certificates
+* added update script to update /opt/pivpn scripts, -t | --test | test update from test branch
+* Fixed hostname length issue #831
+    - the script now checks for hostname length right at the beginning and prompts for a new one.
+    - HOST_NAME to host_name, as best practice variables with capitals, should be used by system variables only.
+* fixed ubuntu 18.04 being detected as not supported OS, now fully supported and tested.
+* changed how scripts are copied to /opt/pivpn, it hat a lot of long repetitive lines, now it copies all `*.sh` files making it easier to manage when adding new scripts/features
+* Changed how supported OS are presented when maybeOS_Support() is called.
+
 ## Nov 19th 2019
 
 - Added Ubuntu Bionic support
@@ -186,7 +199,7 @@ Updated LatestChanges
 - Renamed some variables (see pull request 849).
 - Refactored several functions.
 
-## Oct 12th 2019
+## Oct 12th 2019 - On test
 
 * Changed pivpn command exit codes from 1 to 0
   - exit code 1 means general error hence should not be used for exiting successfully
@@ -199,23 +212,6 @@ Updated LatestChanges
 * changed how scripts are copied to /opt/pivpn, it hat a lot of long repetitive lines, now it copies all `*.sh` files making it easier to manage when adding new scripts/features
 * Changed how supported OS are presented when maybeOS_Support() is called.
 
-## Sept 1st 2019
-
-* Added support for Buster
-* .ovpn12 files making use of iOS keychain
-* Leverage the Hostname of the Server to generate server uuid
-* integrated support to bitwarden password manager into pivpn
-* Recreate ovpn folder if deleted
-* Handle older UFW version from Jessie
-* Only use iptables-legacy if platform is Buster
-* improved Buester and Jessie IPtables / ufw handling
-* bugfixes and typos
-* permissions hardening and writing uniformization
-* improved pivpn user and ovpns dirs handling
-* Changes variable and file naming in `install.sh`
-    -  $pivPNUser renamed to $INSTALL_USER
-    -  /tmp/pivpnUSR renamed to INSTALL_USER
-
 ### Merge Patch, Sept 2nd 2019
 
 * Bitwarden integration:
@@ -232,4 +228,19 @@ Updated LatestChanges
 * General improvments:
     - when runing updates, sudo password prompt now shows up in a new line
 
-----
+## Sept 1st 2019
+
+* Added support for Buster
+* .ovpn12 files making use of iOS keychain
+* Leverage the Hostname of the Server to generate server uuid
+* integrated support to bitwarden password manager into pivpn
+* Recreate ovpn folder if deleted
+* Handle older UFW version from Jessie
+* Only use iptables-legacy if platform is Buster
+* improved Buester and Jessie IPtables / ufw handling
+* bugfixes and typos
+* permissions hardening and writing uniformization
+* improved pivpn user and ovpns dirs handling
+* Changes variable and file naming in `install.sh`
+    -  $pivPNUser renamed to $INSTALL_USER
+    -  /tmp/pivpnUSR renamed to INSTALL_USER

README.md

@@ -50,8 +50,7 @@ Installation
 -----------------
 
 **Method 1**
-
-```shell
+```Shell
 curl -L https://install.pivpn.dev | bash
 ```
 

scripts/openvpn/makeOVPN.sh

@@ -194,6 +194,7 @@ function keyPASS() {
     fi
 
     #Escape chars in PASSWD
+    PASSWD_UNESCAPED="${PASSWD}"
     PASSWD=$(echo -n ${PASSWD} | sed -e 's/\\/\\\\/g' -e 's/\//\\\//g' -e 's/\$/\\\$/g' -e 's/!/\\!/g' -e 's/\./\\\./g' -e "s/'/\\\'/g" -e 's/"/\\"/g' -e 's/\*/\\\*/g' -e 's/\@/\\\@/g' -e 's/\#/\\\#/g' -e 's/£/\\£/g' -e 's/%/\\%/g' -e 's/\^/\\\^/g' -e 's/\&/\\\&/g' -e 's/(/\\(/g' -e 's/)/\\)/g' -e 's/-/\\-/g' -e 's/_/\\_/g' -e 's/\+/\\\+/g' -e 's/=/\\=/g' -e 's/\[/\\\[/g' -e 's/\]/\\\]/g' -e 's/;/\\;/g' -e 's/:/\\:/g' -e 's/|/\\|/g' -e 's/</\\</g' -e 's/>/\\>/g' -e 's/,/\\,/g' -e 's/?/\\?/g' -e 's/~/\\~/g' -e 's/{/\\{/g' -e 's/}/\\}/g')
 
     #Build the client key and then encrypt the key
@@ -354,9 +355,9 @@ if [ "$iOS" = "1" ]; then
 	printf "Please remember the export password\n"
 	printf "as you will need this import the certificate on your iOS device\n"
 	printf "========================================================\n"
-	openssl pkcs12 -passin pass:"$PASSWD" -export -in "issued/${NAME}${CRT}" -inkey "private/${NAME}${KEY}" -certfile ${CA} -name "${NAME}" -out "$install_home/ovpns/$NAME.ovpn12"
-	chown "$install_user" "$install_home/ovpns/$NAME.ovpn12"
-	chmod 600 "$install_home/ovpns/$NAME.ovpn12"
+	openssl pkcs12 -passin pass:"$PASSWD_UNESCAPED" -export -in "issued/${NAME}${CRT}" -inkey "private/${NAME}${KEY}" -certfile ${CA} -name "${NAME}" -out "$install_home/ovpns/$NAME.ovpn12"
+	chown "$install_user":"$install_user" "$install_home/ovpns/$NAME.ovpn12"
+    chmod 640 "$install_home/ovpns/$NAME.ovpn12"
 	printf "========================================================\n"
 	printf "\e[1mDone! %s successfully created!\e[0m \n" "$NAME.ovpn12"
 	printf "You will need to transfer both the .ovpn and .ovpn12 files\n"