changelog.md: Document v1.56.0

NC 32 and fixes

.github/actions/create-test-instance-bullseye/action.yml

@@ -13,7 +13,7 @@ inputs:
   server_type:
     description: Server type to use for hetzner servers
     required: true
-    default: "cx11"
+    default: "cx22"
 
 outputs:
   server_address:

.github/actions/create-test-instance/action.yml

@@ -13,7 +13,7 @@ inputs:
   server_type:
     description: Server type to use for hetzner servers
     required: true
-    default: "cx11"
+    default: "cx22"
 
 outputs:
   server_address:

.github/workflows/build-docker.yml

@@ -381,7 +381,7 @@ jobs:
           docker exec nextcloudpi bash /usr/local/bin/ncp-diag |& awk "{ print \"${LOG_DIAG} \" \$0 }"
       - name: "Upload error report"
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ github.run_id }}-docker-${{ env.ARCH }}-update-test-error-report
           path: tests/error-report.txt
@@ -533,7 +533,7 @@ jobs:
 
       - name: "Upload error report"
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ github.run_id }}-docker-${{ env.ARCH }}-install-test-error-report
           path: tests/error-report.txt

.github/workflows/build-lxd.yml

@@ -47,7 +47,7 @@ jobs:
             echo "lxd_extra_profile=network" | tee -a "$GITHUB_OUTPUT"
           else
             LXC_CMD="incus"
-            RUNNER_LABEL="ubuntu-20.04"
+            RUNNER_LABEL="ubuntu-latest"
           fi
 
           echo "runner_label=$RUNNER_LABEL" | tee -a $GITHUB_OUTPUT
@@ -73,7 +73,7 @@ jobs:
       - name: Setup incus
         if: ${{ needs.determine-runner.outputs.runner_label != 'ubuntu-20.04-arm64' }}
         run: |
-          curl https://pkgs.zabbly.com/get/incus-stable | sudo sh -x
+          sudo apt-get install -y incus qemu-system incus-tools
           sudo iptables -I DOCKER-USER -i incusbr0 -j ACCEPT
           sudo iptables -I DOCKER-USER -o incusbr0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
           sudo incus admin init --auto
@@ -91,7 +91,7 @@ jobs:
           sudo "$LXC" image export -q ncp/"${version}" "output/${ARTIFACT_FILE}"
           echo "artifact_file=${ARTIFACT_FILE}.tar.gz" >> $GITHUB_OUTPUT
       - name: upload LXD image to artifact store
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ env.ARTIFACT_NAME }}"
           path: "output/${{ steps.pack-lxd.outputs.artifact_file }}"
@@ -341,6 +341,7 @@ jobs:
 #          }
 
   test-dist-upgrade:
+    if: false
     needs:
       - determine-runner
     runs-on: ${{ needs.determine-runner.outputs.runner_label }}
@@ -349,46 +350,55 @@ jobs:
       LXC: "${{ needs.determine-runner.outputs.lxc_cmd }}"
       LXD_EXTRA_PROFILE: "${{ needs.determine-runner.outputs.lxd_extra_profile }}"
       PREVIOUS_IMAGE_URL_ARM64: "https://github.com/nextcloud/nextcloudpi/releases/download/v1.53.2/NextcloudPi_LXD_arm64_v1.53.2.tar.gz"
-      PREVIOUS_IMAGE_URL_AMD64: "https://github.com/nextcloud/nextcloudpi/releases/download/v1.53.2/NextcloudPi_LXD_x86_v1.53.2.tar.gz"
+      PREVIOUS_IMAGE_URL_AMD64: "https://github.com/nextcloud/nextcloudpi/releases/download/v1.53.2/NextCloudPi_LXD_x86_v1.53.2.tar.gz"
       USE_INCUS: "${{ needs.determine-runner.outputs.lxc_cmd == 'incus' && 'yes' || 'no' }}"
     steps:
       - name: Setup incus
         if: ${{ needs.determine-runner.outputs.runner_label != 'ubuntu-20.04-arm64' }}
         run: |
-          curl https://pkgs.zabbly.com/get/incus-stable | sudo sh -x
+          sudo apt-get install -y incus qemu-system incus-tools
           sudo iptables -I DOCKER-USER -i incusbr0 -j ACCEPT
           sudo iptables -I DOCKER-USER -o incusbr0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
           sudo incus admin init --auto
       - name: Checkout code
         uses: actions/checkout@v3
         with:
-          ref: "${{ env.VERSION }}"
+          ref: "v1.54.3"
       - name: Setup Firefox
+        if: ${{ runner.arch != 'ARM64' }}
         continue-on-error: true
         id: setup-firefox-browser-action
         uses: browser-actions/setup-firefox@latest
       - name: Setup Firefox from packages
-        if: ${{ steps.setup-firefox-browser-action.outcome == 'failure' }}
+        if: ${{ runner.arch == 'ARM64' || steps.setup-firefox-browser-action.outcome == 'failure' }}
         run: |
+          sudo apt-get update
           sudo apt-get install -y --no-install-recommends firefox
       - name: Setup GeckoDriver
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
+          set -x
           arch=linux64
-          if [[ "$RUNNER_ARCH" == "ARM64" ]]
+          if [[ "${{ runner.arch }}" == "ARM64" ]]
           then
             arch="linux-aarch64"
           fi
           gh release download -R mozilla/geckodriver -p 'geckodriver-*-'"$arch.tar.gz"
           tar xf "geckodriver-"*"-$arch.tar.gz"
           sudo mv geckodriver /usr/local/bin/
+          sudo chmod +x /usr/local/bin/geckodriver
+          echo "GECKODRIVER_PATH=/usr/local/bin/geckodriver" >> "$GITHUB_ENV"
+          geckodriver -V
       - name: Setup Selenium
-        run: pip install selenium
+        run: |
+          sudo apt-get -y install python3-venv
+          python3 -m venv ./.venv
+          ./.venv/bin/pip install selenium
       - name: download LXD image
         run: |
           image_url="${PREVIOUS_IMAGE_URL_AMD64?}"
-          if [[ "$RUNNER_ARCH" == "ARM64" ]]
+          if [[ "${{ runner.arch }}" == "ARM64" ]]
           then
             image_url="${PREVIOUS_IMAGE_URL_ARM64?}"
           fi
@@ -412,8 +422,11 @@ jobs:
       - name: Activate and Test LXD Image
         working-directory: ./tests
         run: |
+          set -x
+          export GECKODRIVER_PATH="$GECKODRIVER_PATH"
+          export FF_BINARY_PATH="$(which firefox)"
           sudo "$LXC" exec ncp -- bash -c 'tail -f /var/log/ncp.log' |& awk '{ print "NCP::" $0 }' &
-          python activation_tests.py --no-gui "nextcloudpi.local" 443 4443 || {
+          ../.venv/bin/python activation_tests.py --no-gui "nextcloudpi.local" 443 4443 || {
             echo "Activation test failed!"
             echo "Geckodriver logs:"
             tail -n 20 geckodriver.log >&2 || true
@@ -422,7 +435,7 @@ jobs:
             sudo "$LXC" exec ncp -- "tail -n20 /var/log/ncp.log" || true
             exit 1
           }
-          python nextcloud_tests.py --no-gui --skip-release-check "nextcloudpi.local" 443 4443 || {
+          ../.venv/bin/python nextcloud_tests.py --skip-release-check --no-gui "nextcloudpi.local" 443 4443 || {
             echo "Nextcloud test failed!"
             echo "Geckodriver logs:"
             tail -n 20 geckodriver.log >&2 || true
@@ -435,8 +448,14 @@ jobs:
             sudo "$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true
             exit 1
           }
-          USE_INCUS="$USE_INCUS"  python system_tests.py --non-interactive --skip-update-test || {
+          USE_INCUS="$USE_INCUS"  ../.venv/bin/python system_tests.py --non-interactive --skip-update-test || {
             echo "System test failed!"
+            echo "ncp.log: "
+            sudo "$LXC" exec ncp -- "tail -n20 /var/log/ncp.log" || true
+            echo "================"
+            echo "nextcloud log: "
+            datadir="$(sudo "$LXC" exec ncp -- ncc config:system:get datadirectory)"
+            sudo "$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true
             exit 1
           }
 
@@ -457,17 +476,22 @@ jobs:
           echo "Running update to ${VERSION}"
           
           current_nc_version="$(sudo "$LXC" exec ncp -- ncc status | grep "version:" | awk '{ print $3 }')"
-          latest_nc_version="$(cat etc/ncp.cfg | jq -r '.nextcloud_version')"
+          latest_nc_version="29.0.9"
+          
+          sudo "$LXC" exec ncp -- apt-get update ||:
+          sudo "$LXC" exec ncp -- apt-get install --no-install-recommends -y gnupg2
+          sudo "$LXC" exec ncp -- apt-key adv --fetch-keys https://packages.sury.org/php/apt.gpg
           
           sudo "$LXC" exec ncp -- bash -c "DBG=x ncp-update ${UPDATE_ARGS[*]}"
           sudo "$LXC" exec ncp -- /usr/local/bin/ncc status
           
-          if [[ "$current_nc_version" =~ "$latest_nc_version".* ]]
-          then
-            echo "Nextcloud is up to date - skipping NC update test."
-          else
-            sudo "$LXC" exec ncp -- bash -c "DBG=x ncp-update-nc ${latest_nc_version?}"
-          fi
+          #if [[ "$current_nc_version" =~ "$latest_nc_version".* ]]
+          #then
+          #  echo "Nextcloud is up to date - skipping NC update test."
+          #else
+          #  sudo "$LXC" exec ncp -- bash -c "DBG=x ncp-update-nc ${latest_nc_version?}"
+          #  sudo "$LXC" exec ncp -- /usr/local/bin/ncc status
+          #fi
   
           sudo "$LXC" exec ncp -- rm -f /opt/ncdata/data/nextcloud.log
           
@@ -488,7 +512,9 @@ jobs:
       - name: Test LXD Image
         working-directory: ./tests
         run: |
-          python nextcloud_tests.py --no-gui --skip-release-check "nextcloudpi.local" 443 4443 || {
+          export GECKODRIVER_PATH="$GECKODRIVER_PATH"
+          export FF_BINARY_PATH="$(which firefox)"
+          ../.venv/bin/python nextcloud_tests.py --no-gui --skip-release-check "nextcloudpi.local" 443 4443 || {
             echo "Nextcloud test failed!"
             echo "Geckodriver logs:"
             tail -n 20 geckodriver.log >&2 || true
@@ -502,10 +528,14 @@ jobs:
             exit 1
           }
           sudo "$LXC" exec ncp -- bash -c 'tail -f /var/log/ncp.log' |& awk '{ print "NCP::" $0 }' &
-          USE_INCUS="$USE_INCUS" python system_tests.py --non-interactive --skip-update-test || {
+          USE_INCUS="$USE_INCUS" ../.venv/bin/python system_tests.py --non-interactive --skip-update-test || {
             echo "System test failed!"
             exit 1
           }
+      - name: Checkout current version
+        run: |
+          git fetch origin
+          git checkout "${{ env.VERSION }}"
       - name: NCP distupgrade
         id: distupgrade
         run: |
@@ -514,10 +544,38 @@ jobs:
             echo "can't upgrade from Debian $(sudo "$LXC" exec ncp -- cat /etc/os-release | grep VERSION_ID=)"
             exit 1
           }
+          current_nc_version="$(sudo "$LXC" exec ncp -- ncc status | grep "version:" | awk '{ print $3 }')"
+          latest_nc_version="$(cat etc/ncp.cfg | jq -r '.nextcloud_version')"
+          
           sudo "$LXC" exec ncp -- bash -c "DEBIAN_FRONTEND=noninteractive ncp-dist-upgrade"
+          sudo "$LXC" exec ncp -- /usr/local/bin/ncc status
+          
+          if [[ "$current_nc_version" =~ "$latest_nc_version".* ]]
+          then
+            echo "Nextcloud is up to date - skipping NC update test."
+          else
+            
+            for i in {1..10};
+            do
+              echo "running nc update ($i/10)..."
+              sudo "$LXC" exec ncp -- bash -c "DBG=x ncp-update-nc ${latest_nc_version?}"
+            
+              sudo "$LXC" exec ncp -- /usr/local/bin/ncc status
+              current_nc_version_new="$(sudo "$LXC" exec ncp -- ncc status | grep "version:" | awk '{ print $3 }')"
+              if [[ "$current_nc_version_new" =~ "$latest_nc_version".* ]]
+              then
+                break
+              fi
+              if [[ "$current_nc_version" == "$current_nc_version_new" ]]
+              then
+                echo "failed to update to $latest_nc_version"
+                exit 1
+              fi
+              current_nc_version="$current_nc_version_new"
+            done
+          fi
           
           sudo "$LXC" exec ncp -- rm -f /opt/ncdata/data/nextcloud.log
-          
           sudo "$LXC" stop ncp
       - name: Relaunch container
         run: |
@@ -535,8 +593,11 @@ jobs:
       - name: Test LXD Image
         working-directory: ./tests
         run: |
+          set -x
+          export GECKODRIVER_PATH="$GECKODRIVER_PATH"
+          export FF_BINARY_PATH="$(which firefox)"
           sudo "$LXC" exec ncp -- bash -c 'tail -f /var/log/ncp.log' |& awk '{ print "NCP::" $0 }' &
-          python nextcloud_tests.py --no-gui "nextcloudpi.local" 443 4443 || {
+          ../.venv/bin/python nextcloud_tests.py --no-gui "nextcloudpi.local" 443 4443 || {
             echo "Nextcloud test failed!"
             echo "Geckodriver logs:"
             tail -n 20 geckodriver.log >&2 || true
@@ -549,7 +610,7 @@ jobs:
             sudo "$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true
             exit 1
           }
-          USE_INCUS="$USE_INCUS" python system_tests.py --non-interactive || {
+          USE_INCUS="$USE_INCUS" ../.venv/bin/python system_tests.py --non-interactive || {
             echo "System test failed!"
             exit 1
           }
@@ -575,34 +636,43 @@ jobs:
       - name: Setup incus
         if: ${{ needs.determine-runner.outputs.runner_label != 'ubuntu-20.04-arm64' }}
         run: |
-          curl https://pkgs.zabbly.com/get/incus-stable | sudo sh -x
+          sudo apt-get install -y incus qemu-system incus-tools
           sudo iptables -I DOCKER-USER -i incusbr0 -j ACCEPT
           sudo iptables -I DOCKER-USER -o incusbr0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
           sudo incus admin init --auto
       - name: Setup Firefox
+        if: ${{ runner.arch != 'ARM64' }}
         continue-on-error: true
         id: setup-firefox-browser-action
         uses: browser-actions/setup-firefox@latest
       - name: Setup Firefox from packages
-        if: ${{ steps.setup-firefox-browser-action.outcome == 'failure' }}
+        if: ${{ runner.arch == 'ARM64' || steps.setup-firefox-browser-action.outcome == 'failure' }}
         run: |
+          sudo apt-get update
           sudo apt-get install -y --no-install-recommends firefox
       - name: Setup GeckoDriver
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
+          set -x
           arch=linux64
-          if [[ "$RUNNER_ARCH" == "ARM64" ]]
+          if [[ "${{ runner.arch }}" == "ARM64" ]]
           then
             arch="linux-aarch64"
           fi
           gh release download -R mozilla/geckodriver -p 'geckodriver-*-'"$arch.tar.gz"
           tar xf "geckodriver-"*"-$arch.tar.gz"
           sudo mv geckodriver /usr/local/bin/
+          sudo chmod +x /usr/local/bin/geckodriver
+          echo "GECKODRIVER_PATH=/usr/local/bin/geckodriver" >> "$GITHUB_ENV"
+          geckodriver -V
       - name: Setup Selenium
-        run: pip install selenium
+        run: |
+          sudo apt-get install -y python3-venv
+          python3 -m venv ./.venv
+          ./.venv/bin/pip install selenium
       - name: download LXD image from artifact store
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ env.ARTIFACT_NAME }}
       - name: Remove old lxd images
@@ -631,34 +701,37 @@ jobs:
       - name: Test LXD Image
         working-directory: ./tests
         run: |
-          "$LXC" exec ncp -- bash -c 'tail -f /var/log/ncp.log' |& awk '{ print "NCP::" $0 }' &
-          python activation_tests.py --no-gui "nextcloudpi.local" 443 4443 || {
+          set -x
+          export GECKODRIVER_PATH="$GECKODRIVER_PATH"
+          export FF_BINARY_PATH="$(which firefox)"
+          sudo "$LXC" exec ncp -- bash -c 'tail -f /var/log/ncp.log' |& awk '{ print "NCP::" $0 }' &
+          ../.venv/bin/python activation_tests.py --no-gui "nextcloudpi.local" 443 4443 || {
             echo "Activation test failed!"
             echo "Geckodriver logs:"
             tail -n 20 geckodriver.log >&2 || true
             echo "================"
             echo "ncp.log: "
-            "$LXC" exec ncp -- "tail -n20 /var/log/ncp.log" || true
+            sudo "$LXC" exec ncp -- "tail -n20 /var/log/ncp.log" || true
             echo "================"
             echo "nextcloud log: "
             datadir="$("$LXC" exec ncp -- ncc config:system:get datadirectory)"
-            "$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true
+            sudo "$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true
             exit 1
           }
-          python nextcloud_tests.py --no-gui "nextcloudpi.local" 443 4443 || {
+          ../.venv/bin/python nextcloud_tests.py --no-gui "nextcloudpi.local" 443 4443 || {
             echo "Nextcloud test failed!"
             echo "Geckodriver logs:"
             tail -n 20 geckodriver.log >&2 || true
             echo "================"
             echo "ncp.log: "
-            "$LXC" exec ncp -- "tail -n20 /var/log/ncp.log" || true
+            sudo "$LXC" exec ncp -- "tail -n20 /var/log/ncp.log" || true
             echo "================"
             echo "nextcloud log: "
-            datadir="$("$LXC" exec ncp -- ncc config:system:get datadirectory)"
-            "$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true
+            datadir="$(sudo "$LXC" exec ncp -- ncc config:system:get datadirectory)"
+            sudo "$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true
             exit 1
           }
-          USE_INCUS="$USE_INCUS" python system_tests.py --non-interactive || {
+          USE_INCUS="$USE_INCUS" ../.venv/bin/python system_tests.py --non-interactive || {
             echo "System test failed!"
             exit 1
           }
@@ -677,7 +750,7 @@ jobs:
       LXD_ARTIFACT_FILE: ${{ needs.build-current.outputs.artifact_file }}
     steps:
       - name: download LXD image from artifact store
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ env.LXD_ARTIFACT_NAME }}
       - name: convert to LXC image
@@ -695,7 +768,7 @@ jobs:
           echo "artifact_file=${LXC_ARTIFACT_FILE?}" >> $GITHUB_OUTPUT;
           echo "artifact_name=${LXD_ARTIFACT_NAME//lxd/lxc}" >> $GITHUB_OUTPUT;
       - name: upload LXD image to artifact store
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ steps.lxd-to-lxc.outputs.artifact_name }}"
           path: "output/${{ steps.lxd-to-lxc.outputs.artifact_file }}"

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

@@ -15,6 +15,10 @@ on:
         required: false
         default: true
         type: boolean
+      test_image_url:
+        required: false
+        type: string
+        default: ""
     outputs:
       artifact_name:
         value: "${{ jobs.build.outputs.artifact_name }}"
@@ -23,7 +27,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       VERSION: "${{ inputs.git_ref }}"
       LOG_GUEST: "\\033[1;34mGUEST::\\033[0m"
@@ -63,30 +67,35 @@ jobs:
 #          which qemu-aarch64-static
 #          update-binfmts --display qemu-aarch64
 #          update-binfmts --display qemu-arm
+      - name: "Skip build"
+        if: "${{ inputs.test_image_url != '' }}"
+        run: |
+          echo "artifact_file=NextcloudPi_TestImage_${VERSION//\//_}.img" >> $GITHUB_OUTPUT
+          echo "ARTIFACT_FILE=NextcloudPi_TestImage_${VERSION//\//_}.img" >> $GITHUB_ENV
       - name: "Build Armbian"
-        if: ${{ inputs.board_id != 'raspberrypi' }}
+        if: "${{ inputs.test_image_url == '' }}"
         id: build-armbian
         continue-on-error: true
         run: |
           set -ex
           export IMG="NextcloudPi_${{ inputs.board_name }}_${VERSION//\//_}.img"
           [[ "${{ github.ref_protected }}" == true ]] || export DBG=x
-          
+
           ./build/build-SD-armbian.sh "${{ inputs.board_id }}" "${{ inputs.board_name }}"
-          
+
           artifacts=("armbian/output/images/Armbian"*.img)
           mkdir -p output
           mv "${artifacts[0]}" "output/$IMG"
           echo "artifact_file=${IMG}" >> $GITHUB_OUTPUT
           echo "ARTIFACT_FILE=${IMG}" >> $GITHUB_ENV
       - name: "Build Armbian (2nd attempt)"
-        if: ${{ inputs.board_id != 'raspberrypi' && steps.build-armbian.outcome == 'failure' }}
+        if: ${{ steps.build-armbian.outcome == 'failure' }}
         id: build-armbian-2nd
         run: |
           set -ex
           echo -e "${LOG_CICD} Cleanup armbian build leftovers..."
           sudo rm -rf armbian/ tmp/ output/
-          
+
           export IMG="NextcloudPi_${{ inputs.board_name }}_${VERSION//\//_}.img"
           [[ "${{ github.ref_protected }}" == true ]] || export DBG=x
 
@@ -98,36 +107,14 @@ jobs:
           echo "artifact_file=${IMG}" >> $GITHUB_OUTPUT
           echo "ARTIFACT_FILE=${IMG}" >> $GITHUB_ENV
       - name: "Upload Armbian logs"
-        if: ${{ inputs.board_id != 'raspberrypi' && failure() }}
-        uses: actions/upload-artifact@v3
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ github.run_id }}-${{ inputs.board_id }}-logs
           path: armbian/output
-      - name: Build RPI SD Image
-        if: ${{ inputs.board_id == 'raspberrypi' }}
-        id: build-rpi
-        run: |
-          set -ex
-          echo -e "${LOG_CICD} Protected? ${{ github.ref_protected }}"
-          export IMG="NextcloudPi_${{ inputs.board_name }}_${VERSION//\//_}.img"
-          [[ "${{ github.ref_protected }}" == true ]] || export DBG=x
-          wget -q https://github.com/multiarch/qemu-user-static/releases/latest/download/qemu-aarch64-static -O ./qemu-aarch64-static
-          ./build/build-SD-rpi.sh
-          mkdir -p output
-          mv "tmp/$IMG" ./output/
-
-          for i in {1..10}
-          do
-            sudo losetup | grep "${IMG}" || break;
-            [[ "$i" -lt 10 ]] || { echo -e "${LOG_CICD} Timeout while waiting for image to unmount"; exit 1; }
-            sleep 6
-            echo -e "${LOG_CICD} Retrying ($i out of 10)"
-          done
-
-          echo "artifact_file=${IMG}" >> $GITHUB_OUTPUT
-          echo "ARTIFACT_FILE=${IMG}" >> $GITHUB_ENV
       - name: upload image to artifact store
-        uses: actions/upload-artifact@v3
+        if: "${{ inputs.test_image_url == '' }}"
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ github.run_id }}-${{ inputs.board_id }}-image
           path: output/${{ env.ARTIFACT_FILE }}
