diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index b4261de..b2b73da 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -16,7 +16,7 @@ (yes/no / which issues?) -## Console output of `curl install.pivpn.io | bash` +## Console output of `curl -L install.pivpn.io | bash` ``` Output Here ``` diff --git a/scripts/makeOVPN.sh b/scripts/makeOVPN.sh index 535ca41..e4d8962 100755 --- a/scripts/makeOVPN.sh +++ b/scripts/makeOVPN.sh @@ -121,11 +121,11 @@ function keyPASS() { expect eof EOF - #Convert key to des3 + #Convert key to aes128 KEY_FILE="pki/private/${NAME}${KEY}" expect << EOF set timeout -1 - spawn openssl rsa -in ${KEY_FILE} -des3 -out ${KEY_FILE} + spawn openssl rsa -in ${KEY_FILE} -aes128 -out ${KEY_FILE} expect "Enter pass phrase" { send "${PASSWD}\r" } expect "Enter PEM pass phrase" { send "${PASSWD}\r" } expect "Verifying - Enter PEM pass phrase" { send "${PASSWD}\r" } @@ -141,8 +141,8 @@ if [ -z "${NAME}" ]; then read -r NAME fi -if [[ "${NAME}" =~ [^a-zA-Z0-9] ]]; then - echo "Name can only contain alphanumeric characters." +if [[ "${NAME}" =~ [^a-zA-Z0-9\-] ]]; then + echo "Name can only contain alphanumeric characters and dashes (-)." exit 1 fi diff --git a/server_config.txt b/server_config.txt index a5099b2..0f34b3d 100644 --- a/server_config.txt +++ b/server_config.txt @@ -17,7 +17,7 @@ push "block-outside-dns" # overriding but not wiping out the original default gateway. push "redirect-gateway def1" client-to-client -keepalive 10 120 +keepalive 1800 3600 remote-cert-tls client tls-version-min 1.2 tls-auth /etc/openvpn/easy-rsa/pki/ta.key 0