External-Mirrors/nextcloudpi
2
0
Fork 0
mirror of https://github.com/nextcloud/nextcloudpi.git synced 2026-01-10 15:12:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2044 from nextcloud/devel

Browse Source 
Support for NC 31 + Fixes
This commit is contained in:
Tobias Knöppler 2025-03-24 11:29:49 +00:00 committed by GitHub
commit 2ada653882
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build-docker.yml vendored
View File

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

20
.github/workflows/build-lxd.yml vendored
View File

@ -91,7 +91,7 @@ jobs:
sudo "$LXC" image export -q ncp/"${version}" "output/${ARTIFACT_FILE}" sudo "$LXC" image export -q ncp/"${version}" "output/${ARTIFACT_FILE}"
echo "artifact_file=${ARTIFACT_FILE}.tar.gz" >> $GITHUB_OUTPUT echo "artifact_file=${ARTIFACT_FILE}.tar.gz" >> $GITHUB_OUTPUT
- name: upload LXD image to artifact store - name: upload LXD image to artifact store
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: "${{ env.ARTIFACT_NAME }}" name: "${{ env.ARTIFACT_NAME }}"
path: "output/${{ steps.pack-lxd.outputs.artifact_file }}" path: "output/${{ steps.pack-lxd.outputs.artifact_file }}"
@ -639,7 +639,7 @@ jobs:
- name: Setup Selenium - name: Setup Selenium
run: pip install selenium run: pip install selenium
- name: download LXD image from artifact store - name: download LXD image from artifact store
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: ${{ env.ARTIFACT_NAME }} name: ${{ env.ARTIFACT_NAME }}
- name: Remove old lxd images - name: Remove old lxd images
@ -668,18 +668,18 @@ jobs:
- name: Test LXD Image - name: Test LXD Image
working-directory: ./tests working-directory: ./tests
run: | run: |
"$LXC" exec ncp -- bash -c 'tail -f /var/log/ncp.log' |& awk '{ print "NCP::" $0 }' & 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 || { python activation_tests.py --no-gui "nextcloudpi.local" 443 4443 || {
echo "Activation test failed!" echo "Activation test failed!"
echo "Geckodriver logs:" echo "Geckodriver logs:"
tail -n 20 geckodriver.log >&2 || true tail -n 20 geckodriver.log >&2 || true
echo "================" echo "================"
echo "ncp.log: " 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 "================"
echo "nextcloud log: " echo "nextcloud log: "
datadir="$("$LXC" exec ncp -- ncc config:system:get datadirectory)" 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 exit 1
} }
python nextcloud_tests.py --no-gui "nextcloudpi.local" 443 4443 || { python nextcloud_tests.py --no-gui "nextcloudpi.local" 443 4443 || {
@ -688,11 +688,11 @@ jobs:
tail -n 20 geckodriver.log >&2 || true tail -n 20 geckodriver.log >&2 || true
echo "================" echo "================"
echo "ncp.log: " 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 "================"
echo "nextcloud log: " echo "nextcloud log: "
datadir="$("$LXC" exec ncp -- ncc config:system:get datadirectory)" datadir="$(sudo "$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 exit 1
} }
USE_INCUS="$USE_INCUS" python system_tests.py --non-interactive || { USE_INCUS="$USE_INCUS" python system_tests.py --non-interactive || {
@ -714,7 +714,7 @@ jobs:
LXD_ARTIFACT_FILE: ${{ needs.build-current.outputs.artifact_file }} LXD_ARTIFACT_FILE: ${{ needs.build-current.outputs.artifact_file }}
steps: steps:
- name: download LXD image from artifact store - name: download LXD image from artifact store
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: ${{ env.LXD_ARTIFACT_NAME }} name: ${{ env.LXD_ARTIFACT_NAME }}
- name: convert to LXC image - name: convert to LXC image
@ -732,7 +732,7 @@ jobs:
echo "artifact_file=${LXC_ARTIFACT_FILE?}" >> $GITHUB_OUTPUT; echo "artifact_file=${LXC_ARTIFACT_FILE?}" >> $GITHUB_OUTPUT;
echo "artifact_name=${LXD_ARTIFACT_NAME//lxd/lxc}" >> $GITHUB_OUTPUT; echo "artifact_name=${LXD_ARTIFACT_NAME//lxd/lxc}" >> $GITHUB_OUTPUT;
- name: upload LXD image to artifact store - name: upload LXD image to artifact store
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: "${{ steps.lxd-to-lxc.outputs.artifact_name }}" name: "${{ steps.lxd-to-lxc.outputs.artifact_name }}"
path: "output/${{ steps.lxd-to-lxc.outputs.artifact_file }}" path: "output/${{ steps.lxd-to-lxc.outputs.artifact_file }}"

6
.github/workflows/build-sd-images.yml vendored
View File

@ -98,12 +98,12 @@ jobs:
echo "ARTIFACT_FILE=${IMG}" >> $GITHUB_ENV echo "ARTIFACT_FILE=${IMG}" >> $GITHUB_ENV
- name: "Upload Armbian logs" - name: "Upload Armbian logs"
if: ${{ failure() }} if: ${{ failure() }}
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: ${{ github.run_id }}-${{ inputs.board_id }}-logs name: ${{ github.run_id }}-${{ inputs.board_id }}-logs
path: armbian/output path: armbian/output
- name: upload image to artifact store - name: upload image to artifact store
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: ${{ github.run_id }}-${{ inputs.board_id }}-image name: ${{ github.run_id }}-${{ inputs.board_id }}-image
path: output/${{ env.ARTIFACT_FILE }} path: output/${{ env.ARTIFACT_FILE }}
@ -134,7 +134,7 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
ref: "${{ env.VERSION }}" ref: "${{ env.VERSION }}"
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v4
with: with:
name: ${{ env.ARTIFACT_ID }} name: ${{ env.ARTIFACT_ID }}
path: output path: output

2
.github/workflows/publish-image.yml vendored
View File

@ -32,7 +32,7 @@ jobs:
with: with:
ref: "${{ env.VERSION }}" ref: "${{ env.VERSION }}"
- name: "Download artifact" - name: "Download artifact"
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: ${{ inputs.artifact_id }} name: ${{ inputs.artifact_id }}
path: artifacts path: artifacts

8
.github/workflows/vm-tests.yml vendored
View File

@ -52,7 +52,7 @@ jobs:
ssh-keygen -t ed25519 -f ".ssh/automation_ssh_key" ssh-keygen -t ed25519 -f ".ssh/automation_ssh_key"
. /ncp-test-automation/bin/entrypoint.sh . /ncp-test-automation/bin/entrypoint.sh
- name: upload ssh private key to artifact store - name: upload ssh private key to artifact store
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: "${{ env.SSH_ARTIFACT_NAME }}" name: "${{ env.SSH_ARTIFACT_NAME }}"
path: /__w/nextcloudpi/nextcloudpi/.ssh path: /__w/nextcloudpi/nextcloudpi/.ssh
@ -302,7 +302,7 @@ jobs:
ssh-keygen -t ed25519 -f "/__w/nextcloudpi/nextcloudpi/.ssh/automation_ssh_key" ssh-keygen -t ed25519 -f "/__w/nextcloudpi/nextcloudpi/.ssh/automation_ssh_key"
. /ncp-test-automation/bin/entrypoint.sh . /ncp-test-automation/bin/entrypoint.sh
- name: upload ssh private key to artifact store - name: upload ssh private key to artifact store
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: "${{ env.SSH_ARTIFACT_NAME }}" name: "${{ env.SSH_ARTIFACT_NAME }}"
path: /__w/nextcloudpi/nextcloudpi/.ssh path: /__w/nextcloudpi/nextcloudpi/.ssh
@ -514,7 +514,7 @@ jobs:
UID: ${{ github.run_id }}-install UID: ${{ github.run_id }}-install
steps: steps:
- name: download ssh private key from artifact store - 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) }} if: ${{ contains('success|failure', env.TEST_RESULT) }}
with: with:
name: ${{ env.SSH_ARTIFACT_NAME }} name: ${{ env.SSH_ARTIFACT_NAME }}
@ -621,7 +621,7 @@ jobs:
SSH_ARTIFACT_NAME: "${{ needs.dist-upgrade-test.outputs.ssh_artifact_name }}" SSH_ARTIFACT_NAME: "${{ needs.dist-upgrade-test.outputs.ssh_artifact_name }}"
steps: steps:
- name: download ssh private key from artifact store - 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) }} if: ${{ contains('success|failure', env.TEST_RESULT) }}
with: with:
name: ${{ env.SSH_ARTIFACT_NAME }} name: ${{ env.SSH_ARTIFACT_NAME }}

