frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-03-01 10:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1466 from RaspAP/maint/wg-dependencies

Browse Source 
Maintenance: Add dependency to wireguard install
This commit is contained in:
Bill Zimmerman 2023-12-04 09:03:01 +01:00 committed by GitHub
commit 959f85e63d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
installers/common.sh
View File

@ -93,6 +93,7 @@ function _config_installation() {
echo "Detected OS: ${DESC} ${LONG_BIT}-bit" echo "Detected OS: ${DESC} ${LONG_BIT}-bit"
echo "Using GitHub repository: ${repo} ${branch} branch" echo "Using GitHub repository: ${repo} ${branch} branch"
echo "Configuration directory: ${raspap_dir}" echo "Configuration directory: ${raspap_dir}"
if [ -n "$path" ]; then if [ -n "$path" ]; then
echo "Setting install path to ${path}" echo "Setting install path to ${path}"
webroot_dir=$path webroot_dir=$path
@ -505,11 +506,12 @@ function _prompt_install_wireguard() {
# Install Wireguard from the Debian unstable distro # Install Wireguard from the Debian unstable distro
function _install_wireguard() { function _install_wireguard() {
_install_log "Configure WireGuard support" _install_log "Configure WireGuard support"
if [ "$OS" == "Debian" ]; then if { [ "$OS" == "Debian" ] && [ "$RELEASE" == 12 ]; } ||
echo 'deb http://ftp.debian.org/debian buster-backports main' | sudo tee /etc/apt/sources.list.d/buster-backports.list || _install_status 1 "Unable to add Debian backports repo" { [ "$OS" == "Ubuntu" ] && [ "$RELEASE" == "22.04" ]; }; then
wg_dep="resolvconf"
fi fi
echo "Installing wireguard from apt" echo "Installing wireguard from apt"
sudo apt-get install -y wireguard || _install_status 1 "Unable to install wireguard" sudo apt-get install -y wireguard $wg_dep || _install_status 1 "Unable to install wireguard"
echo "Enabling wg-quick@wg0" echo "Enabling wg-quick@wg0"
sudo systemctl enable wg-quick@wg0 || _install_status 1 "Failed to enable wg-quick service" sudo systemctl enable wg-quick@wg0 || _install_status 1 "Failed to enable wg-quick service"
echo "Enabling WireGuard management option" echo "Enabling WireGuard management option"