Pi-hole/pivpn
Pi-hole/pivpn
1
0
Fork 0
mirror of https://github.com/pivpn/pivpn.git synced 2024-12-18 19:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2 from pivpn/master

Browse source 
Merge
This commit is contained in:
Orazio 2018-05-31 09:51:01 +02:00 committed by GitHub
commit 2fa10429ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ISSUE_TEMPLATE.md
View file

@ -16,7 +16,7 @@
(yes/no / which issues?) (yes/no / which issues?)
## Console output of `curl install.pivpn.io | bash` ## Console output of `curl -L install.pivpn.io | bash`
``` ```
Output Here Output Here
``` ```

8
scripts/makeOVPN.sh
View file

@ -121,11 +121,11 @@ function keyPASS() {
expect eof expect eof
EOF EOF
#Convert key to des3 #Convert key to aes128
KEY_FILE="pki/private/${NAME}${KEY}" KEY_FILE="pki/private/${NAME}${KEY}"
expect << EOF expect << EOF
set timeout -1 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 pass phrase" { send "${PASSWD}\r" }
expect "Enter PEM pass phrase" { send "${PASSWD}\r" } expect "Enter PEM pass phrase" { send "${PASSWD}\r" }
expect "Verifying - 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 read -r NAME
fi fi
if [[ "${NAME}" =~ [^a-zA-Z0-9] ]]; then if [[ "${NAME}" =~ [^a-zA-Z0-9\-] ]]; then
echo "Name can only contain alphanumeric characters." echo "Name can only contain alphanumeric characters and dashes (-)."
exit 1 exit 1
fi fi

2
server_config.txt
View file

@ -17,7 +17,7 @@ push "block-outside-dns"
# overriding but not wiping out the original default gateway. # overriding but not wiping out the original default gateway.
push "redirect-gateway def1" push "redirect-gateway def1"
client-to-client client-to-client
keepalive 10 120 keepalive 1800 3600
remote-cert-tls client remote-cert-tls client
tls-version-min 1.2 tls-version-min 1.2
tls-auth /etc/openvpn/easy-rsa/pki/ta.key 0 tls-auth /etc/openvpn/easy-rsa/pki/ta.key 0