lamp.sh,ncp.cfg: Use PHP 8.2

Signed-off-by: Tobias Knöppler <[email protected]>

.github/workflows/build-sd-images.yml

@@ -190,10 +190,6 @@ jobs:
           sudo mkdir -p raspbian_root/etc/systemd/system/redis-server.service.d
           echo '[Service]' | sudo tee raspbian_root/etc/systemd/system/redis-server.service.d/ncp.conf
           echo 'PrivateUsers=false' | sudo tee -a raspbian_root/etc/systemd/system/redis-server.service.d/ncp.conf
-          
-          sudo mkdir -p raspbian_root/etc/systemd/system/php8.1-fpm.service.d
-          echo '[Service]' | sudo tee raspbian_root/etc/systemd/system/php8.1-fpm.service.d/ncp.conf
-          echo 'ExecStartPre=mkdir -p /var/run/php' | sudo tee -a raspbian_root/etc/systemd/system/php8.1-fpm.service.d/ncp.conf
       - name: Test image
         id: test
         run: |

bin/ncp-update-nc.d/update-nc.sh

@@ -219,9 +219,9 @@ then
 
   # Reload library.sh to reset PHPVER
   source /usr/local/etc/library.sh
-elif ! is_more_recent_than "29.0.0" "${NCVER}" && is_more_recent_than "8.3.0" "${PHPVER}.0" && [[ "$DEBIAN_VERSION" -ge 12 ]]
+elif ! is_more_recent_than "29.0.0" "${NCVER}" && is_more_recent_than "8.2.0" "${PHPVER}.0" && [[ "$DEBIAN_VERSION" -ge 12 ]]
 then
-  /usr/local/bin/ncp-update-nc.d/upgrade-php-bookworm-8.3.sh
+  /usr/local/bin/ncp-update-nc.d/upgrade-php-bookworm-8.2.sh
 
   # Reload library.sh to reset PHPVER
   source /usr/local/etc/library.sh

bin/ncp-update-nc.d/upgrade-php-bookworm-8.3.sh → bin/ncp-update-nc.d/upgrade-php-bookworm-8.2.sh

@@ -5,7 +5,7 @@ source /usr/local/etc/library.sh
 echo "Upgrading PHP..."
 export DEBIAN_FRONTEND=noninteractive
 PHPVER_OLD="$PHPVER"
-PHPVER_NEW="8.3"
+PHPVER_NEW="8.2"
 PHP_PACKAGES_OLD=("php${PHPVER_OLD}" \
   "php${PHPVER_OLD}"-{curl,gd,fpm,cli,opcache,mbstring,xml,zip,fileinfo,ldap,intl,bz2,mysql,bcmath,gmp,redis,common})
 PHP_PACKAGES_NEW=("php${PHPVER_NEW}" \

etc/ncp.cfg

@@ -1,5 +1,5 @@
 {
 	"nextcloud_version": "29.0.4",
-	"php_version": "8.1",
+	"php_version": "8.2",
 	"release": "bookworm"
 }

lamp.sh

@@ -25,9 +25,6 @@ export DEBIAN_FRONTEND=noninteractive
 install()
 {
     set -x
-    # Setup apt repository for php 8
-    wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-    echo "deb https://packages.sury.org/php/ ${RELEASE%-security} main" > /etc/apt/sources.list.d/php.list
     apt-get update
     $APTINSTALL apt-utils cron curl
     ls -l /var/lock || true