Update psalm baseline

Signed-off-by: GitHub <noreply@github.com>
Merge pull request #7328 from nextcloud/enh/noid/update-helm
2025-12-19 14:06:50 +00:00 · 2025-12-17 04:17:47 +00:00 · 2025-12-16 13:01:52 +01:00 · 2025-12-16 12:09:53 +01:00 · 2025-12-16 11:09:08 +00:00 · 2025-12-16 11:41:21 +01:00
6 changed files with 11 additions and 3 deletions
--- a/Containers/nextcloud/config/s3.config.php
+++ b/Containers/nextcloud/config/s3.config.php
@ -6,9 +6,10 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
  $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE');
  $multibucket = getenv('OBJECTSTORE_S3_MULTIBUCKET');
  $CONFIG = array(
-    $multibucket === 'true' ? 'objectstore_multibucket' : 'objectstore' => array(
+    'objectstore' => array(
      'class' => '\OC\Files\ObjectStore\S3',
      'arguments' => array(
+        'multibucket' => $multibucket === 'true',
        'bucket' => getenv('OBJECTSTORE_S3_BUCKET'),
        'key' => getenv('OBJECTSTORE_S3_KEY') ?: '',
        'secret' => getenv('OBJECTSTORE_S3_SECRET') ?: '',
--- a/Containers/nextcloud/entrypoint.sh
+++ b/Containers/nextcloud/entrypoint.sh
@ -972,6 +972,9 @@ if [ "$FULLTEXTSEARCH_ENABLED" = 'yes' ]; then
        php /var/www/html/occ app:disable fulltextsearch_elasticsearch
        php /var/www/html/occ app:disable files_fulltextsearch
    else
+        if [ -z "$FULLTEXTSEARCH_PROTOCOL" ]; then
+            FULLTEXTSEARCH_PROTOCOL="http"
+        fi
        if ! [ -d "/var/www/html/custom_apps/fulltextsearch" ]; then
            php /var/www/html/occ app:install fulltextsearch
        elif [ "$(php /var/www/html/occ config:app:get fulltextsearch enabled)" != "yes" ]; then
@ -994,7 +997,7 @@ if [ "$FULLTEXTSEARCH_ENABLED" = 'yes' ]; then
            php /var/www/html/occ app:update files_fulltextsearch
        fi
        php /var/www/html/occ fulltextsearch:configure '{"search_platform":"OCA\\FullTextSearch_Elasticsearch\\Platform\\ElasticSearchPlatform"}'
-        php /var/www/html/occ fulltextsearch_elasticsearch:configure "{\"elastic_host\":\"http://$FULLTEXTSEARCH_USER:$FULLTEXTSEARCH_PASSWORD@$FULLTEXTSEARCH_HOST:$FULLTEXTSEARCH_PORT\",\"elastic_index\":\"$FULLTEXTSEARCH_INDEX\"}"
+        php /var/www/html/occ fulltextsearch_elasticsearch:configure "{\"elastic_host\":\"$FULLTEXTSEARCH_PROTOCOL://$FULLTEXTSEARCH_USER:$FULLTEXTSEARCH_PASSWORD@$FULLTEXTSEARCH_HOST:$FULLTEXTSEARCH_PORT\",\"elastic_index\":\"$FULLTEXTSEARCH_INDEX\"}"
        php /var/www/html/occ files_fulltextsearch:configure "{\"files_pdf\":true,\"files_office\":true}"

        # Do the index
--- a/manual-install/latest.yml
+++ b/manual-install/latest.yml
@ -165,6 +165,7 @@ services:
      - PHP_MEMORY_LIMIT=${NEXTCLOUD_MEMORY_LIMIT}
      - FULLTEXTSEARCH_ENABLED
      - FULLTEXTSEARCH_HOST=nextcloud-aio-fulltextsearch
+      - FULLTEXTSEARCH_PROTOCOL=http
      - FULLTEXTSEARCH_PORT=9200
      - FULLTEXTSEARCH_USER=elastic
      - FULLTEXTSEARCH_INDEX=nextcloud-aio
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml
@ -114,6 +114,8 @@ spec:
              value: "{{ .Values.FULLTEXTSEARCH_PASSWORD }}"
            - name: FULLTEXTSEARCH_PORT
              value: "9200"
+            - name: FULLTEXTSEARCH_PROTOCOL
+              value: http
            - name: FULLTEXTSEARCH_USER
              value: elastic
            - name: IMAGINARY_ENABLED
--- a/php/containers.json
+++ b/php/containers.json
@ -237,6 +237,7 @@
        "PHP_MEMORY_LIMIT=%NEXTCLOUD_MEMORY_LIMIT%",
        "FULLTEXTSEARCH_ENABLED=%FULLTEXTSEARCH_ENABLED%",
        "FULLTEXTSEARCH_HOST=nextcloud-aio-fulltextsearch",
+        "FULLTEXTSEARCH_PROTOCOL=http",
        "FULLTEXTSEARCH_PORT=9200",
        "FULLTEXTSEARCH_USER=elastic",
        "FULLTEXTSEARCH_INDEX=nextcloud-aio",
--- a/php/psalm-baseline.xml
+++ b/php/psalm-baseline.xml
@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="6.14.1@cf26e6debc366836754f359ece5b68629a1ee185"/>
+<files psalm-version="6.14.2@bbd217fc98c0daa0a13aea2a7f119d03ba3fc9a0"/>
Author	SHA1	Message	Date
nextcloud-command	fe20afb807	Update psalm baseline Signed-off-by: GitHub <noreply@github.com>	2025-12-17 04:17:47 +00:00
Simon L.	1dadf3ff10	Merge pull request #7328 from nextcloud/enh/noid/update-helm Some checks failed Codespell / Check spelling (push) Waiting to run Details Helm Chart Releaser / release (push) Waiting to run Details Shellcheck / Check Shell (push) Waiting to run Details Docker Lint / docker-lint (push) Has been cancelled Details Json Validator / Json Validator (push) Has been cancelled Details Lint php / php-lint (push) Has been cancelled Details PHP Deprecation Detector / PHP Deprecation Detector (push) Has been cancelled Details Static analysis / static-psalm-analysis (push) Has been cancelled Details Lint php / php-lint-summary (push) Has been cancelled Details	2025-12-16 13:01:52 +01:00
Simon L.	7aa145be35	Merge pull request #7327 from nextcloud/aio-yaml-update Yaml updates	2025-12-16 12:09:53 +01:00
szaimen	0f0265abd4	Yaml updates Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2025-12-16 11:09:08 +00:00
Simon L.	da9276a964	Merge pull request #7326 from nextcloud/enh/noid/allow-configure-fts-protocol nextcloud: allow to configure `FULLTEXTSEARCH_PROTOCOL`	2025-12-16 11:41:21 +01:00
Simon L.	de62f78920	Merge pull request #7325 from nextcloud/enh/noid/adjust-multibucket-setting s3-config: adjust the multibucket setting	2025-12-16 11:40:23 +01:00
Simon L.	f415bf201d	s3-config: adjust the multibucket setting Signed-off-by: Simon L. <szaimen@e.mail.de> Co-Authored-By: Kate <26026535+provokateurin@users.noreply.github.com>	2025-12-16 10:43:31 +01:00
Simon L.	a66445d443	nextcloud: allow to configure `FULLTEXTSEARCH_PROTOCOL` Signed-off-by: Simon L. <szaimen@e.mail.de>	2025-12-16 10:40:45 +01:00