2
bin/ncp/CONFIG/nc-datadir.sh
View File

@ -135,7 +135,7 @@ configure()
create_tmp_upload_dir create_tmp_upload_dir
ncc config:system:set tempdirectory --value "$DATADIR/tmp" \ ncc config:system:set tempdirectory --value "$DATADIR/tmp" \
|| sed -i "s|'tempdirectory' =>.*|'tempdirectory' => '${DATADIR}/tmp',|" "${NCDIR?}"/config/config.php || 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|^;\?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 sed -i "s|^;\?sys_temp_dir =.*$|sys_temp_dir = ${DATADIR}/tmp|" /etc/php/"${PHPVER}"/fpm/php.ini

4
bin/ncp/CONFIG/nc-limits.sh
View File

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

11
changelog.md
View File

@ -1,5 +1,16 @@
# NextcloudPi Changelog # NextcloudPi Changelog
## [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 ## [v1.55.3](https://github.com/nextcloud/nextcloudpi/tree/v1.55.3) (2024-11-08) Nextcloud 30 and fixes
### Changes ### Changes

2
etc/library.sh
View File

@ -22,7 +22,7 @@ export DB_PREFIX="$(php -r 'include("/var/www/nextcloud/config/config.php"); ech
export SYSTEMD_PAGER= export SYSTEMD_PAGER=
[[ -f "$NCPCFG" ]] || export NCPCFG=/usr/local/etc/ncp.cfg [[ -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" ]] if [[ "$(ps -p 1 --no-headers -o "%c")" == "systemd" ]] && ! [[ -d "/run/systemd/system" ]]
then then

2
etc/ncp-config.d/nc-nextcloud.cfg
View File

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

2
etc/ncp.cfg
View File

@ -1,5 +1,5 @@
{ {
"nextcloud_version": "30.0.1", "nextcloud_version": "31.0.2",
"php_version": "8.3", "php_version": "8.3",
"release": "bookworm" "release": "bookworm"
} }

2
ncp-app/appinfo/info.xml
View File

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

2
ncp-previewgenerator/ncp-previewgenerator-nc21/appinfo/info.xml
View File

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

2
updates/1.55.3.sh
View File

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

8
updates/1.55.4.sh Executable file
View File

@ -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."