Merge pull request #940 from pivpn/test

Going back to pivpn.io
This commit is contained in:
4s3ti 2020-02-05 20:33:53 +01:00 committed by GitHub
commit 1f399527f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions

View file

@ -1,11 +1,11 @@
![WireGuard + OpenVPN logo](logos.jpg) ![WireGuard + OpenVPN logo](logos.jpg)
**[Is pivpn.dev down?](https://p.datadoghq.com/sb/od1t7p4rmqi6x1fm-cd513e61b0eb77a5d5f6a52fe0662205?theme=dark)** **[Is pivpn.io down?](https://p.datadoghq.com/sb/od1t7p4rmqi6x1fm-cd513e61b0eb77a5d5f6a52fe0662205?theme=dark)**
About About
----- -----
Visit the [PiVPN](https://pivpn.dev) site for more information. Visit the [PiVPN](https://pivpn.io) site for more information.
This is a set of shell scripts initially developed by **@0-kaladin** that serve to easily turn your Raspberry Pi (TM) This is a set of shell scripts initially developed by **@0-kaladin** that serve to easily turn your Raspberry Pi (TM)
into a VPN server using two free, open-source protocols: into a VPN server using two free, open-source protocols:
* [WireGuard](https://www.wireguard.com/) * [WireGuard](https://www.wireguard.com/)
@ -53,12 +53,12 @@ Installation
**Method 1** **Method 1**
```Shell ```Shell
curl -L https://install.pivpn.dev | bash curl -L https://install.pivpn.io | bash
``` ```
**Method 2** **Method 2**
```Shell ```Shell
curl -L https://install.pivpn.dev > pivpn.sh curl -L https://install.pivpn.io > pivpn.sh
sudo bash pivpn.sh sudo bash pivpn.sh
``` ```
@ -69,7 +69,7 @@ sudo bash pivpn/auto_install/install.sh
``` ```
**OBS:** **OBS:**
In alternative to install.pivpn.dev you can use the raw github link: In alternative to install.pivpn.io you can use the raw github link:
https://raw.githubusercontent.com/pivpn/pivpn/master/auto_install/install.sh https://raw.githubusercontent.com/pivpn/pivpn/master/auto_install/install.sh
**To install from Test/Development branch** **To install from Test/Development branch**

View file

@ -1,13 +1,13 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# PiVPN: Trivial OpenVPN or WireGuard setup and configuration # PiVPN: Trivial OpenVPN or WireGuard setup and configuration
# Easiest setup and mangement of OpenVPN or WireGuard on Raspberry Pi # Easiest setup and mangement of OpenVPN or WireGuard on Raspberry Pi
# https://pivpn.dev # https://pivpn.io
# Heavily adapted from the pi-hole.net project and... # Heavily adapted from the pi-hole.net project and...
# https://github.com/StarshipEngineer/OpenVPN-Setup/ # https://github.com/StarshipEngineer/OpenVPN-Setup/
# #
# Install with this command (from your Pi): # Install with this command (from your Pi):
# #
# curl -L https://install.pivpn.dev | bash # curl -L https://install.pivpn.io | bash
# Make sure you have `curl` installed # Make sure you have `curl` installed
######## VARIABLES ######### ######## VARIABLES #########
@ -371,7 +371,7 @@ verifyFreeDiskSpace(){
echo "::: You only have ${existing_free_kilobytes} KiloBytes free." echo "::: You only have ${existing_free_kilobytes} KiloBytes free."
echo "::: If this is a new install on a Raspberry Pi you may need to expand your disk." echo "::: If this is a new install on a Raspberry Pi you may need to expand your disk."
echo "::: Try running 'sudo raspi-config', and choose the 'expand file system option'" echo "::: Try running 'sudo raspi-config', and choose the 'expand file system option'"
echo "::: After rebooting, run this installation again. (curl -L https://install.pivpn.dev | bash)" echo "::: After rebooting, run this installation again. (curl -L https://install.pivpn.io | bash)"
echo "Insufficient free space, exiting..." echo "Insufficient free space, exiting..."
exit 1 exit 1
@ -1097,7 +1097,7 @@ installWireGuard(){
echo "::: Commands:" echo "::: Commands:"
echo "::: sudo apt-get upgrade -y" echo "::: sudo apt-get upgrade -y"
echo "::: sudo shutdown -r now" echo "::: sudo shutdown -r now"
echo "::: curl -L https://install.pivpn.dev | bash" echo "::: curl -L https://install.pivpn.io | bash"
exit 1 exit 1
else else
if (whiptail --title "Install WireGuard" --yesno "Your Raspberry Pi is running kernel $(uname -r), which is not the latest.\n\nInstalling WireGuard requires the latest kernel, so to continue, first you need to upgrade all packages, then reboot, and then run the script again.\n\nProceed to the upgrade?" ${r} ${c}); then if (whiptail --title "Install WireGuard" --yesno "Your Raspberry Pi is running kernel $(uname -r), which is not the latest.\n\nInstalling WireGuard requires the latest kernel, so to continue, first you need to upgrade all packages, then reboot, and then run the script again.\n\nProceed to the upgrade?" ${r} ${c}); then
@ -1108,7 +1108,7 @@ installWireGuard(){
$SUDO ${PKG_MANAGER} upgrade -y $SUDO ${PKG_MANAGER} upgrade -y
fi fi
if (whiptail --title "Reboot" --yesno "You need to reboot after upgrading to run the new kernel.\n\nWould you like to reboot now?" ${r} ${c}); then if (whiptail --title "Reboot" --yesno "You need to reboot after upgrading to run the new kernel.\n\nWould you like to reboot now?" ${r} ${c}); then
whiptail --title "Rebooting" --msgbox "The system will now reboot.\n\nWhen you come back, just run the installation command again:\n\n curl -L https://install.pivpn.dev | bash" ${r} ${c} whiptail --title "Rebooting" --msgbox "The system will now reboot.\n\nWhen you come back, just run the installation command again:\n\n curl -L https://install.pivpn.io | bash" ${r} ${c}
printf "\\nRebooting system...\\n" printf "\\nRebooting system...\\n"
$SUDO sleep 3 $SUDO sleep 3
$SUDO shutdown -r now $SUDO shutdown -r now

View file

@ -207,7 +207,7 @@ removeAll(){
echo ":::" echo ":::"
printf "::: Finished removing PiVPN from your system.\\n" printf "::: Finished removing PiVPN from your system.\\n"
printf "::: Reinstall by simpling running\\n:::\\n:::\\tcurl -L https://install.pivpn.dev | bash\\n:::\\n::: at any time!\\n:::\\n" printf "::: Reinstall by simpling running\\n:::\\n:::\\tcurl -L https://install.pivpn.io | bash\\n:::\\n::: at any time!\\n:::\\n"
} }
askreboot(){ askreboot(){