From c100d19da1369fc975c13a707859ef6b6b716252 Mon Sep 17 00:00:00 2001
From: frederik <frederik.slos@gmail.com>
Date: Fri, 9 Feb 2024 15:35:22 +0100
Subject: [PATCH] bookwork fix: make php version independant

---
 scripts/config.php                 | 2 +-
 scripts/install_services.sh        | 6 +++---
 scripts/update_birdnet_snippets.sh | 4 ++++
 scripts/update_caddyfile.sh        | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/scripts/config.php b/scripts/config.php
index ff070a2..68b7c06 100644
--- a/scripts/config.php
+++ b/scripts/config.php
@@ -61,7 +61,7 @@ if(isset($_GET['threshold'])) {
 }
 
 if(isset($_GET['restart_php']) && $_GET['restart_php'] == "true") {
-  shell_exec("sudo service php7.4-fpm restart");
+  shell_exec("sudo service php*-fpm restart");
   die();
 }
 
diff --git a/scripts/install_services.sh b/scripts/install_services.sh
index 15afe5a..db71de8 100755
--- a/scripts/install_services.sh
+++ b/scripts/install_services.sh
@@ -183,7 +183,7 @@ http:// ${BIRDNETPI_URL} {
     birdnet ${HASHWORD}
   }
   reverse_proxy /stream localhost:8000
-  php_fastcgi unix//run/php/php7.4-fpm.sock
+  php_fastcgi unix//run/php/php-fpm.sock
   reverse_proxy /log* localhost:8080
   reverse_proxy /stats* localhost:8501
   reverse_proxy /terminal* localhost:8888
@@ -201,7 +201,7 @@ http:// ${BIRDNETPI_URL} {
     file_server browse
   }
   reverse_proxy /stream localhost:8000
-  php_fastcgi unix//run/php/php7.4-fpm.sock
+  php_fastcgi unix//run/php/php-fpm.sock
   reverse_proxy /log* localhost:8080
   reverse_proxy /stats* localhost:8501
   reverse_proxy /terminal* localhost:8888
@@ -324,7 +324,7 @@ EOF
 configure_caddy_php() {
   echo "Configuring PHP for Caddy"
   sed -i 's/www-data/caddy/g' /etc/php/*/fpm/pool.d/www.conf
-  systemctl restart php7\*-fpm.service
+  systemctl restart php\*-fpm.service
   echo "Adding Caddy sudoers rule"
   cat << EOF > /etc/sudoers.d/010_caddy-nopasswd
 caddy ALL=(ALL) NOPASSWD: ALL
diff --git a/scripts/update_birdnet_snippets.sh b/scripts/update_birdnet_snippets.sh
index d50b5a8..fd35c8c 100755
--- a/scripts/update_birdnet_snippets.sh
+++ b/scripts/update_birdnet_snippets.sh
@@ -100,6 +100,10 @@ if grep -q 'birdnet_server.service' "$HOME/BirdNET-Pi/templates/birdnet_analysis
     systemctl daemon-reload && restart_services.sh
 fi
 
+if grep -q 'php7.4-' /etc/caddy/Caddyfile &>/dev/null; then
+  sed -i 's/php7.4-/php-/' /etc/caddy/Caddyfile
+fi
+
 if [ -L /usr/local/bin/analyze.py ];then
   rm -f /usr/local/bin/analyze.py
 fi
diff --git a/scripts/update_caddyfile.sh b/scripts/update_caddyfile.sh
index daa959a..3f5e701 100755
--- a/scripts/update_caddyfile.sh
+++ b/scripts/update_caddyfile.sh
@@ -37,7 +37,7 @@ http:// ${BIRDNETPI_URL} {
     birdnet ${HASHWORD}
   }
   reverse_proxy /stream localhost:8000
-  php_fastcgi unix//run/php/php7.4-fpm.sock
+  php_fastcgi unix//run/php/php-fpm.sock
   reverse_proxy /log* localhost:8080
   reverse_proxy /stats* localhost:8501
   reverse_proxy /terminal* localhost:8888
@@ -55,7 +55,7 @@ http:// ${BIRDNETPI_URL} {
     file_server browse
   }
   reverse_proxy /stream localhost:8000
-  php_fastcgi unix//run/php/php7.4-fpm.sock
+  php_fastcgi unix//run/php/php-fpm.sock
   reverse_proxy /log* localhost:8080
   reverse_proxy /stats* localhost:8501
   reverse_proxy /terminal* localhost:8888