Yaml updates (#8636)

manual-install/latest.yml

@@ -60,8 +60,7 @@ services:
     restart: unless-stopped
     read_only: true
     tmpfs:
-      - /var/log/supervisord
-      - /var/run/supervisord
+      - /run
       - /usr/local/apache2/logs
       - /tmp
       - /home/www-data
@@ -259,7 +258,7 @@ services:
     init: true
     healthcheck:
       start_period: 60s
-      test: /healthcheck.sh
+      test: /usr/bin/coolwsd --probe --use-env-vars
       interval: 30s
       timeout: 30s
       start_interval: 5s
@@ -268,7 +267,7 @@ services:
       - "9980"
     environment:
       - aliasgroup1=https://${NC_DOMAIN}:443,http://nextcloud-aio-apache.nextcloud-aio:23973
-      - extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:logging.disable_server_audit=true --o:welcome.enable=false --o:fetch_update_check=0 --o:allow_update_popup=false --o:remote_font_config.url=https://${NC_DOMAIN}/apps/richdocuments/settings/fonts.json --o:net.post_allow.host[0]=.+
+      - extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:logging.disable_server_audit=true --o:welcome.enable=false --o:fetch_update_check=0 --o:allow_update_popup=false --o:logging.level=${COLLABORA_LOG_LEVEL} --o:logging.level_startup=${COLLABORA_LOG_LEVEL} --o:remote_font_config.url=https://${NC_DOMAIN}/apps/richdocuments/settings/fonts.json --o:net.post_allow.host[0]=.+
       - dictionaries=${COLLABORA_DICTIONARIES}
       - AIO_LOG_LEVEL
       - TZ=${TIMEZONE}
@@ -321,8 +320,7 @@ services:
       - talk-recording
     read_only: true
     tmpfs:
-      - /var/log/supervisord
-      - /var/run/supervisord
+      - /run
       - /opt/eturnal/run
       - /conf
       - /tmp
@@ -363,7 +361,7 @@ services:
   nextcloud-aio-clamav:
     image: ghcr.io/nextcloud-releases/aio-clamav:latest
     user: "100"
-    init: false
+    init: true
     healthcheck:
       start_period: 60s
       test: /healthcheck.sh
@@ -384,11 +382,9 @@ services:
       - clamav
     read_only: true
     tmpfs:
+      - /run
       - /tmp
       - /var/log/clamav
-      - /run/clamav
-      - /var/log/supervisord
-      - /var/run/supervisord
     cap_drop:
       - NET_RAW
 

manual-install/sample.conf

@@ -31,6 +31,7 @@ APACHE_MAX_SIZE=1073741824          # This needs to be an integer and in sync wi
 APACHE_PORT=443          # Changing this to a different value than 443 will allow you to run it behind a web server or reverse proxy (like Apache, Nginx, Caddy, Cloudflare Tunnel and else).
 ADDITIONAL_COLLABORA_OPTIONS=['--o:security.seccomp=true']          # You can add additional collabora options here by using the array syntax.
 COLLABORA_DICTIONARIES="de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru"        # You can change this in order to enable other dictionaries for collabora
+COLLABORA_LOG_LEVEL=warning          # Allows to adjust the log level of the Collabora container. Valid values are none, fatal, critical, error, warning, notice, information, debug and trace.
 FULLTEXTSEARCH_JAVA_OPTIONS="-Xms512M -Xmx512M"          # Allows to adjust the fulltextsearch java options.
 INSTALL_LATEST_MAJOR=no        # Setting this to yes will install the latest Major Nextcloud version upon the first installation
 NEXTCLOUD_ADDITIONAL_APKS=imagemagick        # This allows to add additional packages to the Nextcloud container permanently. Default is imagemagick but can be overwritten by modifying this value.