@@ -135,7 +122,7 @@ jobs:
 
   test:
     needs: build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       VERSION: "${{ inputs.git_ref }}"
       ARTIFACT_ID: ${{ needs.build.outputs.artifact_name }}
@@ -151,32 +138,33 @@ jobs:
     steps:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
-#      - name: Set up QEMU
-#        run: |
-#          sudo apt-get update
-#          sudo apt-get install -y binfmt-support
-#          docker run --rm --privileged tonistiigi/binfmt:latest --install all
-#          docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
-#          sudo systemctl disable apparmor
-      #          sudo mkdir -p /etc/binfmt
-      #          for conf in qemu-{aarch64,arm}-static.conf
-      #          do
-      #            sed 's/:F$/:OC/' /usr/lib/binfmt.d/$conf | sudo tee /etc/binfmt/$conf
-      #          done
+      - name: Disable apparmor
+        run: |
+          sudo systemctl disable apparmor
       - name: Checkout code
         uses: actions/checkout@v3
         with:
           ref: "${{ env.VERSION }}"
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
+        if: "${{ inputs.test_image_url == '' }}"
         with:
           name: ${{ env.ARTIFACT_ID }}
           path: output
+      - name: Download Test Image
+        if: "${{ inputs.test_image_url != '' }}"
+        run: |
+          set -ex
+          mkdir -p output
+          sudo apt-get install -y pv
+          wget -nv "${{ inputs.test_image_url }}" -O - | pv -n --bytes --rate --timer -i 3 > "output/${ARTIFACT_FILE?}"
       - name: Prepare test
         run: |
           set -x
-          mv output/${ARTIFACT_FILE?} ncp.img
+          mv "output/${ARTIFACT_FILE?}" ncp.img
           sudo apt-get install -y systemd-container
-          sudo pip install selenium
+          python3 -m venv ./.venv
+          . ./.venv/bin/activate
+          ./.venv/bin/pip install selenium
           sudo rm -rf raspbian_root
           . ./build/buildlib.sh
           mount_raspbian "ncp.img"
@@ -191,9 +179,9 @@ jobs:
           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
+          sudo mkdir -p raspbian_root/etc/systemd/system/php8.3-fpm.service.d
+          echo '[Service]' | sudo tee raspbian_root/etc/systemd/system/php8.3-fpm.service.d/ncp.conf
+          echo 'ExecStartPre=mkdir -p /var/run/php' | sudo tee -a raspbian_root/etc/systemd/system/php8.3-fpm.service.d/ncp.conf
       - name: Test image
         id: test
         run: |
@@ -214,7 +202,7 @@ jobs:
           for attempt in {1..30}
           do
             echo -e "${LOG_CICD} == Wait until container network is available (attempt $attempt/30) =="
-            ip="$("${CONTAINER_CMD[@]}" bash -c '. /usr/local/etc/library.sh > /dev/null; get_ip')"
+                ip="$("${CONTAINER_CMD[@]}" bash -c '. /usr/local/etc/library.sh > /dev/null; get_ip')"
             [[ -n "$ip" ]] && curl -k "https://$ip/activate/" > /dev/null || { sleep 6; continue; }
             success=true
             break
@@ -249,12 +237,14 @@ jobs:
           done
           
           [[ "$success" == "true" ]] || {
-              echo -e "${LOG_CICD} Timeout reached."
-              "${CONTAINER_CMD[@]}" -q systemctl status mysql |& awk "{ print \"${LOG_DIAG} \" \$0 }"
-              "${CONTAINER_CMD[@]}" -q systemctl status redis |& awk "{ print \"${LOG_DIAG} \" \$0 }"
-              "${CONTAINER_CMD[@]}" -q systemctl status 'php*-fpm' |& awk "{ print \"${LOG_DIAG} \" \$0 }"
-              "${CONTAINER_CMD[@]}" -q systemctl status apache2 |& awk "{ print \"${LOG_DIAG} \" \$0 }"
-              "${CONTAINER_CMD[@]}" -q ncp-diag |& awk "{ print \"${LOG_DIAG} \" \$0 }"
+              echo -e "${LOG_CICD} ERR: Timeout reached."
+              "${CONTAINER_CMD[@]}" -q systemctl status mysql |& awk "{ print \"${LOG_DIAG} \" \$0 }" ||:
+              "${CONTAINER_CMD[@]}" -q systemctl status redis-server |& awk "{ print \"${LOG_DIAG} \" \$0 }" ||:
+              sudo journalctl --file ./raspbian_root/var/log/journal/"$(sudo cat ./raspbian_root/etc/machine-id)"/system.journal --no-pager -eu redis-server ||:
+              "${CONTAINER_CMD[@]}" -q journalctl --no-pager -eu redis-server
+              "${CONTAINER_CMD[@]}" -q systemctl status 'php*-fpm' |& awk "{ print \"${LOG_DIAG} \" \$0 }" ||:
+              "${CONTAINER_CMD[@]}" -q systemctl status apache2 |& awk "{ print \"${LOG_DIAG} \" \$0 }" ||:
+              "${CONTAINER_CMD[@]}" -q ncp-diag |& awk "{ print \"${LOG_DIAG} \" \$0 }" ||:
               exit 1
           }
           
@@ -265,7 +255,7 @@ jobs:
           for attempt in {1..5}
           do
             echo -e "${LOG_CICD} == Activation Tests (attempt $attempt/5) =="
-            python tests/activation_tests.py -t 300 --no-gui "$ip" 443 4443 |& awk "{ print \"${LOG_TEST} \" \$0 }"
+            ./.venv/bin/python tests/activation_tests.py -t 300 --no-gui "$ip" 443 4443 |& awk "{ print \"${LOG_TEST} \" \$0 }"
             [[ ${PIPESTATUS[0]} -eq 0 ]] || {
               echo -e "${LOG_CICD} Activation test failed!"
               echo -e "${LOG_DIAG} Geckodriver logs:"
@@ -289,7 +279,7 @@ jobs:
           for attempt in {1..5}
           do
             echo -e "${LOG_CICD} == System Tests (attempt $attempt/5) =="
-            sudo python tests/system_tests.py --non-interactive |& awk "{ print \"${LOG_TEST} \" \$0 }"
+            USE_SUDO=yes ./.venv/bin/python tests/system_tests.py --non-interactive |& awk "{ print \"${LOG_TEST} \" \$0 }"
             [[ ${PIPESTATUS[0]} -eq 0 ]] || {
               echo -e "${LOG_CICD} System test failed!"
               sleep 12
@@ -307,18 +297,27 @@ jobs:
           for attempt in {1..5}
           do
             echo -e "${LOG_CICD} == Nextcloud Tests (attempt $attempt/5) =="
-            python tests/nextcloud_tests.py --no-gui "$ip" 443 4443 |& awk "{ print \"${LOG_TEST} \" \$0 }"
+            ./.venv/bin/python tests/nextcloud_tests.py --no-gui "$ip" 443 4443 |& awk "{ print \"${LOG_TEST} \" \$0 }"
             [[ ${PIPESTATUS[0]} -eq 0 ]] || {
               echo -e "${LOG_CICD} Nextcloud test failed!"
+              echo -e "${LOG_DIAG} /etc/os-release:"
+              "${CONTAINER_CMD[@]}" -q ncp /bin/bash -c 'cat /etc/os-release'
+              echo -e "${LOG_DIAG} /usr/local/etc/ncp.cfg:"
+              "${CONTAINER_CMD[@]}" --pipe -q ncp /bin/bash -c 'cat /usr/local/etc/ncp.cfg'
+              cat ./raspbian_root/usr/local/etc/ncp.cfg
+              echo -e "${LOG_DIAG} /home/ncp-app-bridge config ncp"
+              sudo ls -l ./raspbian_root/home/www/ncp-app-bridge.sh
+              "${CONTAINER_CMD[@]}" --pipe --uid=33 ncp /bin/bash -c 'sudo /home/www/ncp-app-bridge.sh config ncp'
               echo -e "{$LOG_DIAG} Geckodriver logs:"
               tail -n 20 geckodriver.log >&2 |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
               echo -e "${LOG_CICD} ================"
               echo -e "${LOG_DIAG} ncp.log: "
-              "${CONTAINER_CMD[@]}" -q ncp /bin/bash -c "tail -n20 /var/log/ncp.log" |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
+              "${CONTAINER_CMD[@]}" --pipe ncp /bin/bash -c "tail -n20 /var/log/ncp.log" |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
               echo "================"
               echo "${LOG_DIAG} Nextcloud log: "
-              "${CONTAINER_CMD[@]}" -q ncp /bin/bash -c 'ls -l /opt/ncdata/data/nextcloud.log' |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
-              "${CONTAINER_CMD[@]}" -q ncp /bin/bash -c 'cat /opt/ncdata/data/nextcloud.log' |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
+              "${CONTAINER_CMD[@]}" --pipe -q ncp /bin/bash -c 'ls -l /opt/ncdata/data/nextcloud.log' |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
+              "${CONTAINER_CMD[@]}" --pipe -q ncp /bin/bash -c 'cat /opt/ncdata/data/nextcloud.log' |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
+              sudo cat ./raspbian_root/opt/ncdata/data/nextcloud.log |& awk "{ print \"${LOG_DIAG} \" \$0 }"
               sleep 12
               continue
             }
@@ -358,7 +357,7 @@ jobs:
           }
 
 #  test-distupgrade:
-#    runs-on: ubuntu-20.04
+#    runs-on: ubuntu-latest
 #    env:
 #      VERSION: "${{ inputs.git_ref || github.ref }}"
 #      LOG_GUEST: "\\033[1;34mGUEST::\\033[0m"

.github/workflows/publish-image.yml

@@ -32,7 +32,7 @@ jobs:
         with:
           ref: "${{ env.VERSION }}"
       - name: "Download artifact"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.artifact_id }}
           path: artifacts
@@ -43,7 +43,7 @@ jobs:
         run: |
           set -ex
           mkdir -p publish
-          mv artifacts/${{ inputs.artifact_file }} publish/
+          mv "artifacts/${{ inputs.artifact_file }}" publish/
           cd publish
           
           asset="${IMG}"

.github/workflows/release.yml

@@ -26,6 +26,11 @@ on:
         description: 'Release images to GH'
         required: false
         default: false
+      test_image_url:
+        type: string
+        description: 'URL for test image to test instead of actual armbian builds'
+        required: false
+        default: ''
   push:
     tags:
       - "v*"
@@ -58,22 +63,23 @@ jobs:
       git_ref: "${{ inputs.git_ref || github.head_ref || github.ref_name }}"
     secrets: inherit
 
-  raspberrypi-4:
+  raspberrypi:
     if: ${{ inputs.sd-images || ( github.event_name != 'workflow_dispatch' && !startsWith(github.ref_name, 'docker-') ) }}
     uses: ./.github/workflows/build-sd-images.yml
     with:
       git_ref: "${{ inputs.git_ref || github.head_ref || github.ref_name }}"
       board_id: rpi4b
-      board_name: RaspberryPi4
+      board_name: RaspberryPi 4+
     secrets: inherit
 
-  raspberrypi-5:
-    if: ${{ inputs.sd-images || ( github.event_name != 'workflow_dispatch' && !startsWith(github.ref_name, 'docker-') ) }}
+  armbian-test-image:
+    if: ${{ inputs.test_image_url != '' }}
     uses: ./.github/workflows/build-sd-images.yml
     with:
       git_ref: "${{ inputs.git_ref || github.head_ref || github.ref_name }}"
-      board_id: rpi5b
-      board_name: RaspberryPi5
+      board_id: testimage
+      board_name: TestImage
+      test_image_url: "${{ inputs.test_image_url }}"
     secrets: inherit
 
   # TODO: Fix 32bit armbian images
@@ -136,6 +142,22 @@ jobs:
       board_id: odroidc2
       board_name: OdroidC2
     secrets: inherit
