lamp.sh: Fix opcache settings installed to the wrong path

Author: theCalcaholic

.github/workflows/build-lxd.yml

@@ -547,7 +547,7 @@ jobs:
           echo "Running update to ${VERSION}"
           
           current_nc_version="$(sudo "$LXC" exec ncp -- ncc status | grep "version:" | awk '{ print $3 }')"
-          latest_nc_version="34.0.2"
+          latest_nc_version="33.0.2"
                     
           sudo "$LXC" exec ncp -- bash -c "DBG=x ncp-update ${UPDATE_ARGS[*]}"
           sudo "$LXC" exec ncp -- /usr/local/bin/ncc status
@@ -837,6 +837,8 @@ jobs:
             echo "nextcloud log: "
             datadir="$(sudo "$LXC" exec ncp -- ncc config:system:get datadirectory)"
             sudo "$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true
+            echo "opcache.interned_strings_buffer:"
+            sudo "$LXC" exec ncp -- bash -c 'grep -R opcache.interned_strings_buffer /etc/php/*/fpm/conf.d/'
             exit 1
           }
           USE_INCUS="$USE_INCUS" ../.venv/bin/python system_tests.py --non-interactive || {

bin/ncp-restore

@@ -153,6 +153,7 @@ sed -i "s|'datadirectory' =>.*|'datadirectory' => '${DATADIR}',|" "${NCDIR}"/con
 
 # Just in case we moved the opcache dir
 install_template "php/opcache.ini.sh" "/etc/php/${PHPVER}/mods-available/opcache.ini"
+systemctl reload "php${PHPVER}-fpm"
 
 # tmp upload dir
 mkdir -p "$DATADIR/tmp"

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

@@ -260,7 +260,7 @@ then
 
   # Reload library.sh to reset PHPVER
   source /usr/local/etc/library.sh
-elif ! is_more_recent_than "34.0.0" "${NCVER}" && is_more_recent_than "8.5.0" "${PHPVER}.0" && [[ "$DEBIAN_VERSION" -ge 13 ]]
+elif ! is_more_recent_than "33.0.0" "${NCVER}" && is_more_recent_than "8.5.0" "${PHPVER}.0" && [[ "$DEBIAN_VERSION" -ge 13 ]]
 then
   /usr/local/bin/ncp-update-nc.d/upgrade-php-trixie-8.5.sh
 

bin/ncp-update-nc.d/upgrade-php-trixie-8.5.sh

@@ -7,9 +7,9 @@ export DEBIAN_FRONTEND=noninteractive
 PHPVER_OLD="$PHPVER"
 PHPVER_NEW="8.5"
 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${PHPVER_OLD}"-{curl,gd,fpm,cli,opcache,mbstring,xml,zip,fileinfo,ldap,intl,bz2,mysql,bcmath,gmp,redis,common,apcu})
 PHP_PACKAGES_NEW=("php${PHPVER_NEW}" \
-  "php${PHPVER_NEW}"-{curl,gd,fpm,cli,mbstring,xml,zip,fileinfo,ldap,intl,bz2,mysql,bcmath,gmp,redis,common})
+  "php${PHPVER_NEW}"-{curl,gd,fpm,cli,mbstring,xml,zip,fileinfo,ldap,intl,bz2,mysql,bcmath,gmp,redis,common,apcu})
 
 php_restore() {
   trap "" INT TERM HUP ERR
@@ -24,7 +24,8 @@ php_restore() {
   apt-get remove --purge -y "${PHP_PACKAGES_NEW[@]}"
   apt-get install -y --no-install-recommends -t "$RELEASE" "${PHP_PACKAGES_OLD[@]}"
   set_ncpcfg "php_version" "${PHPVER_OLD}"
-  install_template "php/opcache.ini.sh" "/etc/php/${PHPVER_NEW}/mods-available/opcache.ini"
+  install_template "php/opcache.ini.sh" "/etc/php/${PHPVER_OLD}/mods-available/opcache.ini"
+  phpenmod -v "${PHPVER_OLD}" -s fpm opcache
   run_app nc-limits
   a2enconf "php${PHPVER_OLD}-fpm"
   service "php${PHPVER_OLD}-fpm" start
@@ -54,6 +55,7 @@ apt-get install -y --no-install-recommends -t "$RELEASE" "${PHP_PACKAGES_NEW[@]}
 
 set_ncpcfg "php_version" "${PHPVER_NEW}"
 install_template "php/opcache.ini.sh" "/etc/php/${PHPVER_NEW}/mods-available/opcache.ini"
+phpenmod -v "${PHPVER_NEW}" -s fpm opcache
 ( set -e; export PHPVER="${PHPVER_NEW}"; run_app nc-limits )
 
 a2enconf "php${PHPVER_NEW}-fpm"

bin/ncp/CONFIG/nc-datadir.sh

@@ -142,6 +142,7 @@ configure()
   # opcache dir
   create_opcache_dir
   install_template "php/opcache.ini.sh" "/etc/php/${PHPVER}/mods-available/opcache.ini"
+  systemctl reload "php${PHPVER}-fpm"
 
   # update fail2ban logpath
   [[ -f /etc/fail2ban/jail.local ]] && \

bin/ncp/CONFIG/nc-nextcloud.sh

@@ -180,10 +180,12 @@ configure()
   if [[ -z "${OPCACHEDIR}" ]]
   then
     install_template "php/opcache.ini.sh" "/etc/php/${PHPVER}/mods-available/opcache.ini" --defaults
+    systemctl reload "php${PHPVER}-fpm"
   else
     mkdir -p "$OPCACHEDIR"
     chown -R www-data:www-data "$OPCACHEDIR"
     install_template "php/opcache.ini.sh" "/etc/php/${PHPVER}/mods-available/opcache.ini"
+    systemctl reload "php${PHPVER}-fpm"
   fi
 
   ## RE-CREATE DATABASE TABLE

etc/library.sh

@@ -256,7 +256,7 @@ install_template() {
   local target="${2?}"
   local bkp="$(mktemp)"
 
-  echo "Installing template '$template'..."
+  echo "Installing template '$template' to '$target'..."
 
   mkdir -p "$(dirname "$target")"
   [[ -f "$target" ]] && cp -a "$target" "$bkp"

etc/ncp-templates/php/opcache.ini.sh

@@ -23,10 +23,12 @@ mkdir -p "$TMP_DIR"
 
 cat <<EOF
 zend_extension=opcache.so
+
+[opcache]
 opcache.enable=1
 opcache.enable_cli=0
 opcache.fast_shutdown=1
-opcache.interned_strings_buffer=12
+opcache.interned_strings_buffer=32
 opcache.max_accelerated_files=10000
 opcache.memory_consumption=128
 opcache.save_comments=1

lamp.sh

@@ -65,6 +65,8 @@ install()
     ##########################################
 
     install_template "php/opcache.ini.sh" "/etc/php/${PHPVER}/mods-available/opcache.ini" --defaults
+    phpenmod -v "${PHPVER}" -s fpm opcache
+    systemctl reload "php${PHPVER}-fpm"
 
     # systemd drop-in: allow write access to NCP paths blocked by ProtectSystem=full
     mkdir -p /var/www/ncp-web
@@ -120,6 +122,11 @@ y
 y
 y
 EOF
+
+  php --version | grep "PHP ${PHPVER}" || {
+    echo "Unexpected default PHP version (expected: ${PHPVER})!"
+    return 1
+  }
 }
 
 configure() { :; }

tests/nextcloud_tests.py

@@ -234,6 +234,8 @@ def test_nextcloud(IP: str, nc_port: str, driver: WebDriver, skip_release_check:
                     expected['ncp_version'] = True
                 elif 'php version' in divs[0].text.lower() and divs[1].text == ncp_cfg['php_version']:
                     expected['php_version'] = True
+                elif 'php version' in divs[0].text.lower() and divs[1].text != ncp_cfg['php_version']:
+                    print(f"{tc.yellow}{divs[1].text} != ${ncp_cfg['php_version']}")
                 elif 'debian release' in divs[0].text.lower():
                     if divs[1].text == ncp_cfg['release'] or skip_release_check:
                         expected['debian_release'] = True