From a985eb385805888a46429543379c621384ab513f Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Tue, 22 Nov 2022 22:40:10 +0100
Subject: [PATCH] CT: Heimdall and Nextcloud: fixed php version in configs

---
 CT-Files/heimdall/Configs/nginx.conf  | 2 +-
 CT-Files/heimdall/Configs/php.conf    | 4 ++--
 CT-Files/heimdall/Scripts/Init.sh     | 2 +-
 CT-Files/nextcloud/Configs/nginx.conf | 2 +-
 CT-Files/nextcloud/Configs/php.conf   | 4 ++--
 CT-Files/nextcloud/Scripts/Init.sh    | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CT-Files/heimdall/Configs/nginx.conf b/CT-Files/heimdall/Configs/nginx.conf
index 4984116..5d02dd9 100644
--- a/CT-Files/heimdall/Configs/nginx.conf
+++ b/CT-Files/heimdall/Configs/nginx.conf
@@ -37,7 +37,7 @@ http {
         }
         location ~ \.php$ {
             include fastcgi_params;
-            fastcgi_pass unix:/run/php-fpm8/php-fpm.sock;
+            fastcgi_pass unix:/run/php-fpm81/php-fpm.sock;
             fastcgi_split_path_info         ^(.+\.php)(/.+)$;
             fastcgi_index                   index.php;
             fastcgi_param                   SCRIPT_FILENAME   $document_root$fastcgi_script_name;
diff --git a/CT-Files/heimdall/Configs/php.conf b/CT-Files/heimdall/Configs/php.conf
index ed5f2fc..010669c 100644
--- a/CT-Files/heimdall/Configs/php.conf
+++ b/CT-Files/heimdall/Configs/php.conf
@@ -1,7 +1,7 @@
 [heimdall]
 user = nginx
 group = nginx
-listen = /run/php-fpm8/php-fpm.sock
+listen = /run/php-fpm81/php-fpm.sock
 listen.owner = nginx
 listen.group = nginx
 php_admin_value[disable_functions] = exec,passthru,system
@@ -27,7 +27,7 @@ php_admin_value[max_input_time] = 15
 php_admin_value[cgi.fix_pathinfo] = 0
 php_admin_value[allow_url_fopen] = 1
 php_admin_value[file_uploads] = On
-php_admin_value[open_basedir] = /opt/heimdall:/run/php-fpm8/php-fpm.sock:/tmp
+php_admin_value[open_basedir] = /opt/heimdall:/run/php-fpm81/php-fpm.sock:/tmp
 php_admin_value[session.use_strict_mode] = 1
 php_admin_value[session.cookie_httponly] = 1
 
diff --git a/CT-Files/heimdall/Scripts/Init.sh b/CT-Files/heimdall/Scripts/Init.sh
index c803365..050ad6b 100644
--- a/CT-Files/heimdall/Scripts/Init.sh
+++ b/CT-Files/heimdall/Scripts/Init.sh
@@ -15,4 +15,4 @@ chown -R nginx:nginx /opt/heimdall
 
 #Enable services on boot
 rc-update add nginx
-rc-update add php-fpm8
\ No newline at end of file
+rc-update add php-fpm81
\ No newline at end of file
diff --git a/CT-Files/nextcloud/Configs/nginx.conf b/CT-Files/nextcloud/Configs/nginx.conf
index 6c20b92..0fc1430 100644
--- a/CT-Files/nextcloud/Configs/nginx.conf
+++ b/CT-Files/nextcloud/Configs/nginx.conf
@@ -86,7 +86,7 @@ http {
             fastcgi_param HTTPS on;
             fastcgi_param modHeadersAvailable true;
             fastcgi_param front_controller_active true;
-            fastcgi_pass unix:/run/php-fpm8/php-fpm.sock;
+            fastcgi_pass unix:/run/php-fpm81/php-fpm.sock;
             fastcgi_intercept_errors on;
             fastcgi_request_buffering off;
         }
diff --git a/CT-Files/nextcloud/Configs/php.conf b/CT-Files/nextcloud/Configs/php.conf
index 7acc9d5..fc4db7e 100644
--- a/CT-Files/nextcloud/Configs/php.conf
+++ b/CT-Files/nextcloud/Configs/php.conf
@@ -1,7 +1,7 @@
 [nextcloud]
 user = nginx
 group = nginx
-listen = /run/php-fpm8/php-fpm.sock
+listen = /run/php-fpm81/php-fpm.sock
 listen.owner = nginx
 listen.group = nginx
 php_admin_value[disable_functions] = exec,passthru,system
@@ -27,7 +27,7 @@ php_admin_value[memory_limit] = 512M
 php_admin_value[cgi.fix_pathinfo] = 0
 php_admin_value[allow_url_fopen] = Off
 php_admin_value[file_uploads] = on
-php_admin_value[open_basedir] = /opt/nextcloud/:/var/nextcloud:/run/php-fpm8/php-fpm.sock:/run/redis/redis.sock:/proc/meminfo:/proc/cpuinfo:/dev/urandom:/tmp
+php_admin_value[open_basedir] = /opt/nextcloud/:/var/nextcloud:/run/php-fpm81/php-fpm.sock:/run/redis/redis.sock:/proc/meminfo:/proc/cpuinfo:/dev/urandom:/tmp
 php_admin_value[session.use_strict_mode] = 1
 php_admin_value[session.cookie_httponly] = 1
 ;HTTPSONLY php_admin_value[session.cookie_samesite] = Strict
diff --git a/CT-Files/nextcloud/Scripts/Init.sh b/CT-Files/nextcloud/Scripts/Init.sh
index 4e5e94c..672e84f 100644
--- a/CT-Files/nextcloud/Scripts/Init.sh
+++ b/CT-Files/nextcloud/Scripts/Init.sh
@@ -24,5 +24,5 @@ echo "*/5  *  *  *  *  php81 -f /opt/nextcloud/cron.php > /dev/null 2>&1" >> /et
 echo "apc.enable_cli=1" >> /etc/php81/php.ini
 #Enable services on boot
 rc-update add nginx
-rc-update add php-fpm8
+rc-update add php-fpm81
 rc-update add redis
\ No newline at end of file