claudecode/AvianVisitors
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

install php before caddy now to determine php version

Browse Source
This commit is contained in:
Patrick McGuire
2021-11-10 13:15:44 -05:00
parent 88b2d10214
commit 8e860d27a2
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/install_services.sh
+2 -1
View File
@@ -211,6 +211,7 @@ install_Caddyfile() {
fi fi
HASHWORD=$(caddy hash-password -plaintext ${CADDY_PWD}) HASHWORD=$(caddy hash-password -plaintext ${CADDY_PWD})
php_version="$(awk -F. '{print $2}' <(ls -l $(which /etc/alternatives/php)))" php_version="$(awk -F. '{print $2}' <(ls -l $(which /etc/alternatives/php)))"
echo "php_version=${php_version}"
cat << EOF > /etc/caddy/Caddyfile cat << EOF > /etc/caddy/Caddyfile
http://localhost http://birdnetpi.local ${BIRDNETPI_URL} { http://localhost http://birdnetpi.local ${BIRDNETPI_URL} {
root * ${EXTRACTED} root * ${EXTRACTED}
@@ -478,6 +479,7 @@ install_selected_services() {
install_recording_service install_recording_service
fi fi
install_php
install_caddy install_caddy
install_Caddyfile install_Caddyfile
update_etc_hosts update_etc_hosts
@@ -485,7 +487,6 @@ install_selected_services() {
install_gotty_logs install_gotty_logs
install_sox install_sox
install_mariadb install_mariadb
install_php
install_spectrogram_service install_spectrogram_service
install_edit_birdnet_conf install_edit_birdnet_conf
install_pushed_notifications install_pushed_notifications
scripts/update_services.sh
+4 -4
View File
@@ -350,15 +350,15 @@ install_sox() {
} }
install_php() { install_php() {
if ! which php &> /dev/null || ! which php-fpm7.3 || ! apt list --installed | grep php-xml;then if ! which php &> /dev/null || ! which php-fpm || ! apt list --installed | grep php-xml;then
echo "Installing PHP modules" echo "Installing PHP modules"
apt -qq update apt -qq update
apt install -qqy php php-fpm php7.3-mysql php-xml apt install -qqy php php-fpm php-mysql php-xml
else else
echo "PHP and PHP-FPM installed" echo "PHP and PHP-FPM installed"
fi fi
echo "Configuring PHP for Caddy" echo "Configuring PHP for Caddy"
sed -i 's/www-data/caddy/g' /etc/php/7.3/fpm/pool.d/www.conf sed -i 's/www-data/caddy/g' /etc/php/*/fpm/pool.d/www.conf
echo "Adding Caddy sudoers rule" echo "Adding Caddy sudoers rule"
cat << EOF > /etc/sudoers.d/010_caddy-nopasswd cat << EOF > /etc/sudoers.d/010_caddy-nopasswd
caddy ALL=(ALL) NOPASSWD: ALL caddy ALL=(ALL) NOPASSWD: ALL
@@ -474,6 +474,7 @@ install_selected_services() {
install_recording_service install_recording_service
fi fi
install_php
install_caddy install_caddy
install_Caddyfile install_Caddyfile
update_etc_hosts update_etc_hosts
@@ -481,7 +482,6 @@ install_selected_services() {
install_gotty_logs install_gotty_logs
install_sox install_sox
install_mariadb install_mariadb
install_php
install_spectrogram_service install_spectrogram_service
install_edit_birdnet_conf install_edit_birdnet_conf
install_pushed_notifications install_pushed_notifications