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

Removed trivial command output

Browse source
This commit is contained in:
Orazio 2019-11-18 12:42:04 +01:00
parent 34c10a81f3
commit 1ff6f7e9e8
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
auto_install/install.sh
View file

@ -1222,7 +1222,7 @@ confOpenVPN(){
# Backup the openvpn folder # Backup the openvpn folder
OPENVPN_BACKUP="openvpn_$(date +%Y-%m-%d-%H%M%S).tar.gz" OPENVPN_BACKUP="openvpn_$(date +%Y-%m-%d-%H%M%S).tar.gz"
echo "::: Backing up the openvpn folder to /etc/${OPENVPN_BACKUP}" echo "::: Backing up the openvpn folder to /etc/${OPENVPN_BACKUP}"
$SUDO tar czf "/etc/${OPENVPN_BACKUP}" /etc/openvpn $SUDO tar czf "/etc/${OPENVPN_BACKUP}" /etc/openvpn &> /dev/null
if [ -f /etc/openvpn/server.conf ]; then if [ -f /etc/openvpn/server.conf ]; then
$SUDO rm /etc/openvpn/server.conf $SUDO rm /etc/openvpn/server.conf
@ -1346,7 +1346,7 @@ confWireGuard(){
# Backup the wireguard folder # Backup the wireguard folder
WIREGUARD_BACKUP="wireguard_$(date +%Y-%m-%d-%H%M%S).tar.gz" WIREGUARD_BACKUP="wireguard_$(date +%Y-%m-%d-%H%M%S).tar.gz"
echo "::: Backing up the wireguard folder to /etc/${WIREGUARD_BACKUP}" echo "::: Backing up the wireguard folder to /etc/${WIREGUARD_BACKUP}"
$SUDO tar czf "/etc/${WIREGUARD_BACKUP}" /etc/wireguard $SUDO tar czf "/etc/${WIREGUARD_BACKUP}" /etc/wireguard &> /dev/null
if [ -f /etc/wireguard/wg0.conf ]; then if [ -f /etc/wireguard/wg0.conf ]; then
$SUDO rm /etc/wireguard/wg0.conf $SUDO rm /etc/wireguard/wg0.conf
@ -1386,7 +1386,7 @@ ListenPort = ${pivpnPORT}" | $SUDO tee /etc/wireguard/wg0.conf &> /dev/null
confNetwork(){ confNetwork(){
# Enable forwarding of internet traffic # Enable forwarding of internet traffic
$SUDO sed -i '/net.ipv4.ip_forward=1/s/^#//g' /etc/sysctl.conf $SUDO sed -i '/net.ipv4.ip_forward=1/s/^#//g' /etc/sysctl.conf
$SUDO sysctl -p $SUDO sysctl -p > /dev/null
# if ufw enabled, configure that (running as root because sometimes the executable is not in the user's $PATH, on Debian for example) # if ufw enabled, configure that (running as root because sometimes the executable is not in the user's $PATH, on Debian for example)
if $SUDO bash -c 'hash ufw' 2>/dev/null; then if $SUDO bash -c 'hash ufw' 2>/dev/null; then
@ -1708,10 +1708,10 @@ main(){
case ${PLAT} in case ${PLAT} in
Debian|Raspbian) Debian|Raspbian)
if [ "$VPN" = "openvpn" ]; then if [ "$VPN" = "openvpn" ]; then
$SUDO systemctl enable openvpn.service $SUDO systemctl enable openvpn.service &> /dev/null
$SUDO systemctl start openvpn.service $SUDO systemctl start openvpn.service
elif [ "$VPN" = "wireguard" ]; then elif [ "$VPN" = "wireguard" ]; then
$SUDO systemctl enable wg-quick@wg0.service $SUDO systemctl enable wg-quick@wg0.service &> /dev/null
$SUDO systemctl start wg-quick@wg0.service $SUDO systemctl start wg-quick@wg0.service
fi fi
;; ;;

2
scripts/openvpn/pivpnDebug.sh
View file

@ -184,7 +184,7 @@ else
fi fi
fi fi
# grep -w (whole word) is used so port 111940 with now match when looking for 1194 # grep -w (whole word) is used so port 11940 won't match when looking for 1194
if netstat -uanpt | grep openvpn | grep -w "${pivpnPORT}" | grep -q "${pivpnPROTO}"; then if netstat -uanpt | grep openvpn | grep -w "${pivpnPORT}" | grep -q "${pivpnPROTO}"; then
echo ":: [OK] OpenVPN is listening on port ${pivpnPORT}/${pivpnPROTO}" echo ":: [OK] OpenVPN is listening on port ${pivpnPORT}/${pivpnPROTO}"
else else