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 #565 from sfoerster/noninteractive

Browse Source 
Noninteractive
This commit is contained in:
Bill Zimmerman
2020-04-19 11:39:59 +02:00
committed by GitHub
parent ec1a915edd 50693655b8
commit 4646b6e185
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
installers/common.sh
View File

@@ -100,8 +100,8 @@ function _install_dependencies() {
_set_php_package _set_php_package
if [ "$php_package" = "php7.4-cgi" ]; then if [ "$php_package" = "php7.4-cgi" ]; then
echo "Adding apt-repository ppa:ondrej/php" echo "Adding apt-repository ppa:ondrej/php"
sudo apt-get install software-properties-common || _install_status 1 "Unable to install dependency" sudo apt-get install $apt_option software-properties-common || _install_status 1 "Unable to install dependency"
sudo add-apt-repository ppa:ondrej/php || _install_status 1 "Unable to add-apt-repository ppa:ondrej/php" sudo add-apt-repository $apt_option ppa:ondrej/php || _install_status 1 "Unable to add-apt-repository ppa:ondrej/php"
fi fi
if [ ${OS,,} = "debian" ] || [ ${OS,,} = "ubuntu" ]; then if [ ${OS,,} = "debian" ] || [ ${OS,,} = "ubuntu" ]; then
dhcpcd_package="dhcpcd5" dhcpcd_package="dhcpcd5"
@@ -256,7 +256,7 @@ function _prompt_install_openvpn() {
# Install openvpn and enable client configuration option # Install openvpn and enable client configuration option
function _install_openvpn() { function _install_openvpn() {
_install_log "Installing OpenVPN and enabling client configuration" _install_log "Installing OpenVPN and enabling client configuration"
sudo apt-get install -y openvpn || _install_status 1 "Unable to install openvpn" sudo apt-get install $apt_option openvpn || _install_status 1 "Unable to install openvpn"
sudo sed -i "s/\('RASPI_OPENVPN_ENABLED', \)false/\1true/g" "$webroot_dir/includes/config.php" || _install_status 1 "Unable to modify config.php" sudo sed -i "s/\('RASPI_OPENVPN_ENABLED', \)false/\1true/g" "$webroot_dir/includes/config.php" || _install_status 1 "Unable to modify config.php"
echo "Enabling openvpn-client service on boot" echo "Enabling openvpn-client service on boot"
sudo systemctl enable openvpn-client@client || _install_status 1 "Unable to enable openvpn-client daemon" sudo systemctl enable openvpn-client@client || _install_status 1 "Unable to enable openvpn-client daemon"