+  orangepi5:
+    if: ${{ inputs.sd-images || ( github.event_name != 'workflow_dispatch' && !startsWith(github.ref_name, 'docker-') ) }}
+    uses: ./.github/workflows/build-sd-images.yml
+    with:
+      git_ref: "${{ inputs.git_ref || github.head_ref || github.ref_name }}"
+      board_id: orangepi5
+      board_name: OrangePi5
+    secrets: inherit
+  orangepi5plus:
+    if: ${{ inputs.sd-images || ( github.event_name != 'workflow_dispatch' && !startsWith(github.ref_name, 'docker-') ) }}
+    uses: ./.github/workflows/build-sd-images.yml
+    with:
+      git_ref: "${{ inputs.git_ref || github.head_ref || github.ref_name }}"
+      board_id: orangepi5-plus
+      board_name: OrangePi5Plus
+    secrets: inherit
 
   lxd-x86-release:
     needs:
@@ -185,31 +207,19 @@ jobs:
       artifact_file: "${{ needs.lxd-arm64.outputs.lxc_artifact_file }}"
       dry_run: ${{ (!inputs.release && github.event_name == 'workflow_dispatch') || github.ref_type != 'tag' || !(github.ref_protected || startsWith(github.ref, 'refs/tags/v'))  }}
 
-  raspberrypi-4-release:
+  raspberrypi-release:
     needs:
-      - raspberrypi-4
+      - raspberrypi
       - github-release
     if: ${{ inputs.sd-images || github.event_name != 'workflow_dispatch' }}
     uses: ./.github/workflows/publish-image.yml
     with:
       git_ref: "${{ inputs.git_ref || github.head_ref || github.ref_name }}"
-      artifact_id: "${{ needs.raspberrypi-4.outputs.artifact_name }}"
-      artifact_file: "${{ needs.raspberrypi-4.outputs.artifact_file }}"
+      artifact_id: "${{ needs.raspberrypi.outputs.artifact_name }}"
+      artifact_file: "${{ needs.raspberrypi.outputs.artifact_file }}"
       dry_run: ${{ (!inputs.release && github.event_name == 'workflow_dispatch') || github.ref_type != 'tag' || !(github.ref_protected || startsWith(github.ref, 'refs/tags/v'))  }}
     secrets: inherit
 
-  raspberrypi-5-release:
-    needs:
-      - raspberrypi-5
-      - github-release
-    if: ${{ inputs.sd-images || github.event_name != 'workflow_dispatch' }}
-    uses: ./.github/workflows/publish-image.yml
-    with:
-      git_ref: "${{ inputs.git_ref || github.head_ref || github.ref_name }}"
-      artifact_id: "${{ needs.raspberrypi-5.outputs.artifact_name }}"
-      artifact_file: "${{ needs.raspberrypi-5.outputs.artifact_file }}"
-      dry_run: ${{ (!inputs.release && github.event_name == 'workflow_dispatch') || github.ref_type != 'tag' || !(github.ref_protected || startsWith(github.ref, 'refs/tags/v'))  }}
-    secrets: inherit
   odroidxu4-release:
     needs:
       - odroidxu4
@@ -294,6 +304,30 @@ jobs:
       artifact_file: "${{ needs.odroidc2.outputs.artifact_file }}"
       dry_run: ${{ (!inputs.release && github.event_name == 'workflow_dispatch') || github.ref_type != 'tag' || !(github.ref_protected || startsWith(github.ref, 'refs/tags/v'))  }}
     secrets: inherit
+  orangepi5-release:
+    needs:
+      - orangepi5
+      - github-release
+    if: ${{ inputs.sd-images || github.event_name != 'workflow_dispatch' }}
+    uses: ./.github/workflows/publish-image.yml
+    with:
+      git_ref: "${{ inputs.git_ref || github.head_ref || github.ref_name }}"
+      artifact_id: "${{ needs.orangepi5.outputs.artifact_name }}"
+      artifact_file: "${{ needs.orangepi5.outputs.artifact_file }}"
+      dry_run: ${{ (!inputs.release && github.event_name == 'workflow_dispatch') || github.ref_type != 'tag' || !(github.ref_protected || startsWith(github.ref, 'refs/tags/v'))  }}
+    secrets: inherit
+  orangepi5plus-release:
+    needs:
+      - orangepi5plus
+      - github-release
+    if: ${{ inputs.sd-images || github.event_name != 'workflow_dispatch' }}
+    uses: ./.github/workflows/publish-image.yml
+    with:
+      git_ref: "${{ inputs.git_ref || github.head_ref || github.ref_name }}"
+      artifact_id: "${{ needs.orangepi5plus.outputs.artifact_name }}"
+      artifact_file: "${{ needs.orangepi5plus.outputs.artifact_file }}"
+      dry_run: ${{ (!inputs.release && github.event_name == 'workflow_dispatch') || github.ref_type != 'tag' || !(github.ref_protected || startsWith(github.ref, 'refs/tags/v'))  }}
+    secrets: inherit
 
   github-release:
     if: ${{ github.event_name == 'workflow_dispatch' || !startsWith(github.ref_name, 'docker-') }}
@@ -324,8 +358,14 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          
+          NC_VERSION="$(jq -r '.nextcloud_version' < etc/ncp.cfg)"
+          PHP_VERSION="$(jq -r '.php_version' < etc/ncp.cfg)"
+          DEBIAN_VERSION="$(jq -r '.release' < etc/ncp.cfg)"
+          ARMBIAN_VERSIOn="$(cat build/armbian/armbian_version)"
+          
           subject="$(git tag -n10 --format="%(contents:subject)" "${{ env.VERSION }}")"
-          body="$(git tag -n10 --format="%(contents:body)" "${{ env.VERSION }}")"
+          body="$(git tag -n30 --format="%(contents:body)" "${{ env.VERSION }}")"
           separator="
 
           ---
@@ -334,6 +374,12 @@ jobs:
 
           gh release create --draft -F - "${{ env.VERSION }}" <<EOF
           ${subject:-No message found}
+          
+          ### Included Software
+          Nextcloud ${NC_VERSION} (can be automatically updated to latest minor version) 
+          PHP ${PHP_VERSION}
+          Debian ${DEBIAN_VERSION}
+          Armbian ${ARMBIAN_VERSION}
 
           ${body:+${body}${separator}}
 

.github/workflows/vm-tests.yml

@@ -52,18 +52,19 @@ jobs:
           ssh-keygen -t ed25519 -f ".ssh/automation_ssh_key"
           . /ncp-test-automation/bin/entrypoint.sh
       - name: upload ssh private key to artifact store
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ env.SSH_ARTIFACT_NAME }}"
           path: /__w/nextcloudpi/nextcloudpi/.ssh
           if-no-files-found: error
+          include-hidden-files: true
       - id: create-test-instance
         uses: ./.github/actions/create-test-instance
         with:
           version: ${{ env.VERSION }}
           uid: "${{ env.UID }}"
           hcloud_token: ${{ secrets.TEST_AUTOMATION_HCLOUD_API_TOKEN }}
-          server_type: "cx11"
+          server_type: "cx22"
       - name: set instance variables
         run: |
           echo "SERVER_ADDRESS=${{ steps.create-test-instance.outputs.server_address }}" >> "$GITHUB_ENV"
@@ -301,18 +302,19 @@ jobs:
           ssh-keygen -t ed25519 -f "/__w/nextcloudpi/nextcloudpi/.ssh/automation_ssh_key"
           . /ncp-test-automation/bin/entrypoint.sh
       - name: upload ssh private key to artifact store
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ env.SSH_ARTIFACT_NAME }}"
           path: /__w/nextcloudpi/nextcloudpi/.ssh
           if-no-files-found: error
+          include-hidden-files: true
       - id: create-test-instance
         uses: ./.github/actions/create-test-instance-bullseye
         with:
           version: "${{ env.PREVIOUS_VERSION }}"
           uid: "${{ env.UID }}"
           hcloud_token: ${{ secrets.TEST_AUTOMATION_HCLOUD_API_TOKEN }}
-          server_type: "cx11"
+          server_type: "cx22"
       - name: Set instance variables
         run: |
           echo "SERVER_ADDRESS=${{ steps.create-test-instance.outputs.server_address }}" >> "$GITHUB_ENV"
@@ -339,7 +341,7 @@ jobs:
           
           echo "Run integration tests"
           ssh -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null" "root@${SERVER_ADDRESS}" cat /usr/local/etc/instance.cfg
