beenull/raspap-webgui-mirror
1
0
Fork 0
mirror of https://github.com/RaspAP/raspap-webgui.git synced 2024-11-21 15:10:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update for for Debian 11 compatibility

Browse source
This commit is contained in:
billz 2021-11-15 22:14:59 +00:00
parent 84bd141025
commit 03d14ed434
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/090_raspap.conf
View file

@ -1,4 +1,4 @@
# RaspAP default config # RaspAP default config
log-facility=/tmp/dnsmasq.log log-facility=/var/log/dnsmasq.log
conf-dir=/etc/dnsmasq.d conf-dir=/etc/dnsmasq.d

6
installers/common.sh
View file

@ -139,7 +139,7 @@ function _get_linux_distro() {
# Sets php package option based on Linux version, abort if unsupported distro # Sets php package option based on Linux version, abort if unsupported distro
function _set_php_package() { function _set_php_package() {
case $RELEASE in case $RELEASE in
18.04|19.10) # Ubuntu Server 18.04|19.10|11*) # Ubuntu Server & Debian 11
php_package="php7.4-cgi" php_package="php7.4-cgi"
phpcgiconf="/etc/php/7.4/cgi/php.ini" ;; phpcgiconf="/etc/php/7.4/cgi/php.ini" ;;
10*) 10*)
@ -159,7 +159,7 @@ function _set_php_package() {
function _install_dependencies() { function _install_dependencies() {
_install_log "Installing required packages" _install_log "Installing required packages"
_set_php_package _set_php_package
if [ "$php_package" = "php7.4-cgi" ]; then if [ "$php_package" = "php7.4-cgi" ] && [ ${OS,,} = "ubuntu" ]; then
echo "Adding apt-repository ppa:ondrej/php" echo "Adding apt-repository ppa:ondrej/php"
sudo apt-get install $apt_option 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 $apt_option 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"
@ -609,7 +609,7 @@ function _optimize_php() {
if [ "$upgrade" == 0 ]; then if [ "$upgrade" == 0 ]; then
_install_log "Optimize PHP configuration" _install_log "Optimize PHP configuration"
if [ ! -f "$phpcgiconf" ]; then if [ ! -f "$phpcgiconf" ]; then
_install_warning "PHP configuration could not be found." _install_status 2 "PHP configuration could not be found."
return return
fi fi