Compare commits

..

3 Commits

Author SHA1 Message Date
nextcloud-command 52cde6b067 ci(actions): Update workflow templates from organization template repository
Signed-off-by: GitHub <noreply@github.com>
2026-06-07 03:29:20 +00:00
Simon L. 5393ffbb81 doc: add missing proxy header in reverse-proxy.md (#8260) 2026-06-04 22:15:38 +02:00
Clément Pivot 3cee8b2dda Update reverse-proxy.md
fix: add missing nginx proxy header

Signed-off-by: Clément Pivot <8830707+Clement-Pivot@users.noreply.github.com>
2026-06-04 20:45:56 +02:00
5 changed files with 52 additions and 32 deletions
+5
View File
@@ -0,0 +1,5 @@
# SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: MIT
6078222f7c61540504fa9892729f4a04 lint-php.yml
9fe5efdf1113d7fe92ba1f54f1111c4f psalm.yml
9dc6b717be0006fc7974a50351686fd7 sync-workflow-templates.yml
+21 -12
View File
@@ -8,15 +8,7 @@
name: Lint php name: Lint php
on: on: pull_request
pull_request:
paths:
- 'php/**'
push:
branches:
- main
paths:
- 'php/**'
permissions: permissions:
contents: read contents: read
@@ -26,11 +18,27 @@ concurrency:
cancel-in-progress: true cancel-in-progress: true
jobs: jobs:
matrix:
runs-on: ubuntu-latest-low
outputs:
php-min: ${{ steps.versions.outputs.php-min }}
php-max: ${{ steps.versions.outputs.php-max }}
steps:
- name: Checkout app
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
persist-credentials: false
- name: Get version matrix
id: versions
uses: icewind1991/nextcloud-version-matrix@8a7bac6300b2f0f3100088b297995a229558ddba # v1.3.2
php-lint: php-lint:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: matrix
strategy: strategy:
matrix: matrix:
php-versions: [ "8.5" ] php-versions: ['${{ needs.matrix.outputs.php-min }}', '${{ needs.matrix.outputs.php-max }}']
name: php-lint name: php-lint
@@ -41,16 +49,17 @@ jobs:
persist-credentials: false persist-credentials: false
- name: Set up php ${{ matrix.php-versions }} - name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0 uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
with: with:
php-version: ${{ matrix.php-versions }} php-version: ${{ matrix.php-versions }}
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
coverage: none coverage: none
ini-file: development ini-file: development
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Lint - name: Lint
run: cd php && composer run lint run: composer run lint
summary: summary:
permissions: permissions:
+23 -19
View File
@@ -8,15 +8,7 @@
name: Static analysis name: Static analysis
on: on: pull_request
pull_request:
paths:
- 'php/**'
push:
branches:
- main
paths:
- 'php/**'
concurrency: concurrency:
group: psalm-${{ github.head_ref || github.run_id }} group: psalm-${{ github.head_ref || github.run_id }}
@@ -36,20 +28,32 @@ jobs:
with: with:
persist-credentials: false persist-credentials: false
- name: Set up php - name: Get php version
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0 id: versions
uses: icewind1991/nextcloud-version-matrix@8a7bac6300b2f0f3100088b297995a229558ddba # v1.3.2
- name: Check enforcement of minimum PHP version ${{ steps.versions.outputs.php-min }} in psalm.xml
run: grep 'phpVersion="${{ steps.versions.outputs.php-min }}' psalm.xml
- name: Set up php${{ steps.versions.outputs.php-available }}
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
with: with:
php-version: 8.5 php-version: ${{ steps.versions.outputs.php-available }}
extensions: apcu extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
coverage: none coverage: none
ini-file: development ini-file: development
# Temporary workaround for missing pcntl_* in PHP 8.3
ini-values: disable_functions=
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Install dependencies and run psalm - name: Install dependencies
run: | run: |
set -x composer remove nextcloud/ocp --dev --no-scripts
cd php composer i
composer install
composer run psalm - name: Install nextcloud/ocp
run: composer require --dev nextcloud/ocp:dev-${{ steps.versions.outputs.branches-max }} --ignore-platform-reqs --with-dependencies
- name: Run coding standards check
run: composer run psalm -- --threads=1 --monochrome --no-progress --output-format=github
@@ -26,6 +26,7 @@ jobs:
matrix: matrix:
branches: branches:
- ${{ github.event.repository.default_branch }} - ${{ github.event.repository.default_branch }}
- 'stable34'
- 'stable33' - 'stable33'
- 'stable32' - 'stable32'
@@ -122,7 +123,7 @@ jobs:
- name: Create Pull Request - name: Create Pull Request
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1 uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
with: with:
token: ${{ secrets.COMMAND_BOT_WORKFLOWS }} # zizmor: ignore[secrets-outside-env] token: ${{ secrets.COMMAND_BOT_WORKFLOWS }}
commit-message: 'ci(actions): Update workflow templates from organization template repository' commit-message: 'ci(actions): Update workflow templates from organization template repository'
committer: GitHub <noreply@github.com> committer: GitHub <noreply@github.com>
author: nextcloud-command <nextcloud-command@users.noreply.github.com> author: nextcloud-command <nextcloud-command@users.noreply.github.com>
+1
View File
@@ -523,6 +523,7 @@ server {
location / { location / {
proxy_pass http://127.0.0.1:11000$request_uri; # Adjust to match APACHE_PORT and APACHE_IP_BINDING. See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md#adapting-the-sample-web-server-configurations-below proxy_pass http://127.0.0.1:11000$request_uri; # Adjust to match APACHE_PORT and APACHE_IP_BINDING. See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md#adapting-the-sample-web-server-configurations-below
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Port $server_port; proxy_set_header X-Forwarded-Port $server_port;
proxy_set_header X-Forwarded-Scheme $scheme; proxy_set_header X-Forwarded-Scheme $scheme;