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

Fixes

Browse source
This commit is contained in:
Kaladin Light 2016-04-20 20:20:52 -04:00
parent 0c7905dc3c
commit 0a06fbd6a8
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
auto_install/install.sh
View file

@ -455,8 +455,9 @@ confOpenVPN () {
if [ $i == '"SERVER_NAME"' ]; then if [ $i == '"SERVER_NAME"' ]; then
SERVER_NAME=$(whiptail --title "Server Name" --inputbox \ SERVER_NAME=$(whiptail --title "Server Name" --inputbox \
"Enter a Server Name" $r $c "pivpn" 3>&1 1>&2 2>&3) "Enter a Server Name" $r $c "pivpn" 3>&1 1>&2 2>&3)
sed -i '/export KEY_CN/s/^#//g' vars # This began a rabbit hole of errors. Nope.
sed -i "s/\(KEY_CN=\"\).*/\1${SERVER_NAME}\"/" vars #sed -i '/export KEY_CN/s/^#//g' vars
#sed -i "s/\(KEY_CN=\"\).*/\1${SERVER_NAME}\"/" vars
fi fi
if [ $i == '"KEY_NAME"' ]; then if [ $i == '"KEY_NAME"' ]; then
KEY_NAME=$(whiptail --title "Key Name" --inputbox \ KEY_NAME=$(whiptail --title "Key Name" --inputbox \
@ -467,7 +468,9 @@ confOpenVPN () {
# Make PiVPN the OU # Make PiVPN the OU
KEY_OU=PiVPN KEY_OU=PiVPN
sed -i "s/\(KEY_OU=\"\).*/\1${KEY_OU}\"/" vars sed -i "s/\(KEY_OU=\"\).*/\1${KEY_OU}\"/" vars
grep -q 'KEY_ALTNAMES=' vars || printf '\nexport KEY_ALTNAMES="PiVPN_KEYALT"\n' >> vars
# It seems you have to set this if you mess with key_cn, lets not.
# grep -q 'KEY_ALTNAMES=' vars || printf '\nexport KEY_ALTNAMES="PiVPN_KEYALT"\n' >> vars
# source the vars file just edited # source the vars file just edited
source ./vars source ./vars
@ -476,12 +479,14 @@ confOpenVPN () {
./clean-all ./clean-all
# Build the certificate authority # Build the certificate authority
echo "::: Building CA..."
./build-ca < /etc/.pivpn/ca_info.txt ./build-ca < /etc/.pivpn/ca_info.txt
echo "::: CA Complete."
whiptail --msgbox --backtitle "Setup OpenVPN" --title "Server Information" "The server key, Diffie-Hellman key, and HMAC key will now be generated." $r $c whiptail --msgbox --backtitle "Setup OpenVPN" --title "Server Information" "The server key, Diffie-Hellman key, and HMAC key will now be generated." $r $c
# Build the server # Build the server
./build-key-server --batch ./build-key-server --batch $SERVER_NAME
# Generate Diffie-Hellman key exchange # Generate Diffie-Hellman key exchange
./build-dh ./build-dh
@ -557,7 +562,7 @@ confOVPN() {
fi fi
# if they changed client dns put in server config # if they changed client dns put in server config
if [ $OVPNDNS != 8.8.8.8 ]; then if [[ $OVPNDNS != "8.8.8.8" ]]; then
sed -i -e "s/dhcp-option DNS 8.8.8.8/dhcp-option DNS ${OVPNDNS}/g" /etc/openvpn/server.conf sed -i -e "s/dhcp-option DNS 8.8.8.8/dhcp-option DNS ${OVPNDNS}/g" /etc/openvpn/server.conf
fi fi