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

Merge pull request #103 from mcguirepr89/fix_installer

Browse Source 
Fixed PHP version breaking for other locales
This commit is contained in:
Patrick McGuire
2022-01-08 08:08:40 -05:00
committed by GitHub
parent 359d39a602 01a9ed04b1
commit 6602eca544
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/install_services.sh
+3 -3
View File
@@ -40,7 +40,7 @@ install_mariadb() {
elif [[ "${VERSION_CODENAME}" == "bullseye" ]];then elif [[ "${VERSION_CODENAME}" == "bullseye" ]];then
USER=${USER} ${my_dir}/createdb_bullseye.sh USER=${USER} ${my_dir}/createdb_bullseye.sh
fi fi
systemctl restart php7.${php_version}-fpm systemctl restart php${php_version}-fpm
} }
install_birdnet_analysis() { install_birdnet_analysis() {
@@ -231,7 +231,7 @@ install_Caddyfile() {
if [ -f /etc/caddy/Caddyfile ];then if [ -f /etc/caddy/Caddyfile ];then
cp /etc/caddy/Caddyfile{,.original} cp /etc/caddy/Caddyfile{,.original}
fi fi
php_version="$(awk -F. '{print $2}' <(ls -l $(which /etc/alternatives/php)))" php_version="$(awk -F'php' '{print $3}' <(ls -l $(which /etc/alternatives/php)))"
HASHWORD=$(caddy hash-password -plaintext ${CADDY_PWD}) HASHWORD=$(caddy hash-password -plaintext ${CADDY_PWD})
cat << EOF > /etc/caddy/Caddyfile cat << EOF > /etc/caddy/Caddyfile
http://localhost http://birdnetpi.local ${BIRDNETPI_URL} { http://localhost http://birdnetpi.local ${BIRDNETPI_URL} {
@@ -250,7 +250,7 @@ http://localhost http://birdnetpi.local ${BIRDNETPI_URL} {
birdnet ${HASHWORD} birdnet ${HASHWORD}
} }
reverse_proxy /stream localhost:8000 reverse_proxy /stream localhost:8000
php_fastcgi unix//run/php/php7.${php_version}-fpm.sock php_fastcgi unix//run/php/php${php_version}-fpm.sock
} }
EOF EOF
if [ ! -z ${EXTRACTIONLOG_URL} ];then if [ ! -z ${EXTRACTIONLOG_URL} ];then
scripts/update_services.sh
+3 -3
View File
@@ -228,7 +228,7 @@ install_Caddyfile() {
if [ -f /etc/caddy/Caddyfile ];then if [ -f /etc/caddy/Caddyfile ];then
cp /etc/caddy/Caddyfile{,.original} cp /etc/caddy/Caddyfile{,.original}
fi fi
php_version="$(awk -F. '{print $2}' <(ls -l $(which /etc/alternatives/php)))" php_version="$(awk -F'php' '{print $3}' <(ls -l $(which /etc/alternatives/php)))"
HASHWORD=$(caddy hash-password -plaintext ${CADDY_PWD}) HASHWORD=$(caddy hash-password -plaintext ${CADDY_PWD})
cat << EOF > /etc/caddy/Caddyfile cat << EOF > /etc/caddy/Caddyfile
http://localhost http://birdnetpi.local ${BIRDNETPI_URL} { http://localhost http://birdnetpi.local ${BIRDNETPI_URL} {
@@ -247,7 +247,7 @@ http://localhost http://birdnetpi.local ${BIRDNETPI_URL} {
birdnet ${HASHWORD} birdnet ${HASHWORD}
} }
reverse_proxy /stream localhost:8000 reverse_proxy /stream localhost:8000
php_fastcgi unix//run/php/php7.${php_version}-fpm.sock php_fastcgi unix//run/php/php${php_version}-fpm.sock
} }
EOF EOF
if [ ! -z ${EXTRACTIONLOG_URL} ];then if [ ! -z ${EXTRACTIONLOG_URL} ];then
@@ -539,7 +539,7 @@ install_selected_services() {
create_necessary_dirs create_necessary_dirs
generate_BirdDB generate_BirdDB
install_cleanup_cron install_cleanup_cron
systemctl restart php7.${php_version}-fpm systemctl restart php${php_version}-fpm
} }
if [ -f ${config_file} ];then if [ -f ${config_file} ];then