-          test-ncp-instance -a -f "$SNAPSHOT_ID" -b "${VERSION}" --systemtest-args "--skip-update-test" --nc-test-args "--skip-release-check" "root@${SERVER_ADDRESS}" "localhost" "8443" "9443" || {
+          test-ncp-instance -a -f "$SNAPSHOT_ID" -b "v1.54.3" --systemtest-args "--skip-update-test" --nc-test-args "--skip-release-check" "root@${SERVER_ADDRESS}" "localhost" "8443" "9443" || {
           
             echo "Integration tests failed"
             echo "Here are the last lines of ncp-install.log:"
@@ -385,7 +387,7 @@ jobs:
           NC_TEST_ARGS=()
           ssh "${SSH_OPTIONS[@]}" "root@${SERVER_ADDRESS}" cat /etc/os-release | grep VERSION_ID=12 || NC_TEST_ARGS+=("--skip-release-check")
           set -x
-          test-ncp-instance -f "$SNAPSHOT_ID" -b "${VERSION}" --nc-test-args "$NC_TEST_ARGS" --systemtest-args "--skip-update-test" "root@${SERVER_ADDRESS}" "localhost" "8443" "9443" || {
+          test-ncp-instance -f "$SNAPSHOT_ID" -b "v1.54.3" --nc-test-args "$NC_TEST_ARGS" --systemtest-args "--skip-update-test" "root@${SERVER_ADDRESS}" "localhost" "8443" "9443" || {
           
             echo "Integration tests failed"
             echo "Here are the last lines of ncp-install.log:"
@@ -418,6 +420,45 @@ jobs:
           }
           ssh "${SSH_OPTIONS[@]}" "root@${SERVER_ADDRESS}" DEBIAN_FRONTEND=noninteractive ncp-dist-upgrade
           echo "skipped=no" | tee -a $GITHUB_OUTPUT
+      - name: Update Nextcloud
+        working-directory: /__w/nextcloudpi/nextcloudpi/ncp-test-automation/bin
+        run: |
+          set -ex
+          apk add jq
+          
+          echo "Setup ssh"
+          eval "$(ssh-agent)"
+          ssh-add /__w/nextcloudpi/nextcloudpi/.ssh/automation_ssh_key
+          
+          source ./library.sh
+          
+          current_nc_version="$(ssh "${SSH_OPTIONS[@]}" "root@${SERVER_ADDRESS}" "ncc status" | grep "version:" | awk '{ print $3 }')"
+          latest_nc_version="$(cat ../../etc/ncp.cfg | jq -r '.nextcloud_version')"
+          
+          if [[ "$current_nc_version" =~ "$latest_nc_version".* ]]
+          then
+            echo "Nextcloud is up to date - skipping NC update test."
+          else
+            for i in {1..10};
+            do
+              echo "running nc update ($i/10)..."
+              ssh "${SSH_OPTIONS[@]}" "root@${SERVER_ADDRESS}" "bash -c 'DBG=x ncp-update-nc ${latest_nc_version?}'"
+          
+              ssh "${SSH_OPTIONS[@]}" "root@${SERVER_ADDRESS}" /usr/local/bin/ncc status
+          
+              current_nc_version_new="$(ssh "${SSH_OPTIONS[@]}" "root@${SERVER_ADDRESS}" "ncc status" | grep "version:" | awk '{ print $3 }')"
+              if [[ "$current_nc_version_new" =~ "$latest_nc_version".* ]]
+              then
+                break
+              fi
+              if [[ "$current_nc_version" == "$current_nc_version_new" ]]
+              then
+                echo "failed to update to $latest_nc_version"
+                exit 1
+              fi
+              current_nc_version="$current_nc_version_new"
+            done
+          fi
 
       - name: Run integration tests after dist-upgrade
         id: final_test
@@ -473,7 +514,7 @@ jobs:
       UID: ${{ github.run_id }}-install
     steps:
       - name: download ssh private key from artifact store
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         if: ${{ contains('success|failure', env.TEST_RESULT) }}
         with:
           name: ${{ env.SSH_ARTIFACT_NAME }}
@@ -580,7 +621,7 @@ jobs:
       SSH_ARTIFACT_NAME: "${{ needs.dist-upgrade-test.outputs.ssh_artifact_name }}"
     steps:
       - name: download ssh private key from artifact store
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         if: ${{ contains('success|failure', env.TEST_RESULT) }}
         with:
           name: ${{ env.SSH_ARTIFACT_NAME }}

README.md

@@ -27,23 +27,21 @@ Please reach out in the [Matrix][chat-matrix-wiki] or [Telegram][chat-telegram-w
 
 ---
 
+### Test Status
+
 `master`
 
-[![VM Tests][vm-tests-badge]][vm-tests]
-
-[![Docker Tests][docker-tests-badge]][docker-tests]
+[![Release](https://github.com/nextcloud/nextcloudpi/actions/workflows/release.yml/badge.svg)](https://github.com/nextcloud/nextcloudpi/actions/workflows/release.yml)
 
 `devel`
 
-[![VM Tests][gh-vm-tests-badge-devel]][vm-tests]
-
-[![Docker Tests][gh-docker-tests-badge-devel]][docker-tests]
+[![Release](https://github.com/nextcloud/nextcloudpi/actions/workflows/release.yml/badge.svg?branch=devel)](https://github.com/nextcloud/nextcloudpi/actions/workflows/release.yml)
 
 ---
 
 ## Features
 
- * Raspberry Pi OS/Debian 11 _(Bullseye)_
+ * Raspberry Pi OS/Debian 12 _(Bookworm)_
  * Nextcloud
  * Apache, with HTTP2 enabled
  * PHP 8.1
@@ -127,19 +125,35 @@ lxc start ncp
 
 ## Run in Proxmox
 
-Use the [install script][ncp-proxmox-install-script-v5] from [tteck][tteck-profile] to install the LXC container on your Proxmox instance
+There are two ways to run NCP on Proxmox:
 
-He has multiple helper scripts available for Proxmox on his [website][website-helper-scripts], do go have a look if you're using Proxmox. :+1:
+### 1. Using the official release image
 
-Installation: `bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/nextcloudpi-v5.sh)"`
+In your Proxmox web interface, head to any storage pool that has CT Templates enabled, go to CT Templates, 
+click "Download from URL" and enter the link to the latest LXC image from the [Nextcloudpi releases page](https://github.com/nextcloud/nextcloudpi/releases)
+and press "Download".
+
+<img height="300" alt="Download from URL dialog" src="https://nextcloudpi.com/images/ncp-proxmox-download-screenshot.png">
+
+Optionally, you can copy the corresponding md5 sum from the releases page and paste it in the "Checksum" field to have
+Proxmox check that the downloaded image was not corrupted
+
+### 2. Installer by community-scripts (formerly tteck)
+
+Use the [install script][ncp-proxmox-install-script-v5] from [community-scripts][community-scripts-profile] to install the LXC container on your Proxmox instance
+
+[community-scripts][community-scripts-profile] has multiple helper scripts available for Proxmox on their [website][website-helper-scripts], go have a look if you're using Proxmox. :+1:
+
+
+Installation: `bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/nextcloudpi.sh)"`
 
 Default Settings: `2GB RAM - 8GB Storage - 2vCPU`
 
-_(Check his [website][website-helper-scripts] if this has changed and we haven't had the time to update it here yet, it's located under: Media - Photo > NextcloudPi LXC)_
+_(Check their [website][website-helper-scripts] if this has changed and we haven't had the time to update it here yet, it's located under: Operating-Systems > NextcloudPi LXC)_
 
-Thenk you [tteck][tteck-profile] :heart: for making the helper script & letting us use this for Proxmox installations :pray:
+Thank you to the [community-scripts][community-scripts-profile] organisation :heart: for making the helper script & letting us use this for Proxmox installations :pray:
 
-You can find his GitHub repository with his helper scripts [here][gh-helper-scripts-repo].
+You can find the GitHub repository with the helper scripts here: [here][gh-helper-scripts-repo].
 
 ## How to build
 
@@ -280,15 +294,15 @@ You can find us on the [Forum][nc-forum], [Telegram][chat-telegram] or [Matrix][
 
 [nc-badge]: https://img.shields.io/badge/Nextcloud-0082C9?style=for-the-badge&logo=Nextcloud&logoColor=white
 
-<!-- TTECK -->
+<!-- COMMUNITY-SCRIPTS -->
 
-[tteck-profile]: https://github.com/tteck
+[community-scripts-profile]: https://github.com/community-scripts/
 
-[gh-helper-scripts-repo]: https://github.com/tteck/Proxmox
+[gh-helper-scripts-repo]: https://github.com/community-scripts/ProxmoxVE
 
-[website-helper-scripts]: https://tteck.github.io/Proxmox/
+[website-helper-scripts]: https://community-scripts.github.io/ProxmoxVE/
 
-[ncp-proxmox-install-script-v5]: https://github.com/tteck/Proxmox/blob/main/install/nextcloudpi-v5-install.sh
+[ncp-proxmox-install-script-v5]: https://github.com/community-scripts/ProxmoxVE/blob/main/install/nextcloudpi-install.sh
 
 <!-- IMAGES -->
 

bin/ncp-check-nc-version

@@ -7,8 +7,11 @@ set -e
 source /usr/local/etc/library.sh # sets NCLATESTVER
 
 CURRENT="$(nc_version)"
-NEXT_VERSION="$(determine_nc_upgrade_version "${CURRENT}" "${NCLATESTVER?}")"
-[[ -n "$NEXT_VERSION" ]] || exit 0
+NEXT_VERSION="$(determine_nc_update_version "${CURRENT}" "${NCLATESTVER?}")"
+if [[ -z "$NEXT_VERSION" ]] || [[ "$NEXT_VERSION" == "${CURRENT}" ]]
+then
+  exit 0
+fi
 
 NOTIFIED=/var/run/.nc-version-notified
 

bin/ncp-provisioning.sh

@@ -82,5 +82,13 @@ EOF
   cat /usr/local/etc/instance.cfg
 }
 
+systemctl is-enabled -q nextcloud-ai-worker@1.service || {
+  max="$(nproc || echo '2')"
+  max="$((max-1))"
+  for i in $(seq 1 "$max")
+  do
+    systemctl enable --now "nextcloud-ai-worker@${i}.service"
+  done
+}
 
 exit 0

bin/ncp-update-nc

@@ -19,289 +19,50 @@
 
 set -eE${DBG}
 
-VER="$1"
 BIN="${0##*/}"
-
-source /usr/local/etc/library.sh
-
-# pre-checks
-####################
+VER="$1"
 [[ "$VER" == "" ]] && { echo "Usage ${BIN} <version>"; exit 1; }
-[[ -f /.docker-image ]] && BASEDIR=/data || BASEDIR=/var/www
-cd "$BASEDIR"
-DATADIR="$( get_nc_config_value datadirectory )"
-ncc status &>/dev/null          || { [[ "$DBG" == x ]] && ncc status; echo "Nextcloud is currently down"; exit 1; }
-[[ -d "${BASEDIR}/nextcloud-old" ]] && { echo "Nextcloud backup directory found. Interrupted or already running installation?"; exit 1; }
-[[ -d "${BASEDIR}/nextcloud"     ]] || { echo "Nextcloud directory not found"      ; exit 1; }
-[[ -d "$DATADIR"             ]] || { echo "Nextcloud data directory not found" ; exit 1; }
 
-# check version
-####################
+connect_to_nc_update() {
+  tail -n 100 -f "/var/log/ncp-update-nc.log" &
+  tail_pid=$!
+  trap "kill '$tail_pid'" EXIT
+  while [[ "$(systemctl is-active ncp-update-nc ||:)" =~ ^(active|activating|deactivating)$ ]]
+  do
+    sleep 3
+  done
 
-[[ ${EUID} -eq 0 ]] && SUDO="sudo -u www-data"
-CURRENT="$(nc_version)"
-TARGET_VERSION="$(determine_nc_upgrade_version "${CURRENT?}" "${VER?}")"
-[[ -n "$TARGET_VERSION" ]] || {
-  echo "Could not find a valid upgrade path from '${CURRENT}' to '${TARGET_VERSION}'. Nothing to update."
-  exit 1
-}
-
-MAJOR_NEW="${TARGET_VERSION%%.*}"
-
-if [[ "$MAJOR_NEW" -ge 24 ]] && [[ "$(lsb_release -r)" =~ .*10 ]]
-then
-  echo -e "NCP doesn't support Nextcloud versions greater than 23 with Debian 10 (Buster). Please run ncp-dist-upgrade."
-  exit 1
-fi
-
-grep -qP "\d+\.\d+\.\d+" <<<"$CURRENT" || { echo "Malformed version $CURRENT"; exit 1; }
-grep -qP "\d+\.\d+\.\d+" <<<"$TARGET_VERSION"   || { echo "Malformed version $TARGET_VERSION"    ; exit 1; }
-
-echo "Current   Nextcloud version $CURRENT"
-echo "Available Nextcloud version $TARGET_VERSION"
-
-# make sure that cron.php is not running and there are no pending jobs
-# https://github.com/nextcloud/server/issues/10949
-pgrep -cf cron.php &>/dev/null && { pkill -f cron.php; sleep 3; }
-pgrep -cf cron.php &>/dev/null && { echo "cron.php running. Abort"; exit 1; }
-mysql nextcloud <<<"UPDATE ${DB_PREFIX}jobs SET reserved_at=0;"
-
-# cleanup
-####################
-cleanup() {
-  local RET=$?
-  set +eE
-  echo "Clean up..."
-  rm -rf "$BASEDIR"/nextcloud.tar.bz2 "$BASEDIR"/nextcloud-old
-  trap "" EXIT
-  exit $RET
-}
-trap cleanup EXIT
-
-# get new code
-####################
-URL="https://download.nextcloud.com/server/releases/nextcloud-$TARGET_VERSION.tar.bz2"
-echo "Download Nextcloud $TARGET_VERSION..."
-wget -q "$URL" -O nextcloud.tar.bz2 || { echo "Error downloading"; exit 1; }
-
-# backup
-####################
-BKPDIR="$BASEDIR"
-WITH_DATA=no
-COMPRESSED=yes
-LIMIT=0
-
-echo "Back up current instance..."
-set +eE
-ncp-backup "$BKPDIR" "$WITH_DATA" "$COMPRESSED" "$LIMIT" # && false # test point
-RET=$?
-sync
-set -eE
-
-BKP_="$( ls -1t "$BKPDIR"/nextcloud-bkp_*.tar.gz 2>/dev/null | head -1 )"
-[[ -f "$BKP_"  ]] || {                set +eE; echo "Error backing up"; false || cleanup; }
-[[ $RET -ne 0  ]] && { rm -f "$BKP_"; set +eE; echo "Error backing up"; false || cleanup; }
-BKP="$( dirname "$BKP_" )/$( basename "$BKP_" .tar.gz )-${CURRENT}.tar.gz"
-echo "Storing backup at '$BKP'..."
-mv "$BKP_" "$BKP"
-
-# simple restore if anything fails from here
-####################
-rollback_simple() {
-  set +eE
-  trap "" INT TERM HUP ERR
-  echo -e "Abort\nSimple roll back..."
-  rm -rf "$BASEDIR"/nextcloud
-  mv "$BASEDIR"/nextcloud-old "$BASEDIR"/nextcloud
-  false || cleanup                 # so cleanup exits with 1
-}
-trap rollback_simple INT TERM HUP ERR
-
-# replace code
-####################
-echo "Install Nextcloud $TARGET_VERSION..."
-mv -T nextcloud nextcloud-old
-tar -xf nextcloud.tar.bz2             # && false # test point
-rm -rf /var/www/nextcloud.tar.bz2
-
-# copy old config
-####################
-cp nextcloud-old/config/config.php nextcloud/config/
-
-# copy old themes
-####################
-cp -raT nextcloud-old/themes/ nextcloud/themes/
-
-# copy old NCP apps
-####################
-for app in nextcloudpi previewgenerator; do
-  if [[ -d nextcloud-old/apps/"${app}" ]]; then
-    cp -r -L nextcloud-old/apps/"${app}" /var/www/nextcloud/apps/
+  if [[ "$(systemctl is-active ncp-update-nc ||:)" == "inactive" ]]
+  then
+    echo "Nextcloud update finished successfully."
+    return 0
+  elif [[ "$(systemctl is-active ncp-update-nc ||:)" == "failed" ]]
+  then
+    echo "Nextcloud update failed (or was installed already)."
+    return 1
+  else
+    echo "Nextcloud update was not found or failed (unexpected status: '$(systemctl is-active ncp-update-nc ||:)')"
   fi
-done
-
-#false # test point
-
-# copy data if it was at the default location
-####################
-if [[ "$DATADIR" == "/var/www/nextcloud/data" ]] || [[ "$DATADIR" == "/data/nextcloud/data" ]]; then
-  echo "Restore data..."
-  mv -T nextcloud-old/data nextcloud/data
-fi
-
-# nc-restore if anything fails from here
-####################
-rollback() {
-  set +eE
-  trap "" INT TERM HUP ERR EXIT
-  echo -e "Abort\nClean up..."
-  rm -rf /var/www/nextcloud.tar.bz2 "$BASEDIR"/nextcloud-old
-  echo "Rolling back to backup $BKP..."
-  local TMPDATA
-  mkdir -p "$BASEDIR/recovery/"
-  TMPDATA="$( mktemp -d "$BASEDIR/recovery/ncp-data.XXXXXX" )" || { echo "Failed to create temp dir" >&2; exit 1; }
-  [[ "$DATADIR" == "$BASEDIR/nextcloud/data" ]] && mv -T "$DATADIR" "$TMPDATA"
-  ncp-restore "$BKP" || { echo "Rollback failed! Data left at $TMPDATA"; exit 1; }
-  [[ "$DATADIR" == "$BASEDIR/nextcloud/data" ]] && { rm -rf "$DATADIR"; mv -T "$TMPDATA" "$DATADIR"; }
-  rm "$BKP"
-  echo "Rollback successful. Nothing was updated"
-  exit 1
 }
-trap rollback INT TERM HUP ERR
 
-# fix permissions
-####################
-echo "Fix permissions..."
-chown -R www-data:www-data nextcloud
-find nextcloud/ -type d -exec chmod 750 {} \;
-find nextcloud/ -type f -exec chmod 640 {} \;
-
-# upgrade
-####################
-echo "Upgrade..."
-ncc='sudo -u www-data php nextcloud/occ'
-$ncc upgrade      # && false # test point
-$ncc | grep -q db:add-missing-indices && $ncc db:add-missing-indices -n
-$ncc | grep -q db:add-missing-columns && $ncc db:add-missing-columns -n
-$ncc | grep -q db:add-missing-primary-keys && $ncc db:add-missing-primary-keys -n
-$ncc | grep -q db:convert-filecache-bigint && $ncc db:convert-filecache-bigint -n
-
-# use the correct version for custom apps
-NCVER="$(nc_version)"
-if is_more_recent_than "21.0.0" "${NCVER}"; then
-  NCPREV=/var/www/ncp-previewgenerator/ncp-previewgenerator-nc20
-else
-  # Install notify_push if not installed
-  if ! is_app_enabled notify_push; then
-    ncc app:install notify_push
-    ncc app:enable  notify_push
-    install_template nextcloud.conf.sh /etc/apache2/sites-available/nextcloud.conf
-    a2enmod proxy proxy_http proxy_wstunnel
-    apachectl -k graceful
-    ## make sure the notify_push daemon is runnnig
-
-    install_template systemd/notify_push.service.sh /etc/systemd/system/notify_push.service
-    start_notify_push
-    nc_domain="$(ncc config:system:get overwrite.cli.url)"
-    set-nc-domain "${nc_domain}" || {
-      echo "notify_push setup failed. You are probably behind a proxy"
-      echo "Run 'ncc config:system:set trusted_proxies 15 --value=<proxy_IP>' and then 'ncc notify_push:setup https://<domain>/push to enable"
-      echo "Check https://help.nextcloud.com/tags/ncp for support"
-    }
-
-  fi
-  NCPREV=/var/www/ncp-previewgenerator/ncp-previewgenerator-nc21
-fi
-rm -rf /var/www/nextcloud/apps/previewgenerator
-ln -snf "${NCPREV}" /var/www/nextcloud/apps/previewgenerator
-
-if ! is_docker && ! is_more_recent_than "24.0.0" "${NCVER}" && is_more_recent_than "8.1.0" "${PHPVER}.0"
+if [[ "$(systemctl is-active ncp-update-nc ||:)" =~ ^(active|activating|deactivating)$ ]]
 then
-  (
-  echo "Upgrading PHP..."
-  export DEBIAN_FRONTEND=noninteractive
-  PHPVER_OLD="$PHPVER"
-  PHPVER_NEW="8.1"
-  PHP_PACKAGES_OLD=(php-{common,igbinary,redis,json} "php${PHPVER_OLD}" \
-    "php${PHPVER_OLD}"-{curl,gd,fpm,cli,opcache,mbstring,xml,zip,fileinfo,ldap,intl,bz2,json,common,readline,mysql,bcmath,gmp})
-  PHP_PACKAGES_NEW=("php${PHPVER_NEW}" \
-    "php${PHPVER_NEW}"-{curl,gd,fpm,cli,opcache,mbstring,xml,zip,fileinfo,ldap,intl,bz2,mysql,bcmath,gmp,redis,common})
-
-  php_restore() {
-    trap "" INT TERM HUP ERR
-    echo "Something went wrong while upgrading PHP. Rolling back to version ${PHPVER_OLD}..."
-    set +e
-    service "php${PHPVER_NEW}-fpm" stop
-    a2disconf php${PHPVER_NEW}-fpm
-    rm /etc/apt/sources.list.d/php.list
-    apt-get update
-    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"
-    run_app nc-limits
-    a2enconf "php${PHPVER_OLD}-fpm"
-    service "php${PHPVER_OLD}-fpm" start
-    service apache2 restart
-    echo "PHP upgrade has been successfully reverted"
-    set -e
-  }
-
-  trap php_restore INT TERM HUP ERR
-
-  # 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
-
-  clear_opcache
-
-  echo "Stopping apache and  php-fpm..."
-  service "php${PHPVER_OLD}-fpm" stop
-  service apache2 stop
-
-  echo "Remove old PHP (${PHPVER_OLD})..."
-  a2disconf "php${PHPVER_OLD}-fpm"
-
-  apt-get remove --purge -y "${PHP_PACKAGES_OLD[@]}"
-
-  echo "Install PHP ${PHPVER_NEW}..."
-  install_with_shadow_workaround --no-install-recommends systemd
-  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"
-  ( set -e; export PHPVER="${PHPVER_NEW}"; run_app nc-limits )
-
-  a2enconf "php${PHPVER_NEW}-fpm"
-
-  echo "Starting apache and php-fpm..."
-  service "php${PHPVER_NEW}-fpm" start
-  service apache2 start
-  ncc status
-  )
-
-  # Reload library.sh to reset PHPVER
-  source /usr/local/etc/library.sh
-
+  echo "Existing ncp-update-nc process detected. Connecting..."
+  connect_to_nc_update
+  exit $?
 fi
 
-# refresh completions
-ncc _completion -g --shell-type bash -p ncc | sed 's|/var/www/nextcloud/occ|ncc|g' > /usr/share/bash-completion/completions/ncp
+systemctl reset-failed ncp-update-nc 2>/dev/null ||:
+systemd-run -u 'ncp-update-nc' --service-type=oneshot --no-block -p TimeoutStartSec="24h" -p TimeoutStopSec="1h" \
+  bash -c "set -o pipefail; DBG='${DBG:-}' /usr/local/bin/ncp-update-nc.d/update-nc.sh '${VER}' |& tee /var/log/ncp-update-nc.log"
+sleep 1
 
-is_docker && {
-  killall notify_push
-  sleep 1
-  start_notify_push
-}
+if ! [[ "$(systemctl is-active ncp-update-nc ||:)" =~ ^(active|inactive|activating|deactivating)$ ]]
+then
+  echo "Failed to start ncp-update-nc"
+  [[ -f /var/log/ncp-update-nc.log ]] && cat /var/log/ncp-update-nc.log
+  systemctl status --no-pager ncp-update-nc ||:
+  exit 1
+fi
 
-echo "Update completed successfully."
-# done
-####################
-mkdir -p  "$DATADIR"/ncp-update-backups
-mv "$BKP" "$DATADIR"/ncp-update-backups
-chown -R www-data:www-data "$DATADIR"/ncp-update-backups
-BKP="$DATADIR"/ncp-update-backups/"$( basename "$BKP" )"
-echo "Backup stored at $BKP"
-
-bash -c "sleep 5; source /usr/local/etc/library.sh; clear_opcache;" &>/dev/null &
+connect_to_nc_update

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

@@ -0,0 +1,261 @@
+#!/bin/bash
+
+set -eE${DBG}
+
+VER="$1"
+source /usr/local/etc/library.sh
+export RELEASE
+export PHPVER
+
+# pre-checks
+####################
+BASEDIR=/var/www
+cd "$BASEDIR"
+DATADIR="$( get_nc_config_value datadirectory )"
+ncc status &>/dev/null          || { [[ "$DBG" == x ]] && ncc status; echo "Nextcloud is currently down"; exit 1; }
+[[ -d "${BASEDIR}/nextcloud-old" ]] && { echo "Nextcloud backup directory found. Interrupted or already running installation?"; exit 1; }
+[[ -d "${BASEDIR}/nextcloud"     ]] || { echo "Nextcloud directory not found"      ; exit 1; }
+[[ -d "$DATADIR"             ]] || { echo "Nextcloud data directory not found" ; exit 1; }
+
+# check version
+####################
+
+[[ ${EUID} -eq 0 ]] && SUDO="sudo -u www-data"
+CURRENT="$(nc_version)"
+if [[ "$VER" == "0" ]] || [[ "$VER" == "" ]]
+then
+  REQUESTED_VERSION="latest"
+else
+  REQUESTED_VERSION="$VER"
+fi
+TARGET_VERSION="$(determine_nc_update_version "${CURRENT?}" "${NCLATESTVER}" "${REQUESTED_VERSION}")"
+[[ "$TARGET_VERSION" == "$CURRENT" ]] && {
+  echo "Nextcloud version ${CURRENT} is already installed. Nothing to do."
+  exit 1
+}
+[[ -n "$TARGET_VERSION" ]] || {
+  echo "Could not find a valid upgrade path from '${CURRENT}' to '${TARGET_VERSION}'. Nothing to update."
+  exit 1
+}
+
+MAJOR_NEW="${TARGET_VERSION%%.*}"
+DEBIAN_VERSION="$(. /etc/os-release; echo "$VERSION_ID")"
+
+if [[ "$MAJOR_NEW" -ge 24 ]] && [[ $DEBIAN_VERSION -le 10 ]]
+then
+  echo -e "NCP doesn't support Nextcloud versions greater than 23 with Debian 10 (Buster). Please run ncp-dist-upgrade."
+  exit 1
+fi
+
+if [[ "$MAJOR_NEW" -ge 29 ]] && [[ $DEBIAN_VERSION -le 11 ]]
+then
+  echo -e "NCP doesn't support Nextcloud versions greater than 28 with Debian 11 (Bullseye). Please run ncp-dist-upgrade."
+  exit 1
+fi
+
+grep -qP "\d+\.\d+\.\d+" <<<"$CURRENT" || { echo "Malformed version $CURRENT"; exit 1; }
+grep -qP "\d+\.\d+\.\d+" <<<"$TARGET_VERSION"   || { echo "Malformed version $TARGET_VERSION"    ; exit 1; }
+
+echo "Current   Nextcloud version $CURRENT"
+echo "Requested Nextcloud version $REQUESTED_VERSION"
+echo "Selected  Nextcloud version $TARGET_VERSION"
+
+if [[ "$REQUESTED_VERSION" == "latest" ]]
+then
+  echo "INFO: You have requested an update to the latest available version that can be performed directly, which is '${TARGET_VERSION}'. Updates can only performed to the next major version (or the latest minor version of the current major version). If you run ncp-update-nc again after this update completes, a new version might be available."
+  sleep 3
+elif [[ "$TARGET_VERSION" != "$REQUESTED_VERSION" ]]
+then
+  echo "INFO: You have requested an update to '${REQUESTED_VERSION}', but a direct update to '${REQUESTED_VERSION}' cannot be performed, so the latest available version that can be updated to (${TARGET_VERSION}) has been selected automatically."
+  sleep 3
+fi
+
+# make sure that cron.php is not running and there are no pending jobs
+# https://github.com/nextcloud/server/issues/10949
+pgrep -cf cron.php &>/dev/null && { pkill -f cron.php; sleep 3; }
+pgrep -cf cron.php &>/dev/null && { echo "cron.php running. Abort"; exit 1; }
+mysql nextcloud <<<"UPDATE ${DB_PREFIX}jobs SET reserved_at=0;"
+
+# cleanup
+####################
+cleanup() {
+  local RET=$?
+  set +eE
+  echo "Clean up..."
+  rm -rf "$BASEDIR"/nextcloud.tar.bz2 "$BASEDIR"/nextcloud-old
+  trap "" EXIT
+  exit $RET
+}
+trap cleanup EXIT
+
+# get new code
+####################
+URL="https://download.nextcloud.com/server/releases/nextcloud-$TARGET_VERSION.tar.bz2"
+echo "Download Nextcloud $TARGET_VERSION..."
+wget -q "$URL" -O nextcloud.tar.bz2 || { echo "Error downloading"; exit 1; }
+
+# backup
+####################
+BKPDIR="$BASEDIR"
+WITH_DATA=no
+COMPRESSED=yes
+LIMIT=0
+
+echo "Back up current instance..."
+set +eE
+ncp-backup "$BKPDIR" "$WITH_DATA" "$COMPRESSED" "$LIMIT" # && false # test point
+RET=$?
+sync
+set -eE
+
+BKP_="$( ls -1t "$BKPDIR"/nextcloud-bkp_*.tar.gz 2>/dev/null | head -1 )"
+[[ -f "$BKP_"  ]] || {                set +eE; echo "Error backing up"; false || cleanup; }
+[[ $RET -ne 0  ]] && { rm -f "$BKP_"; set +eE; echo "Error backing up"; false || cleanup; }
+BKP="$( dirname "$BKP_" )/$( basename "$BKP_" .tar.gz )-${CURRENT}.tar.gz"
+echo "Storing backup at '$BKP'..."
+mv "$BKP_" "$BKP"
+
+# simple restore if anything fails from here
+####################
+rollback_simple() {
+  set +eE
+  trap "" INT TERM HUP ERR
+  echo -e "Abort\nSimple roll back..."
+  rm -rf "$BASEDIR"/nextcloud
+  mv "$BASEDIR"/nextcloud-old "$BASEDIR"/nextcloud
+  false || cleanup                 # so cleanup exits with 1
+}
+trap rollback_simple INT TERM HUP ERR
+
+# replace code
+####################
+echo "Install Nextcloud $TARGET_VERSION..."
+mv -T nextcloud nextcloud-old
+tar -xf nextcloud.tar.bz2             # && false # test point
+rm -rf /var/www/nextcloud.tar.bz2
+
+# copy old config
+####################
+cp nextcloud-old/config/config.php nextcloud/config/
+
+# copy old themes
+####################
+cp -raT nextcloud-old/themes/ nextcloud/themes/
+
+# copy old NC apps
+####################
+for app in nextcloud-old/apps/*; do
+  if ! [[ -d /var/www/nextcloud/apps/"$(basename "$app")" ]]
+  then
+    cp -r -L "${app}" /var/www/nextcloud/apps/
+  fi
+done
+
+#false # test point
+
+# copy data if it was at the default location
+####################
+if [[ "$DATADIR" == "/var/www/nextcloud/data" ]] || [[ "$DATADIR" == "/data/nextcloud/data" ]]; then
+  echo "Restore data..."
+  mv -T nextcloud-old/data nextcloud/data
+fi
+
+# nc-restore if anything fails from here
+####################
+rollback() {
+  set +eE
+  trap "" INT TERM HUP ERR EXIT
+  echo -e "Abort\nClean up..."
+  rm -rf /var/www/nextcloud.tar.bz2 "$BASEDIR"/nextcloud-old
+  echo "Rolling back to backup $BKP..."
+  local TMPDATA
+  mkdir -p "$BASEDIR/recovery/"
+  TMPDATA="$( mktemp -d "$BASEDIR/recovery/ncp-data.XXXXXX" )" || { echo "Failed to create temp dir" >&2; exit 1; }
+  [[ "$DATADIR" == "$BASEDIR/nextcloud/data" ]] && mv -T "$DATADIR" "$TMPDATA"
+  ncp-restore "$BKP" || { echo "Rollback failed! Data left at $TMPDATA"; exit 1; }
+  [[ "$DATADIR" == "$BASEDIR/nextcloud/data" ]] && { rm -rf "$DATADIR"; mv -T "$TMPDATA" "$DATADIR"; }
+  rm "$BKP"
+  echo "Rollback successful. Nothing was updated"
+  exit 1
+}
+trap rollback INT TERM HUP ERR
+
+# fix permissions
+####################
+echo "Fix permissions..."
+chown -R www-data:www-data nextcloud
+find nextcloud/ -type d -exec chmod 750 {} \;
+find nextcloud/ -type f -exec chmod 640 {} \;
+
+# upgrade
+####################
+echo "Upgrade..."
+ncc='sudo -u www-data php nextcloud/occ'
+$ncc upgrade      # && false # test point
+$ncc | grep -q db:add-missing-indices && $ncc db:add-missing-indices -n
+$ncc | grep -q db:add-missing-columns && $ncc db:add-missing-columns -n
+$ncc | grep -q db:add-missing-primary-keys && $ncc db:add-missing-primary-keys -n
+$ncc | grep -q db:convert-filecache-bigint && $ncc db:convert-filecache-bigint -n
+$ncc | grep -q db:convert-mysql-charset && $ncc db:convert-mysql-charset -n
+$ncc maintenance:repair --help | grep -q -e '--include-expensive' && $ncc maintenance:repair --include-expensive
+if $ncc app_api:daemon:list | grep 'No registered daemon configs.' > /dev/null 2>&1
+then
+  $ncc app:disable app_api
+fi
+
+# use the correct version for custom apps
+NCVER="$(nc_version)"
+if is_more_recent_than "21.0.0" "${NCVER}"; then
+  NCPREV=/var/www/ncp-previewgenerator/ncp-previewgenerator-nc20
+else
+  # Install notify_push if not installed
+  if ! is_app_enabled notify_push; then
+    ncc app:install notify_push
+    ncc app:enable  notify_push
+    install_template nextcloud.conf.sh /etc/apache2/sites-available/nextcloud.conf
+    a2enmod proxy proxy_http proxy_wstunnel
+    apachectl -k graceful
+    ## make sure the notify_push daemon is runnnig
+
+    install_template systemd/notify_push.service.sh /etc/systemd/system/notify_push.service
+    start_notify_push
+    nc_domain="$(ncc config:system:get overwrite.cli.url)"
+    set-nc-domain "${nc_domain}" || {
+      echo "notify_push setup failed. You are probably behind a proxy"
+      echo "Run 'ncc config:system:set trusted_proxies 15 --value=<proxy_IP>' and then 'ncc notify_push:setup https://<domain>/push to enable"
+      echo "Check https://help.nextcloud.com/tags/ncp for support"
+    }
+
+  fi
+  NCPREV=/var/www/ncp-previewgenerator/ncp-previewgenerator-nc21
+fi
+rm -rf /var/www/nextcloud/apps/previewgenerator
+ln -snf "${NCPREV}" /var/www/nextcloud/apps/previewgenerator
+
+if ! is_more_recent_than "24.0.0" "${NCVER}" && is_more_recent_than "8.1.0" "${PHPVER}.0"
+then
+  /usr/local/bin/ncp-update-nc.d/upgrade-php-bullseye-8.1.sh
+
+  # 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 ]]
+then
+  /usr/local/bin/ncp-update-nc.d/upgrade-php-bookworm-8.3.sh
+
+  # Reload library.sh to reset PHPVER
+  source /usr/local/etc/library.sh
+fi
+
+# refresh completions
+ncc _completion -g --shell-type bash -p ncc | sed 's|/var/www/nextcloud/occ|ncc|g' > /usr/share/bash-completion/completions/ncp
+
+echo "Update completed successfully."
+# done
+####################
+mkdir -p  "$DATADIR"/ncp-update-backups
+mv "$BKP" "$DATADIR"/ncp-update-backups
+chown -R www-data:www-data "$DATADIR"/ncp-update-backups
+BKP="$DATADIR"/ncp-update-backups/"$( basename "$BKP" )"
+echo "Backup stored at $BKP"
+
+bash -c "sleep 5; source /usr/local/etc/library.sh; clear_opcache;" &>/dev/null &

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

@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+
+source /usr/local/etc/library.sh
+
+echo "Upgrading PHP..."
+export DEBIAN_FRONTEND=noninteractive
+PHPVER_OLD="$PHPVER"
+PHPVER_NEW="8.3"
+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}" \
+  "php${PHPVER_NEW}"-{curl,gd,fpm,cli,opcache,mbstring,xml,zip,fileinfo,ldap,intl,bz2,mysql,bcmath,gmp,redis,common})
+
+php_restore() {
+  trap "" INT TERM HUP ERR
+  echo "Something went wrong while upgrading PHP. Rolling back to version ${PHPVER_OLD}..."
+  set +e
+  service "php${PHPVER_NEW}-fpm" stop
+  a2disconf php${PHPVER_NEW}-fpm
+  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
+  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"
+  run_app nc-limits
+  a2enconf "php${PHPVER_OLD}-fpm"
+  service "php${PHPVER_OLD}-fpm" start
+  service apache2 restart
+  echo "PHP upgrade has been successfully reverted"
+  set -e
+}
+
+trap php_restore INT TERM HUP ERR
+
+apt-get update
+
+clear_opcache
+
+echo "Stopping apache and  php-fpm..."
+service "php${PHPVER_OLD}-fpm" stop
+service apache2 stop
+
+echo "Remove old PHP (${PHPVER_OLD})..."
+a2disconf "php${PHPVER_OLD}-fpm"
+
+apt-get remove --purge -y "${PHP_PACKAGES_OLD[@]}"
+
+echo "Install PHP ${PHPVER_NEW}..."
+install_with_shadow_workaround --no-install-recommends systemd
+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"
+( set -e; export PHPVER="${PHPVER_NEW}"; run_app nc-limits )
+
+a2enconf "php${PHPVER_NEW}-fpm"
+
+[[ -f "/etc/systemd/system/php${PHPVER_OLD}-fpm.service.d/ncp.conf" ]] && {
+  mkdir -p "/etc/systemd/system/php${PHPVER_NEW}-fpm.service.d"
+  cp "/etc/systemd/system/php${PHPVER_OLD}-fpm.service.d/ncp.conf" "/etc/systemd/system/php${PHPVER_NEW}-fpm.service.d/ncp.conf"
+}
+
+echo "Starting apache and php-fpm..."
+service "php${PHPVER_NEW}-fpm" start
+service apache2 start
+ncc status

bin/ncp-update-nc.d/upgrade-php-bullseye-8.1.sh

@@ -0,0 +1,65 @@
+#!/usr/bin/env bash
+
+source /usr/local/etc/library.sh
+
+echo "Upgrading PHP..."
+export DEBIAN_FRONTEND=noninteractive
+PHPVER_OLD="$PHPVER"
+PHPVER_NEW="8.1"
+PHP_PACKAGES_OLD=(php-{common,igbinary,redis,json} "php${PHPVER_OLD}" \
+  "php${PHPVER_OLD}"-{curl,gd,fpm,cli,opcache,mbstring,xml,zip,fileinfo,ldap,intl,bz2,json,common,readline,mysql,bcmath,gmp})
+PHP_PACKAGES_NEW=("php${PHPVER_NEW}" \
+  "php${PHPVER_NEW}"-{curl,gd,fpm,cli,opcache,mbstring,xml,zip,fileinfo,ldap,intl,bz2,mysql,bcmath,gmp,redis,common})
+
+php_restore() {
+  trap "" INT TERM HUP ERR
+  echo "Something went wrong while upgrading PHP. Rolling back to version ${PHPVER_OLD}..."
+  set +e
+  service "php${PHPVER_NEW}-fpm" stop
+  a2disconf php${PHPVER_NEW}-fpm
+  rm /etc/apt/sources.list.d/php.list
+  apt-get update
+  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"
+  run_app nc-limits
+  a2enconf "php${PHPVER_OLD}-fpm"
+  service "php${PHPVER_OLD}-fpm" start
+  service apache2 restart
+  echo "PHP upgrade has been successfully reverted"
+  set -e
+}
+
+trap php_restore INT TERM HUP ERR
+
+# 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
+
+clear_opcache
+
+echo "Stopping apache and  php-fpm..."
+service "php${PHPVER_OLD}-fpm" stop
+service apache2 stop
+
+echo "Remove old PHP (${PHPVER_OLD})..."
+a2disconf "php${PHPVER_OLD}-fpm"
+
+apt-get remove --purge -y "${PHP_PACKAGES_OLD[@]}"
+
+echo "Install PHP ${PHPVER_NEW}..."
+install_with_shadow_workaround --no-install-recommends systemd
+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"
+( set -e; export PHPVER="${PHPVER_NEW}"; run_app nc-limits )
+
+a2enconf "php${PHPVER_NEW}-fpm"
+
+echo "Starting apache and php-fpm..."
+service "php${PHPVER_NEW}-fpm" start
+service apache2 start
+ncc status

bin/ncp/CONFIG/nc-datadir.sh

@@ -103,7 +103,7 @@ configure()
   cd /var/www/nextcloud
   [[ "$BUILD_MODE" == 1 ]] || save_maintenance_mode
 
-  echo "moving data directory from ${SRCDIR} to ${BASEDIR}..."
+  echo "moving data directory from ${SRCDIR} to ${DATADIR}..."
 
   # use subvolumes, if BTRFS
   [[ "$(stat -fc%T "${BASEDIR}")" == "btrfs" ]] && ! is_docker && {
@@ -135,7 +135,7 @@ configure()
   create_tmp_upload_dir
   ncc config:system:set tempdirectory --value "$DATADIR/tmp" \
   || sed -i "s|'tempdirectory' =>.*|'tempdirectory' => '${DATADIR}/tmp',|" "${NCDIR?}"/config/config.php
-  sed -i "s|^;\?upload_tmp_dir =.*$|uploadtmp_dir = ${DATADIR}/tmp|"  /etc/php/"${PHPVER?}"/cli/php.ini
+  sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = ${DATADIR}/tmp|"  /etc/php/"${PHPVER?}"/cli/php.ini
   sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = ${DATADIR}/tmp|" /etc/php/"${PHPVER}"/fpm/php.ini
   sed -i "s|^;\?sys_temp_dir =.*$|sys_temp_dir = ${DATADIR}/tmp|"     /etc/php/"${PHPVER}"/fpm/php.ini
 

bin/ncp/CONFIG/nc-init.sh

@@ -53,10 +53,29 @@ EOF
   ## INITIALIZE NEXTCLOUD
 
   # make sure redis is running first
+  REDISPASS="$( grep "^requirepass" /etc/redis/redis.conf | cut -f2 -d' ' )"
   if ! pgrep -c redis-server &>/dev/null; then
     mkdir -p /var/run/redis
+    mkdir -p /var/log/
     chown redis /var/run/redis
-    sudo -u redis redis-server /etc/redis/redis.conf &
+    sudo -u redis redis-server /etc/redis/redis.conf > /var/log/redis.log 2>&1 &
+    redis_pid=$!
+    for i in {1..5}
+    do
+
+      if redis-cli -s //var/run/redis/redis.sock -a "$REDISPASS" ping | grep PONG
+      then
+        break
+      else
+        if [[ $i -ge 5 ]]
+        then
+          echo "FAILED TO START REDIS"
+          cat /var/log/redis.log /var/log/redis/redis-server.log
+          return 1
+        fi
+      fi
+      sleep 3
+    done
   fi
 
   while :; do
@@ -127,11 +146,11 @@ EOF
   }
 
   mysql nextcloud <<EOF
-replace into  ${DB_PREFIX}appconfig values ( 'theming', 'name'          , "NextCloudPi"             , 2, null);
-replace into  ${DB_PREFIX}appconfig values ( 'theming', 'slogan'        , "keep your data close"    , 2, null);
-replace into  ${DB_PREFIX}appconfig values ( 'theming', 'url'           , "https://nextcloudpi.com" , 2, null);
-replace into  ${DB_PREFIX}appconfig values ( 'theming', 'logoMime'      , "image/svg+xml"           , 2, null);
-replace into  ${DB_PREFIX}appconfig values ( 'theming', 'backgroundMime', "image/png"               , 2, null);
+replace into  ${DB_PREFIX}appconfig values ( 'theming', 'name'          , "NextCloudPi"             , 2, 0);
+replace into  ${DB_PREFIX}appconfig values ( 'theming', 'slogan'        , "keep your data close"    , 2, 0);
+replace into  ${DB_PREFIX}appconfig values ( 'theming', 'url'           , "https://nextcloudpi.com" , 2, 0);
+replace into  ${DB_PREFIX}appconfig values ( 'theming', 'logoMime'      , "image/svg+xml"           , 2, 0);
+replace into  ${DB_PREFIX}appconfig values ( 'theming', 'backgroundMime', "image/png"               , 2, 0);
 EOF
 
   # NCP app
@@ -152,6 +171,9 @@ EOF
   # we handle this ourselves
   ncc app:disable updatenotification
 
+  # Not supported in Nextcloudpi without manual setup
+  ncc app:disable app_api
+
   # ncp-previewgenerator
   local ncver
   ncver="$(ncc status 2>/dev/null | grep "version:" | awk '{ print $3 }')"
@@ -189,6 +211,7 @@ EOF
   # TODO temporary workaround for https://github.com/nextcloud/server/pull/13358
   ncc -n db:convert-filecache-bigint
   ncc db:add-missing-indices
+  ncc maintenance:repair --include-expensive
 
   # Default trusted domain (only from ncp-config)
   test -f /usr/local/bin/nextcloud-domain.sh && {

bin/ncp/CONFIG/nc-limits.sh

@@ -82,14 +82,14 @@ configure()
   [[ "$CONF_VALUE" == "$(cat "$CONF")" ]] || service mariadb restart
 
   # RESTART PHP
-  [[ "$require_fpm_restart" == "true" ]] && {
+  [[ "$require_fpm_restart" != "true" ]] || {
     bash -c "sleep 3; source /usr/local/etc/library.sh; clear_opcache; service php${PHPVER}-fpm restart" &>/dev/null &
   }
 
   # redis max memory
   local CONF=/etc/redis/redis.conf
   local CURRENT_REDIS_MEM="$( grep "^maxmemory" "$CONF" | awk '{ print $2 }' )"
-  [[ "$REDISMEM" != "$CURRENT_REDIS_MEM" ]] && {
+  [[ "$REDISMEM" == "$CURRENT_REDIS_MEM" ]] || {
     sed -i "s|^maxmemory .*|maxmemory $REDISMEM|" "$CONF"
     chown redis:redis "$CONF"
     service redis-server restart

bin/ncp/CONFIG/nc-nextcloud.sh

@@ -60,6 +60,10 @@ install()
   sed -i 's|# rename-command CONFIG ""|rename-command CONFIG ""|'  $REDIS_CONF
   sed -i "s|^port.*|port 0|"                                       $REDIS_CONF
   echo "maxmemory $REDIS_MEM" >> $REDIS_CONF
+  if [[ "$ARMBIAN_BUILD" == "yes" ]]
+  then
+    echo "ignore-warnings ARM64-COW-BUG" >> $REDIS_CONF
+  fi
   echo 'vm.overcommit_memory = 1' >> /etc/sysctl.conf
 
   if is_lxc; then
@@ -79,6 +83,25 @@ EOF
   update-rc.d redis-server enable
   clear_opcache
 
+  # NC service workers
+  cat > /etc/systemd/system/nextcloud-ai-worker@.service <<'EOF'
+[Unit]
+Description=Nextcloud AI worker %i
+After=network.target
+
+[Service]
+ExecStart=php occ background-job:worker -t 60 'OC\\TaskProcessing\\SynchronousBackgroundJob'
+Restart=always
+StartLimitInterval=60
+StartLimitBurst=10
+WorkingDirectory=/var/www/nextcloud
+User=www-data
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+
   # service to randomize passwords on first boot
   mkdir -p /usr/lib/systemd/system
   cat > /usr/lib/systemd/system/nc-provisioning.service <<'EOF'

bin/ncp/CONFIG/nc-previews-auto.sh

@@ -23,8 +23,8 @@ configure()
   grep -qP "^\d+$" <<<"$RUNTIME" || { echo "Invalid RUNTIME value $RUNTIME"; return 1; }
   RUNTIME=$((RUNTIME*60))
 
-  echo "0  2  *  *  *  root  /usr/local/bin/nc-previews" >  /etc/cron.d/ncp-previews-auto
-  chmod 644 /etc/cron.d/ncp-previews-auto
+  echo "0  2  *  *  *  root  /usr/local/bin/nc-previews" >  /etc/cron.d/nc-previews-auto
+  chmod 644 /etc/cron.d/nc-previews-auto
 
   cat > /usr/local/bin/nc-previews <<EOF
 #!/bin/bash

bin/ncp/NETWORKING/dnsmasq.sh

@@ -14,30 +14,39 @@ install()
   set -x
   apt-get update
   apt-get install --no-install-recommends -y dnsmasq
+  sleep 10
   rc=0
   service dnsmasq status > /dev/null 2>&1 || rc=$?
-  [[ $rc -eq 3 ]] && ! [[ "$INIT_SYSTEM" =~ ^("chroot"|"unknown")$ ]] && command -v systemd-resolve > /dev/null || {
+  if [[ $rc -eq 3 ]] && ! [[ "$INIT_SYSTEM" =~ ^("chroot"|"unknown")$ ]]
+  then
     echo "Applying workaround for dnsmasq bug (compare issue #1446)"
     mkdir -p /etc/systemd/resolved.conf.d
     if systemctl status systemd-resolved
     then
-      cat <<EOF > /etc/systemd/resolved.conf.d/nostublistener.conf
+  cat <<EOF > /etc/systemd/resolved.conf.d/nostublistener.conf
 [Resolve]
 DNSStubListener=no
 EOF
       [[ "$INIT_SYSTEM" != "systemd" ]] || systemctl restart systemd-resolved
-    else
+    elif systemctl status resolvconf
+    then
       systemctl stop resolvconf
       systemctl start dnsmasq
       systemctl status dnsmasq
+    else
+      echo "dnsmasq failed to start and no workaround could be found. This means, the installer failed."
+      false
     fi
 #    service systemd-resolved stop || true
     systemctl start dnsmasq
     systemctl status dnsmasq
-  }
+  fi
 
   service dnsmasq stop
-  [[ "$INIT_SYSTEM" != "systemd" ]] || systemctl start systemd-resolved || systemctl start resolvconf
+  if [[ "$INIT_SYSTEM" == "systemd" ]] && systemctl list-unit-files resolvconf.service
+  then
+    systemctl start resolvconf
+  fi
   update-rc.d dnsmasq disable || rm /etc/systemd/system/multi-user.target.wants/dnsmasq.service
 
   return 0

bin/ncp/SECURITY/nc-encrypt.sh

@@ -20,14 +20,14 @@ install()
 
 configure()
 {
-(
+
   set -e -o pipefail
   local datadir parentdir encdir tmpdir
   datadir="$(get_ncpcfg datadir)"
   [[ "${datadir?}" == "null" ]] && datadir=/var/www/nextcloud/data
   parentdir="$(dirname "${datadir}")"
   encdir="${parentdir?}/ncdata_enc"
-  tmpdir="$(mktemp -u -p "${parentdir}" -t nc-data-crypt.XXXXXX))"
+  tmpdir="$(mktemp -u -p "${parentdir}" -t nc-data-crypt.XXXXXX)"
 
   [[ "${ACTIVE?}" != "yes" ]] && {
     if ! is_active; then
@@ -55,9 +55,11 @@ configure()
     return
   fi
 
+  export PASSWORD
   # Just mount already encrypted data
   if [[ -f "${encdir?}"/gocryptfs.conf ]]; then
-    echo "${PASSWORD?}" | gocryptfs -allow_other -q "${encdir}" "${datadir}" 2>&1 | sed /^Switch/d
+    systemctl reset-failed ncp-encrypt 2>/dev/null ||:
+    systemd-run -u ncp-encrypt -E PASSWORD bash -c "gocryptfs -fg -allow_other -q '${encdir}' '${datadir}' <<<\"\${PASSWORD}\" 2>&1 | sed /^Switch/d |& tee /var/log/ncp-encrypt.log"
 
     # switch to the regular virtual hosts after we decrypt, so we can access NC and ncp-web
     a2ensite ncp 001-nextcloud
@@ -70,12 +72,33 @@ configure()
   mkdir -p "${encdir?}"
   echo "${PASSWORD?}" | gocryptfs -init -q "${encdir}"
   save_maintenance_mode
+  cleanup() {
+    umount "${datadir}" ||:
+    [[ -f "${tmpdir}" ]] && {
+      rm -rf "${datadir?}" ||:
+      mv "${tmpdir}" "${datadir}"
+
+      chown -R www-data:www-data "${datadir}"
+    }
+  }
+
+  trap cleanup 1
   trap restore_maintenance_mode EXIT
 
   mv "${datadir?}" "${tmpdir?}"
 
   mkdir "${datadir}"
-  echo "${PASSWORD}" | gocryptfs -allow_other -q "${encdir}" "${datadir}" 2>&1 | sed /^Switch/d
+  systemctl reset-failed ncp-encrypt 2>/dev/null ||:
+  systemd-run -u ncp-encrypt -E PASSWORD bash -c "gocryptfs -fg -allow_other -q '${encdir}' '${datadir}' <<<\"\${PASSWORD}\" 2>&1 | sed /^Switch/d |& tee /var/log/ncp-encrypt.log"
+
+  maxtries=5
+  while [[ "$(systemctl is-active ncp-encrypt)" != "active" ]] || ! mount | grep -1 "${datadir}"
+  do
+    echo "Wating for encryption process to start... (${maxtries})"
+    sleep 3
+    maxtries=$((maxtries - 1))
+    [[ $maxtries -gt 0 ]] || return 1
+  done
 
   echo "Encrypting data..."
   mv "${tmpdir}"/* "${tmpdir}"/.[!.]* "${datadir}"
@@ -85,7 +108,7 @@ configure()
   set_ncpcfg datadir "${datadir}"
 
   echo "Data is now encrypted"
-)
+
 }
 
 # License

bin/ncp/TOOLS/nc-format-USB.sh

@@ -51,7 +51,7 @@ configure()
   }
 
   DATADIR="$(get_nc_config_value datadirectory || true)"
-  if [[ $( stat -fc%d / ) != $( stat -fc%d "$DATADIR" ) ]] || [[ -z "$DATADIR" ]] && [[ "$ALLOW_DATA_DIR_REMOVAL" != "yes" ]]
+  if [[ $( stat -fc%d / ) != $( stat -fc%d "$DATADIR" ) ]] || [[ -z "$DATADIR" ]] && [[ "$ALLOW_DATADIR_REMOVAL" != "yes" ]]
   then
     echo "ERROR: Data directory is on USB drive (or can't be determined) and removal of data directory was not explicitly allowed." \
       "Please move the data directory to SD before formatting the USB drive." \

bin/ncp/UPDATES/nc-autoupdate-nc.sh

@@ -23,7 +23,7 @@ configure()
 source /usr/local/etc/library.sh
 
 echo -e "[ncp-update-nc]"                              >> /var/log/ncp.log
-/usr/local/bin/ncp-update-nc "$NCLATESTVER" 2>&1 | tee -a /var/log/ncp.log
+/usr/local/bin/ncp-update-nc "latest" 2>&1 | tee -a /var/log/ncp.log
 
 if [[ \${PIPESTATUS[0]} -eq 0 ]]; then
 

bin/ncp/UPDATES/nc-update-nextcloud.sh

@@ -12,12 +12,6 @@ LATEST="$NCLATESTVER"
 
 configure()
 {
-  [[ "$VERSION" == "0" ]] && VERSION="$LATEST"
-  if ! is_docker && ! is_more_recent_than "24.0.0" "${VERSION}" && is_more_recent_than "8.1.0" "${PHPVER}.0" && [[ " ${BASH_SOURCE[*]} " =~ .*" /home/www/ncp-launcher.sh ".* ]]
-    then
-      echo "We need to upgrade PHP. This process cannot be performed from the web UI. Please use 'ncp-config' from the terminal (via SSH or direct access) to update Nextcloud instead. Future updates can again be run from the web UI"
-      exit 1
-    fi
   bash /usr/local/bin/ncp-update-nc "$VERSION"
 }
 

bin/nextcloud-domain.sh

@@ -11,9 +11,12 @@ done
 # wicd service finishes before completing DHCP
 while :; do
   local_ip="$(get_ip)"
-  pub_ip="$(curl -m4 icanhazip.com 2>/dev/null)"
 
-  [[ "$pub_ip"   != "" ]] && ncc config:system:set trusted_domains 11 --value="$pub_ip"
+  pub_ipv4="$(curl -4 -m4 icanhazip.com 2>/dev/null)"
+  pub_ipv6="$(curl -6 -m4 icanhazip.com 2>/dev/null)"
+  [[ -z "$pub_ipv4" ]] || ncc config:system:set trusted_domains 11 --value="$pub_ipv4"
+  [[ -z "$pub_ipv6" ]] || ncc config:system:set trusted_domains 12 --value="[$pub_ipv6]"
+
   [[ "$local_ip" != "" ]] && break
 
   sleep 3

build/armbian/armbian.sh

@@ -19,6 +19,8 @@ LINUXFAMILY=$2
 BOARD=$3
 BUILD_DESKTOP=$4
 
+echo "include home dir? ${INCLUDE_HOME_DIR:-no}"
+
 cd /tmp/overlay
 NCPCFG=etc/ncp.cfg
 source etc/library.sh # sets RELEASE
@@ -31,7 +33,11 @@ echo -e "\nInstalling NextCloudPi"
 
 hostname -F /etc/hostname # fix 'sudo resolve host' errors
 
-CODE_DIR="$(pwd)" DBG=x bash install.sh
+ARMBIAN_BUILD=yes CODE_DIR="$(pwd)" DBG=x bash install.sh || {
+  echo "SOMETHING WENT WRONG, EXITING..."
+  exit 1
+}
+sed -i 's/^ignore-warnings ARM64-COW-BUG//' /etc/redis/redis.conf
 
 echo -e "\nPostinstall..."
 run_app_unsafe post-inst.sh

build/armbian/armbian_version

@@ -0,0 +1 @@
+v25.08

build/build-SD-armbian.sh

@@ -31,7 +31,7 @@ prepare_dirs                   # tmp cache output
 
 # get latest armbian
 [[ -d armbian ]] || {
-  git clone --depth 1 --branch v24.08 https://github.com/armbian/build armbian
+  git clone --depth 1 --branch "$(cat "$(dirname "${0}")/armbian/armbian_version")" https://github.com/armbian/build armbian
 }
 #( cd armbian && git pull --ff-only --tags && git checkout v23.02 )
 #sed -i -e '/export rootfs_size=/s/du -sm/du --apparent-size -sm/' armbian/lib/functions/image/partitioning.sh

changelog.md

@@ -1,5 +1,77 @@
 # NextcloudPi Changelog
 
+
+## [v1.56.0](https://github.com/nextcloud/nextcloudpi/tree/v1.56.0) (2025-11-19) Nextcloud 32 and fixes
+
+### Changes
+
+- Support for Nextcloud 32
+- Add service workers for Nextcloud's AI functionality
+
+### Fixes
+
+- Fix broken IPv6 addresses added to trusted IPs ([#2060](https://github.com/nextcloud/nextcloudpi/issues/2060), thanks @lukaszgoworko)
+- Fix unnecessary reinstallation of notify_push app during updates ([#2069](https://github.com/nextcloud/nextcloudpi/issues/2069), thanks @lovenemesis)
+
+## [v1.55.4](https://github.com/nextcloud/nextcloudpi/tree/v1.55.3) (2025-03-24) Nextcloud 31 and fixes
+
+### Changes
+
+- Support for Nextcloud 31
+
+### Fixes
+
+- Fix wrongly configured temporary directory for uploads (fixes [#1750](https://github.com/nextcloud/nextcloudpi/issues/1750), [#1857](https://github.com/nextcloud/nextcloudpi/issues/1857)), thanks [@joshtrichards](https://github.com/joshtrichards)
+- Fix regression breaking php upgrades (see [#2026](https://github.com/nextcloud/nextcloudpi/pull/2026)), thanks [@twojstaryzdomu](https://github.com/twojstaryzdomu)
+
+## [v1.55.3](https://github.com/nextcloud/nextcloudpi/tree/v1.55.3) (2024-11-08) Nextcloud 30 and fixes
+
+### Changes
+
+- Support for Nextcloud 30 ([#1957](https://github.com/nextcloud/nextcloudpi/issues/1957))
+
+### Fixes
+
+- Fix resetting failed state of previous ncp-update-nc job ([#1992](https://github.com/nextcloud/nextcloudpi/issues/1992))
+- Fix installer on systems using resolvconf as DNS manager ([#1926](](https://github.com/nextcloud/nextcloudpi/issues/1926))
+- Fix typo that prevents ncp-previews from being disabled (Thanks @m-breitbach)
+
+## [v1.55.2](https://github.com/nextcloud/nextcloudpi/tree/v1.55.2) (2024-09-24) Hotfix release
+
+### Fixes
+
+- Increase the maximum package size for mysqldump to 256M (fixes [#1979](https://github.com/nextcloud/nextcloudpi/issues/1979))
+- Fix repeated erroneous update success messages for auto updates (fixes [#1979](https://github.com/nextcloud/nextcloudpi/issues/1979), [#1981](https://github.com/nextcloud/nextcloudpi/issues/1981))
+
+## [v1.55.1](https://github.com/nextcloud/nextcloudpi/tree/v1.55.1) (2024-09-08) Hotfix release
+
+### Fixes
+
+- Prevent attempted downgrade in ncp-update-nc
+
+## [v1.55.0](https://github.com/nextcloud/nextcloudpi/tree/v1.55.0) (2024-09-07) Support for PHP 8.3 and Nextcloud 29
+
+### Changes
+
+- Support for Nextcloud 29
+- Support for PHP 8.3
+- Run `maintenance:repair --include-expensive` after NC update if necessary
+- Add logrotate for redis, apache and mysql logs
+- Add support for the OrangePi 5 and OrangePi 5 Plus boards
+
+### Fixes
+
+- Fix bug in nc-format-USB.sh (thanks @m-breitbach)
+- Nextcloud updater fixes 
+  - Fix constant retries of the auto update if on a version that's later than the last officially supported one [#1965](https://github.com/nextcloud/nextcloudpi/issues/1965)
+  - Fix incorrect detection of os constraints for NC updates beyond v28 [#1960](https://github.com/nextcloud/nextcloudpi/issues/1960)
+  - Fix user requested version being ignored if a later version was available
+- Improve stability of nc-encrypt by daemonizing the encryption process [#1874](https://github.com/nextcloud/nextcloudpi/issues/1874)
+
+### Development related
+
+- Perform nc update tests for both lxd as well as vms during CI/CD
+
 ## [v1.54.3](https://github.com/nextcloud/nextcloudpi/tree/v1.54.3) (2024-08-11) Improved Nextcloud (auto) updates
 
 ### Fixes

etc/library.sh

@@ -22,7 +22,7 @@ export DB_PREFIX="$(php -r 'include("/var/www/nextcloud/config/config.php"); ech
 export SYSTEMD_PAGER=
 
 [[ -f "$NCPCFG" ]] || export NCPCFG=/usr/local/etc/ncp.cfg
-[[ -f "$NCPCFG" ]] || { echo "$NCPCFG not found" >2; exit 1; }
+[[ -f "$NCPCFG" ]] || { echo "$NCPCFG not found" >&2; exit 1; }
 
 if [[ "$(ps -p 1 --no-headers -o "%c")" == "systemd" ]] && ! [[ -d "/run/systemd/system" ]]
 then
@@ -519,21 +519,43 @@ function nc_version()
   ncc status | grep "versionstring:" | awk '{ print $3 }'
 }
 
-function determine_nc_upgrade_version() {
+function determine_nc_update_version() {
   local current supported current_maj supported_maj versions next_version
   current="${1?}"
   supported="${2?}"
+  requested="${3:-latest}"
 
   #CURRENT="$(ncc status | grep "versionstring:" | awk '{ print $3 }')"
   current_maj="${current%%.*}"
+  requested_maj="${requested%%.*}"
   supported_maj="${supported%%.*}"
-  versions="$(curl -L -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/nextcloud/server/releases?per_page=100 | jq -r '.[].tag_name' | grep -v -e 'rc.$' -e 'beta.$' | sort -V)"
+
+  # If valid version is requested -> direct update, don't consider anything else
+  if [[ "$requested" =~ ^[0-9]*.[0-9]*.[0-9]*$ ]]
+  then
+    if ! is_more_recent_than "${requested}" "${current}"
+    then
+      echo "$current"
+      return 0
+    elif [[ "$requested_maj" -le "$((current_maj + 1))" ]]
+    then
+      echo "$requested"
+      return 0
+    fi
+  fi
+
+  versions="$(curl -q -L -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/nextcloud/server/releases?per_page=100 | jq -r '.[].tag_name' | grep -v -e 'rc.$' -e 'beta.$' | sort -V)"
   next_version="$(grep "v${current_maj}." <<<"${versions}" | tail -n 1 | tr -d 'v')"
+  next_version_maj="${next_version%%.*}"
+  next_version_min="${next_version#*.}"
+  next_version_min="${next_version_min%%.*}"
+
   if [[ "${next_version}" == "${current}" ]]
   then
 
     if [[ "${supported_maj}" -le "${current_maj}" ]]
     then
+      echo "$current"
       # No update available
       return 0
     fi

etc/library.test

@@ -0,0 +1,76 @@
+#!/bin/bash
+set -ex
+
+fail() {
+  echo "$@"
+  exit 1
+}
+
+#shellcheck source=./library.sh
+. "$(dirname "$0")/library.sh" ||:
+
+
+case=1
+
+current=27.0.1
+supported=27.0.8
+requested=""
+
+expected=27.1.11
+
+actual="$(determine_nc_update_version "$current" "$supported" "$requested")"
+
+[[ "$expected"  == "$actual" ]] || fail "C$case: unexpected nc target version: $actual (expected: $expected)"
+
+
+case=2
+
+# TODO: Set to 26.0.1
+current=26.0.13
+supported=27.0.8
+requested=""
+
+expected=27.1.11
+
+actual="$(determine_nc_update_version "$current" "$supported" "$requested")"
+
+[[ "$expected"  == "$actual" ]] || fail "C$case: unexpected nc target version: $actual (expected: $expected)"
+
+
+case=3
+
+current=26.0.1
+supported=27.0.8
+requested="27.1.3"
+
+expected=27.1.3
+
+actual="$(determine_nc_update_version "$current" "$supported" "$requested")"
+
+[[ "$expected"  == "$actual" ]] || fail "C$case: unexpected nc target version: $actual (expected: $expected)"
+
+
+case=4
+
+current=29.0.5
+supported=27.0.8
+requested=""
+
+expected=29.0.6
+
+actual="$(determine_nc_update_version "$current" "$supported" "$requested")"
+
+[[ "$expected"  == "$actual" ]] || fail "C$case: unexpected nc target version: $actual (expected: $expected)"
+
+
+case=5
+
+current=29.0.5
+supported=27.0.8
+requested="27.0.8"
+
+expected="29.0.5"
+
+actual="$(determine_nc_update_version "$current" "$supported" "$requested")"
+
+[[ "$expected"  == "$actual" ]] || fail "C$case: unexpected nc target version: $actual (expected: $expected)"

etc/ncp-config.d/nc-nextcloud.cfg

@@ -9,7 +9,7 @@
     {
       "id": "VER",
       "name": "Version",
-      "value": "28.0.7"
+      "value": "32.0.1"
     },
     {
       "id": "MAXFILESIZE",

etc/ncp-templates/mysql/91-ncp.cnf.sh

@@ -19,6 +19,9 @@ innodb_file_per_table=1
 innodb_file_format=barracuda
 max_allowed_packet=256M
 
+[mysqldump]
+max_allowed_packet = 256M
+
 [server]
 # innodb settings
 skip-name-resolve

etc/ncp.cfg

@@ -1,5 +1,5 @@
 {
-	"nextcloud_version": "28.0.7",
-	"php_version": "8.1",
+	"nextcloud_version": "32.0.1",
+	"php_version": "8.3",
 	"release": "bookworm"
 }

generate_cohortes.sh

@@ -1,16 +1,33 @@
 #!/usr/bin/env bash
-
 #min=$((101-${1:-50}))
+total_count="${1?}"
+target_file="${2?}"
 all=({100..1})
 cohortes=()
-for i in "${all[@]:0:${1?}}"
+
+touch "${target_file?}"
+
+while IFS="" read -r line || [ -n "$line" ]
+do
+  [[ -n "$line" ]] || continue
+  cohortes+=("$line")
+done < "${target_file}"
+
+cohortes_count=${#cohortes[@]}
+count=$(( total_count - cohortes_count ))
+
+for i in "${all[@]:0:${count}}"
 do
   cohorte_id=$((RANDOM % i))
   while [[ " ${cohortes[*]} " =~ .*" ${cohorte_id} ".* ]]
   do
     cohorte_id=$((cohorte_id+1))
+    if [[ $cohorte_id -eq 101 ]]
+    then
+      cohorte_id=1
+    fi
   done
   cohortes+=($cohorte_id)
 done
 
-echo "${cohortes[*]}" | tr ' ' $'\n'
+(IFS=$'\n'; echo -n "${cohortes[*]}" | sort -h | head -c -1 >| "$target_file")

install.sh

@@ -74,11 +74,6 @@ cp etc/ncp.cfg /usr/local/etc/
 
 cp -r etc/ncp-templates /usr/local/etc/
 install_app    lamp.sh
-if [[ -d "/run/systemd/system" ]] && is_lxc
-then
-  DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y systemd-resolved
-  systemctl enable systemd-resolved
-fi
 install_app    bin/ncp/CONFIG/nc-nextcloud.sh
 run_app_unsafe bin/ncp/CONFIG/nc-nextcloud.sh
 rm /usr/local/etc/ncp-config.d/nc-nextcloud.cfg    # armbian overlay is ro

ncp-app/appinfo/info.xml

@@ -12,7 +12,7 @@
     <category>tools</category>
     <bugs>https://github.com/nextcloud/nextcloudpi/issues</bugs>
     <dependencies>
-        <nextcloud min-version="22" max-version="28"/>
+        <nextcloud min-version="22" max-version="32"/>
     </dependencies>
     <navigations>
         <navigation>

ncp-app/lib/Service/SettingsService.php

@@ -38,6 +38,7 @@ class SettingsService {
 		}
 		if ($config == null) {
 			$this->logger->error("Failed to retrieve ncp config (exit code: $ret)");
+			$this->logger->error("ERR: $stderr");
 			return $defaults;
 		}
 		return $config;
@@ -132,11 +133,12 @@ class SettingsService {
 			2 => ["pipe", "w"]
 		];
 
-		$proc = proc_open($cmd, $descriptorSpec, $pipes, "/home/www-data", null);
+		$proc = proc_open($cmd, $descriptorSpec, $pipes, "/home/www", null);
 		$stdout = stream_get_contents($pipes[1]);
 		fclose($pipes[1]);
 		$stderr = stream_get_contents($pipes[2]);
 		fclose($pipes[2]);
+
 		return [proc_close($proc), $stdout, $stderr];
 	}
 }

ncp-previewgenerator/ncp-previewgenerator-nc21/appinfo/info.xml

@@ -25,7 +25,7 @@ The first time you install this app, before using a cron job, you properly want
 	</types>
 	<dependencies>
 		<php min-version="7.2"/>
-		<nextcloud min-version="20" max-version="28" />
+		<nextcloud min-version="20" max-version="32" />
 	</dependencies>
 
 	<commands>

ncp.sh

@@ -22,7 +22,8 @@ install()
 {
   # NCP-CONFIG
   apt-get update
-  $APTINSTALL git dialog whiptail jq file lsb-release tmux
+  $APTINSTALL git dialog whiptail jq file lsb-release tmux logrotate
+
   mkdir -p "$CONFDIR" "$BINDIR"
 
   # This has changed, pi user no longer exists by default, the user needs to create it with Raspberry Pi imager

post-inst.sh

@@ -15,6 +15,7 @@ configure()
 
   # stop services
   pkill -x redis-server
+  [[ -f /var/log/redis.log ]] && rm /var/log/redis.log
   [[ -f /run/mysqld/mysqld.pid ]] && mysqladmin -u root shutdown
   [[ -f /run/crond.pid ]]     && kill "$(cat /run/crond.pid)"
   pkill -f php-fpm

staged_rollouts/v1.54.3.txt

@@ -1,30 +1,100 @@
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
 43
 44
-79
-65
-76
-33
-72
-11
-77
-4
-60
-5
-86
-58
-41
-61
-53
-12
-42
-74
-3
-40
-13
-73
-57
-24
 45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
 66
-35
-6
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99

staged_rollouts/v1.55.0.txt

@@ -0,0 +1,100 @@
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99

staged_rollouts/v1.55.1.txt

@@ -0,0 +1,100 @@
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99

staged_rollouts/v1.55.2.txt

@@ -0,0 +1,100 @@
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99

tests/activation_tests.py

@@ -23,6 +23,7 @@ import signal
 from selenium import webdriver
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.common.by import By
+from selenium.webdriver.firefox.service import Service
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.firefox.options import Options
@@ -90,12 +91,15 @@ def signal_handler(sig, frame):
         sys.exit(0)
 
 
-def test_activation(IP, nc_port, admin_port, options, wait_timeout=120):
+def test_activation(IP, nc_port, admin_port, options, webdriver_exec_path=None, wait_timeout=120):
     """ Activation process checks"""
+    driver_kwargs={}
+    if webdriver_exec_path is not None:
+        driver_kwargs['service'] = Service(webdriver_exec_path)
 
     # activation page
     test = Test()
-    driver = webdriver.Firefox(options=options)
+    driver = webdriver.Firefox(options=options, **driver_kwargs)
     driver.implicitly_wait(5)
     test.new("activation opens")
     driver.get(f"https://{IP}:{nc_port}")
@@ -137,7 +141,9 @@ def test_activation(IP, nc_port, admin_port, options, wait_timeout=120):
 
     # ncp-web
     test.new("ncp-web")
-    driver = webdriver.Firefox(options=options)
+    if webdriver_exec_path is not None:
+        driver_kwargs['service'] = Service(webdriver_exec_path)
+    driver = webdriver.Firefox(options=options, **driver_kwargs)
     driver.implicitly_wait(30)
     try:
         driver.get(f"https://ncp:{urllib.parse.quote_plus(ncp_pass)}@{IP}:{admin_port}")
@@ -164,6 +170,13 @@ if __name__ == "__main__":
 
     arg_timeout = 120
     options = webdriver.FirefoxOptions()
+    webdriver_exec_path = None
+    if 'GECKODRIVER_PATH' in os.environ:
+        print(f"Setting geckodriver from env ({os.environ['GECKODRIVER_PATH']})")
+        webdriver_exec_path = os.environ['GECKODRIVER_PATH']
+    if 'FF_BINARY_PATH' in os.environ:
+        print(f"Setting firefox binary from env ({os.environ['FF_BINARY_PATH']}")
+        options.binary_location = os.environ['FF_BINARY_PATH']
     for opt, arg in opts:
         if opt in ('-h', '--help'):
             usage()
@@ -184,7 +197,7 @@ if __name__ == "__main__":
     print("Activation tests " + tc.yellow + IP + tc.normal)
     print("---------------------------")
 
-    test_activation(IP, nc_port, admin_port, options, arg_timeout)
+    test_activation(IP, nc_port, admin_port, options, webdriver_exec_path, arg_timeout)
 
 # License
 #

tests/nextcloud_tests.py

@@ -23,11 +23,13 @@ from pathlib import Path
 
 from selenium import webdriver
 from selenium.webdriver.common.by import By
+from selenium.webdriver.firefox.service import Service
 from selenium.webdriver.firefox.webdriver import WebDriver
 from selenium.webdriver.remote.webelement import WebElement
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.firefox.options import Options
-from selenium.common.exceptions import NoSuchElementException, WebDriverException, TimeoutException
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.common.exceptions import NoSuchElementException, WebDriverException, TimeoutException, ElementNotInteractableException
 from typing import List, Tuple
 import traceback
 
@@ -121,26 +123,37 @@ def is_admin_notifications_checkbox(item: WebElement):
         return False
 
 
-def close_first_run_wizard(driver: WebDriver):
-    wait = WebDriverWait(driver, 60)
+def close_first_run_wizard(driver: WebDriver, wait_multiplier=1):
+    wait = WebDriverWait(driver, 20 * wait_multiplier)
     first_run_wizard = None
     try:
         first_run_wizard = driver.find_element(By.CSS_SELECTOR, "#firstrunwizard")
     except NoSuchElementException:
         pass
     if first_run_wizard is not None and first_run_wizard.is_displayed():
-        wait.until(VisibilityOfElementLocatedByAnyLocator([(By.CLASS_NAME, "modal-container__close"),
-                                                           (By.CLASS_NAME, "first-run-wizard__close-button")]))
+        for i in range(3):
+            try:
+                wait.until(VisibilityOfElementLocatedByAnyLocator([(By.CSS_SELECTOR, '.modal-container__content button[aria-label=Close]'),
+                                                                   (By.CLASS_NAME, "modal-container__close"),
+                                                                   (By.CLASS_NAME, "first-run-wizard__close-button")]))
+            except TimeoutException as e:
+                if i == 3:
+                    raise e
         try:
-            overlay_close_btn = driver.find_element(By.CLASS_NAME, "first-run-wizard__close-button")
-            overlay_close_btn.click()
-        except NoSuchElementException:
-            overlay_close_btn = driver.find_element(By.CLASS_NAME, "modal-container__close")
+            overlay_close_btn = driver.find_element(By.CSS_SELECTOR, '.modal-container__content button[aria-label=Close]')
             overlay_close_btn.click()
+        except (NoSuchElementException, ElementNotInteractableException):
+            try:
+                overlay_close_btn = driver.find_element(By.CLASS_NAME, "modal-container__close")
+                overlay_close_btn.click()
+            except (NoSuchElementException, ElementNotInteractableException):
+                overlay_close_btn = driver.find_element(By.CLASS_NAME, "first-run-wizard__close-button")
+                overlay_close_btn.click()
+
         time.sleep(3)
 
 
-def test_nextcloud(IP: str, nc_port: str, driver: WebDriver, skip_release_check: bool):
+def test_nextcloud(IP: str, nc_port: str, driver: WebDriver, skip_release_check: bool, wait_multiplier=1):
     """ Login and assert admin page checks"""
     test = Test()
     test.new("nextcloud page")
@@ -167,64 +180,14 @@ def test_nextcloud(IP: str, nc_port: str, driver: WebDriver, skip_release_check:
     test.report("password", "Wrong password" not in driver.page_source, msg="Failed to login with provided password")
 
     test.new("settings config")
-    wait = WebDriverWait(driver, 60)
+    wait = WebDriverWait(driver, 60 * wait_multiplier * 5)
     try:
-        wait.until(VisibilityOfElementLocatedByAnyLocator([(By.CSS_SELECTOR, "#security-warning-state-ok"),
-                                                           (By.CSS_SELECTOR, "#security-warning-state-warning"),
-                                                           (By.CSS_SELECTOR, "#security-warning-state-error"),
-                                                           (By.CSS_SELECTOR, "#security-warning-state-failure")]))
+        wait.until(VisibilityOfElementLocatedByAnyLocator([(By.CSS_SELECTOR, "#security-warning.settings-section")]))
+        settings_config_check(wait, test)
+    except TimeoutException:
+        settings_config_check_pre32(wait, test)
 
-        element_ok = driver.find_element(By.ID, "security-warning-state-ok")
-        element_warn = driver.find_element(By.ID, "security-warning-state-warning")
-
-        if element_warn.is_displayed():
-
-            warnings = driver.find_elements(By.CSS_SELECTOR, "#postsetupchecks > .warnings > li")
-            for warning in warnings:
-                if re.match(r'.*Server has no maintenance window start time configured.*', warning.text):
-                    continue
-                elif re.match(r'.*Could not check for JavaScript support.*', warning.text):
-                    continue
-                # TODO: Solve redis error logs at the source
-                elif re.match(r'.*\d+ errors in the logs since.*', warning.text):
-                    continue
-                else:
-                    raise ConfigTestFailure(f"WARN: {warning.text}")
-
-            if driver.find_element(By.CSS_SELECTOR, "#postsetupchecks > .errors").is_displayed():
-                try:
-                    first_error = driver.find_element(By.CSS_SELECTOR, "#postsetupchecks > .errors > li")
-                except NoSuchElementException:
-                    first_error = None
-                raise ConfigTestFailure(f"ERROR: {first_error.text if first_error is not None else 'unexpected error'}")
-
-            infos = driver.find_elements(By.CSS_SELECTOR, "#postsetupchecks > .info > li")
-            for info in infos:
-                if re.match(r'.*Your installation has no default phone region set.*', info.text) \
-                        or re.match(r'The PHP module "imagick" is not enabled', info.text):
-                    continue
-                else:
-                    print(f'INFO: {info.text}')
-                    php_modules = info.find_elements(By.CSS_SELECTOR, "li")
-                    if len(php_modules) != 1:
-                        raise ConfigTestFailure(f"Could not find the list of php modules within the info message "
-                                                f"'{infos[0].text}'")
-                    if php_modules[0].text != "imagick":
-                        raise ConfigTestFailure("The list of php_modules does not equal [imagick]")
-
-        elif not element_ok.is_displayed():
-            errors = driver.find_elements(By.CSS_SELECTOR, "#postsetupchecks > .errors > li")
-            for error in errors:
-                print(f'ERROR: {error.text}')
-            raise ConfigTestFailure("Neither the warnings nor the ok status is displayed "
-                                    "(so there are probably errors or the page is broken)")
-
-        test.check(True)
-
-    except Exception as e:
-        test.check(e)
-
-    close_first_run_wizard(driver)
+    close_first_run_wizard(driver, wait_multiplier)
 
     test.new("admin section (1)")
     try:
@@ -277,7 +240,7 @@ def test_nextcloud(IP: str, nc_port: str, driver: WebDriver, skip_release_check:
     except Exception as e:
         test.check(e)
     test.new("admin section (2)")
-    wait = WebDriverWait(driver, 10)
+    wait = WebDriverWait(driver, 10 * wait_multiplier)
     try:
         li = next(filter(is_admin_notifications_checkbox, list_items))
         li.find_element(By.TAG_NAME, "input").click()
@@ -303,19 +266,119 @@ def test_nextcloud(IP: str, nc_port: str, driver: WebDriver, skip_release_check:
     except Exception as e:
         test.check(e)
 
+def settings_config_check_warnings(warnings):
+    for warning in warnings:
+        if re.match(r'.*Server has no maintenance window start time configured.*', warning.text) \
+                or re.match(r'.*Server has no maintenance window start time configured.*', warning.text):
+            continue
+        elif re.match(r'.*Could not check for JavaScript support.*', warning.text):
+            continue
+        # TODO: Solve redis error logs at the source
+        elif re.match(r'.*\d+ errors? in the logs since.*', warning.text):
+            continue
+        else:
+            raise ConfigTestFailure(f"WARN: {warning.text}")
+
+def settings_config_check_infos(infos):
+    for info in infos:
+        if re.match(r'.*Your installation has no default phone region set.*', info.text) \
+                or re.match(r'The PHP module "imagick" is not enabled', info.text) \
+                or re.match(r'The PHP module "imagick" in this instance has no SVG support.*', info.text) \
+                or re.match(r'\d+ warnings? in the logs since.*', info.text):
+            continue
+        else:
+            print(f'INFO: {info.text}')
+            php_modules = info.find_elements(By.CSS_SELECTOR, "li")
+            if len(php_modules) != 1:
+                raise ConfigTestFailure(f"Could not find the list of php modules within the info message "
+                                        f"'{infos[0].text}'")
+            if php_modules[0].text != "imagick":
+                raise ConfigTestFailure("The list of php_modules does not equal [imagick]")
+
+
+def settings_config_check_errors(errors):
+    if len(errors) == 0:
+        return
+    for error in errors:
+        print(f'ERROR: {error.text}')
+    raise ConfigTestFailure("Neither the warnings nor the ok status is displayed "
+                            "(so there are probably errors or the page is broken)")
+
+
+def settings_config_check(wait, test):
+    try:
+        wait.until_not(VisibilityOfElementLocatedByAnyLocator([(By.CSS_SELECTOR, "#security-warning .loading-icon")]))
+        warnings = driver.find_elements(By.CSS_SELECTOR, "#security-warning li.settings-setup-checks-item--warning .settings-setup-checks-item__description")
+        settings_config_check_warnings(warnings)
+        infos = driver.find_elements(By.CSS_SELECTOR, "#security-warning li.settings-setup-checks-item--info .settings-setup-checks-item__description")
+        settings_config_check_infos(infos)
+        errors = driver.find_elements(By.CSS_SELECTOR, "#security-warning li.settings-setup-checks-item--error .settings-setup-checks-item__description")
+        settings_config_check_errors(errors)
+
+        test.check(True)
+    except Exception as e:
+        print(driver.find_element(By.CSS_SELECTOR, "#security-warning").get_attribute("innerHTML"))
+        test.check(e)
+
+
+def settings_config_check_pre32(wait, test):
+    try:
+        wait.until(VisibilityOfElementLocatedByAnyLocator([(By.CSS_SELECTOR, "#security-warning-state-ok"),
+                                                           (By.CSS_SELECTOR, "#security-warning-state-warning"),
+                                                           (By.CSS_SELECTOR, "#security-warning-state-error"),
+                                                           (By.CSS_SELECTOR, "#security-warning-state-failure")]))
+
+        element_ok = driver.find_element(By.ID, "security-warning-state-ok")
+        element_warn = driver.find_element(By.ID, "security-warning-state-warning")
+
+        if element_warn.is_displayed():
+
+            warnings = driver.find_elements(By.CSS_SELECTOR, "#postsetupchecks > .warnings > li")
+            settings_config_check_warnings(warnings)
+
+            if driver.find_element(By.CSS_SELECTOR, "#postsetupchecks > .errors").is_displayed():
+                try:
+                    first_error = driver.find_element(By.CSS_SELECTOR, "#postsetupchecks > .errors > li")
+                except NoSuchElementException:
+                    first_error = None
+                raise ConfigTestFailure(f"ERROR: {first_error.text if first_error is not None else 'unexpected error'}")
+
+            infos = driver.find_elements(By.CSS_SELECTOR, "#postsetupchecks > .info > li")
+            settings_config_check_infos(infos)
+
+
+        elif not element_ok.is_displayed():
+            errors = driver.find_elements(By.CSS_SELECTOR, "#postsetupchecks > .errors > li")
+            settings_config_check_errors(errors)
+
+        test.check(True)
+
+    except Exception as e:
+
+        print(driver.find_element(By.CSS_SELECTOR, "#security-warning").get_attribute("innerHTML"))
+        test.check(e)
+
 
 if __name__ == "__main__":
     signal.signal(signal.SIGINT, signal_handler)
 
     # parse options
     try:
-        opts, args = getopt.getopt(sys.argv[1:], 'hn', ['help', 'new', 'no-gui', 'skip-release-check'])
+        opts, args = getopt.getopt(sys.argv[1:], 'hn', ['help', 'new', 'no-gui', 'skip-release-check', 'wait-multiplier='])
     except getopt.GetoptError:
         usage()
         sys.exit(2)
 
     skip_release_check = False
     options = webdriver.FirefoxOptions()
+    webdriver_exec_path = None
+    if 'GECKODRIVER_PATH' in os.environ:
+        print(f"Setting geckodriver from env ({os.environ['GECKODRIVER_PATH']})")
+        webdriver_exec_path = os.environ['GECKODRIVER_PATH']
+    if 'FF_BINARY_PATH' in os.environ:
+        print(f"Setting firefox binary from env ({os.environ['FF_BINARY_PATH']}")
+        options.binary_location = os.environ['FF_BINARY_PATH']
+    wait_multiplier = 1
     for opt, arg in opts:
         if opt in ('-h', '--help'):
             usage()
@@ -327,6 +390,8 @@ if __name__ == "__main__":
             options.add_argument("-headless")
         elif opt == '--skip-release-check':
             skip_release_check = True
+        elif opt == '--wait-multiplier':
+            wait_multiplier = int(arg)
         else:
             usage()
             sys.exit(2)
@@ -362,10 +427,13 @@ if __name__ == "__main__":
     print("Nextcloud tests " + tc.yellow + IP + tc.normal)
     print("---------------------------")
 
-    driver = webdriver.Firefox(options=options)
+    if webdriver_exec_path is None:
+        driver = webdriver.Firefox(options=options)
+    else:
+        driver = webdriver.Firefox(options=options, service=Service(webdriver_exec_path))
     failed=False
     try:
-        test_nextcloud(IP, nc_port, driver, skip_release_check)
+        test_nextcloud(IP, nc_port, driver, skip_release_check, wait_multiplier)
     except Exception as e:
         print(e)
         print(traceback.format_exc())

tests/requirements.txt

@@ -1,2 +1,2 @@
 robotframework
-selenium
+selenium>=3.0.0,<4.0.0

tests/system_tests.py

@@ -20,9 +20,13 @@ import sys
 import getopt
 import os
 import signal
-from subprocess import run, getstatusoutput, PIPE, CompletedProcess
+from subprocess import run as sp_run, getstatusoutput, PIPE, CompletedProcess
 from typing import Optional
 
+def run(*args, **kwargs):
+    print("running command: " + " ".join(args[0]))
+    return sp_run(*args, **kwargs)
+
 processes_must_be_running = [
         'apache2',
         'cron',
@@ -252,6 +256,8 @@ def test_autoupdates():
 
 if __name__ == "__main__":
 
+    sudo_prefix = ['sudo'] if os.environ.get('USE_SUDO', 'no') == 'yes' else []
+
     signal.signal(signal.SIGINT, signal_handler)
 
     # parse options
@@ -290,23 +296,27 @@ if __name__ == "__main__":
 
     # detect if we are running this in a NCP instance
     try:
-        dockers_running = run(['docker', 'ps', '--format', '{{.Names}}'], stdout=PIPE).stdout.decode('utf-8')
+        dockers_running = run(sudo_prefix + ['docker', 'ps', '--format', '{{.Names}}'], stdout=PIPE).stdout.decode('utf-8')
     except:
         dockers_running = ''
 
-    lxc_command = ['lxc'] if 'USE_INCUS' not in os.environ or os.environ['USE_INCUS'] != 'yes' else ['incus']
+    lxc_command = sudo_prefix + ['lxc'] if os.environ.get('USE_INCUS', 'no') != 'yes' else ['incus']
 
     try:
         lxc_test = run(lxc_command + ['info'], stdout=PIPE, check=True)
         if lxc_test.returncode != 0:
             raise Exception(f"failed to execute {lxc_command} info")
     except:
-        try:
-            lxc_test = run(['sudo'] + lxc_command + ['info'], stdout=PIPE, check='True')
-            lxc_command = ['sudo'] + lxc_command
-        except:
+        if os.environ.get('USE_SUDO', 'no') == 'yes':
             lxc_command = None
             lxc_running = False
+        else:
+            try:
+                lxc_test = run(['sudo'] + lxc_command + ['info'], stdout=PIPE, check='True')
+                lxc_command = ['sudo'] + lxc_command
+            except:
+                lxc_command = None
+                lxc_running = False
 
     # detect if we are running this in a LXC instance
     if lxc_command is not None:
@@ -316,7 +326,7 @@ if __name__ == "__main__":
             lxc_running = False
 
     try:
-        systemd_container_running = run(['machinectl', 'show', 'ncp'], stdout=PIPE, check = True)
+        systemd_container_running = run(sudo_prefix + ['machinectl', 'show', 'ncp'], stdout=PIPE, check = True)
     except:
         systemd_container_running = False
 
@@ -326,12 +336,12 @@ if __name__ == "__main__":
         print(tc.brown + "* local NCP instance detected" + tc.normal)
         if not is_lxc():
             binaries_must_be_installed = binaries_must_be_installed + binaries_no_docker
-        pre_cmd = []
+        pre_cmd = sudo_prefix
 
     # docker method
     elif 'nextcloudpi' in dockers_running:
         print( tc.brown + "* local NCP docker instance detected" + tc.normal)
-        pre_cmd = ['docker', 'exec']
+        pre_cmd = sudo_prefix + ['docker', 'exec']
         if interactive:
             pre_cmd.append('-ti')
         pre_cmd.append('nextcloudpi')
@@ -342,7 +352,7 @@ if __name__ == "__main__":
         pre_cmd = lxc_command + ['exec', 'ncp', '--']
 
     elif systemd_container_running:
-        pre_cmd = ['systemd-run', '--wait', '-P', '--machine=ncp']
+        pre_cmd = sudo_prefix + ['systemd-run', '--wait', '-P', '--machine=ncp']
 
     # SSH method
     else:
@@ -350,20 +360,20 @@ if __name__ == "__main__":
             print( tc.brown + "* No local NCP instance detected, trying SSH with " +
                tc.yellow + ssh_cmd + tc.normal + "...")
         binaries_must_be_installed = binaries_must_be_installed + binaries_no_docker
-        pre_cmd = ['ssh', '-o UserKnownHostsFile=/dev/null' , '-o PasswordAuthentication=no',
+        pre_cmd = sudo_prefix + ['ssh', '-o UserKnownHostsFile=/dev/null' , '-o PasswordAuthentication=no',
                    '-o StrictHostKeyChecking=no', '-o ConnectTimeout=10', ssh_cmd[4:]]
 
         if not skip_ping:
             at_char = ssh_cmd.index('@')
             ip = ssh_cmd[at_char+1:]
-            ping_cmd = run(['ping', '-c1', '-w10', ip], stdout=PIPE, stderr=PIPE)
+            ping_cmd = run(sudo_prefix + ['ping', '-c1', '-w10', ip], stdout=PIPE, stderr=PIPE)
             if ping_cmd.returncode != 0:
                 print(tc.red + "No connectivity to " + tc.yellow + ip + tc.normal)
                 #sys.exit(1)
 
         ssh_test = run(pre_cmd + [':'], stdout=PIPE, stderr=PIPE)
         if ssh_test.returncode != 0:
-            ssh_copy = run(['ssh-copy-id', ssh_cmd[4:]], stderr=PIPE)
+            ssh_copy = run(sudo_prefix + ['ssh-copy-id', ssh_cmd[4:]], stderr=PIPE)
             if ssh_copy.returncode != 0:
                 print(tc.red + "SSH connection failed" + tc.normal)
                 sys.exit(1)

updates/1.54.0.sh

@@ -26,7 +26,7 @@ done
 echo "done."
 
 echo "Updating PHP package signing key..."
-apt-get update
+apt-get update ||:
 apt-get install --no-install-recommends -y gnupg2
 
 apt-key adv --fetch-keys https://packages.sury.org/php/apt.gpg

updates/1.55.0.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+apt-get update
+apt-get install -y --no-install-recommends logrotate

updates/1.55.2.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+source /usr/local/etc/library.sh
+
+run_app nc-autoupdate-nc
+
+install_template "mysql/91-ncp.cnf.sh" "/etc/mysql/mariadb.conf.d/91-ncp.cnf"
+service mariadb reload

updates/1.55.3.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+! [ -f /etc/cron.d/ncp-previews-auto ] || mv /etc/cron.d/ncp-previews-auto /etc/cron.d/nc-previews-auto

updates/1.55.4.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -eu -o pipefail
+
+echo "Update DB row format ..."
+mysql -u root -N nextcloud -e "SELECT CONCAT('ALTER TABLE \`', table_name, '\` row_format=DYNAMIC;') FROM information_schema.tables WHERE table_schema = 'nextcloud' AND engine = 'InnoDB' AND row_format != 'Dynamic';" | mysql -u root nextcloud
+echo "Done."
+

updates/1.56.0.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+if ncc app_api:daemon:list | grep 'No registered daemon configs.' > /dev/null 2>&1
+then
+  ncc app:disable app_api
+fi
+
+cat > /etc/systemd/system/nextcloud-ai-worker@.service <<'EOF'
+[Unit]
+Description=Nextcloud AI worker %i
+After=network.target
+
+[Service]
+ExecStart=php occ background-job:worker -t 60 'OC\\TaskProcessing\\SynchronousBackgroundJob'
+Restart=always
+StartLimitInterval=60
+StartLimitBurst=10
+WorkingDirectory=/var/www/nextcloud
+User=www-data
+
+[Install]
+WantedBy=multi-user.target
+EOF
+max="$(nproc || echo '2')"
+max="$((max-1))"
+for i in $(seq 1 "$max")
+do
+  systemctl enable --now "nextcloud-ai-worker@${i}.service"
+done
+
+exit 0