diff --git a/Containers/apache/supervisord.conf b/Containers/apache/supervisord.conf index d6a938034e50..7ab935e43fce 100644 --- a/Containers/apache/supervisord.conf +++ b/Containers/apache/supervisord.conf @@ -9,8 +9,8 @@ logfile_backups=10 loglevel=error [program:apache] -# stdout_logfile=/dev/stdout -# stdout_logfile_maxbytes=0 +# Stdout logging is disabled as otherwise the logs are spammed +stdout_logfile=NONE stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 command=apachectl -DFOREGROUND diff --git a/Containers/borgbackup/backupscript.sh b/Containers/borgbackup/backupscript.sh index 91086d636cc0..7dfe84312f69 100644 --- a/Containers/borgbackup/backupscript.sh +++ b/Containers/borgbackup/backupscript.sh @@ -66,7 +66,9 @@ if [ -n "$BORG_REMOTE_REPO" ] && ! [ -f "$BORGBACKUP_KEY" ]; then ssh-keygen -f "$BORGBACKUP_KEY" -N "" echo "You should configure the remote to accept this public key" fi -echo "Your public ssh key for borgbackup is: $(cat "$BORGBACKUP_KEY.pub")" +if [ -n "$BORG_REMOTE_REPO" ] && [ -f "$BORGBACKUP_KEY.pub" ]; then + echo "Your public ssh key for borgbackup is: $(cat "$BORGBACKUP_KEY.pub")" +fi # Do the backup if [ "$BORG_MODE" = backup ]; then diff --git a/Containers/clamav/Dockerfile b/Containers/clamav/Dockerfile index 81310d2fd2f0..5e3adbe86a6e 100644 --- a/Containers/clamav/Dockerfile +++ b/Containers/clamav/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:latest # Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/1.3/alpine/Dockerfile -FROM clamav/clamav:1.4.1-11 +FROM clamav/clamav:1.4.1-12 COPY clamav.conf /clamav.conf COPY --chmod=775 start.script /start.script diff --git a/Containers/docker-socket-proxy/Dockerfile b/Containers/docker-socket-proxy/Dockerfile index a6e2a10c83e8..6f98bb86a02a 100644 --- a/Containers/docker-socket-proxy/Dockerfile +++ b/Containers/docker-socket-proxy/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:latest -FROM haproxy:3.0.5-alpine +FROM haproxy:3.0.6-alpine # hadolint ignore=DL3002 USER root diff --git a/Containers/mastercontainer/supervisord.conf b/Containers/mastercontainer/supervisord.conf index f64c97258fa7..fa5d084594bc 100644 --- a/Containers/mastercontainer/supervisord.conf +++ b/Containers/mastercontainer/supervisord.conf @@ -9,16 +9,16 @@ loglevel=error user=root [program:php-fpm] -# stdout_logfile=/dev/stdout -# stdout_logfile_maxbytes=0 +# Stdout logging is disabled as otherwise the logs are spammed +stdout_logfile=NONE stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 command=php-fpm user=root [program:apache] -# stdout_logfile=/dev/stdout -# stdout_logfile_maxbytes=0 +# Stdout logging is disabled as otherwise the logs are spammed +stdout_logfile=NONE stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 command=httpd -DFOREGROUND @@ -58,9 +58,7 @@ user=root [program:domain-validator] # Logging is disabled as otherwise all attempts will be logged which spams the logs -# stdout_logfile=/dev/stdout -# stdout_logfile_maxbytes=0 -# stderr_logfile=/dev/stderr -# stderr_logfile_maxbytes=0 +stdout_logfile=NONE +stderr_logfile=NONE command=php -S 127.0.0.1:9876 /var/www/docker-aio/php/domain-validator.php user=www-data diff --git a/Containers/nextcloud/Dockerfile b/Containers/nextcloud/Dockerfile index ce49986379f0..a8a300e699ea 100644 --- a/Containers/nextcloud/Dockerfile +++ b/Containers/nextcloud/Dockerfile @@ -8,7 +8,7 @@ ENV SOURCE_LOCATION=/usr/src/nextcloud ENV REDIS_DB_INDEX=0 # AIO settings start # Do not remove or change this line! -ENV NEXTCLOUD_VERSION=29.0.9 +ENV NEXTCLOUD_VERSION=30.0.2 ENV AIO_TOKEN=123456 ENV AIO_URL=localhost # AIO settings end # Do not remove or change this line! diff --git a/Containers/nextcloud/notify-all.sh b/Containers/nextcloud/notify-all.sh index b11130d1c948..f4dfa0fd8f91 100644 --- a/Containers/nextcloud/notify-all.sh +++ b/Containers/nextcloud/notify-all.sh @@ -20,7 +20,7 @@ mapfile -t NC_USERS <<< "$NC_USERS" for user in "${NC_USERS[@]}" do echo "Posting '$SUBJECT' to: $user" - "${COMMAND[@]}" notification:generate "$user" "$NC_DOMAIN: $SUBJECT" -l "$MESSAGE" + "${COMMAND[@]}" notification:generate "$user" "$NC_DOMAIN: $SUBJECT" -l "$MESSAGE" --object-type='update' --object-id="$SUBJECT" done echo "Done!" diff --git a/Containers/nextcloud/notify.sh b/Containers/nextcloud/notify.sh index f74ec16bf6e5..2ac4ceac53dd 100644 --- a/Containers/nextcloud/notify.sh +++ b/Containers/nextcloud/notify.sh @@ -28,7 +28,7 @@ done for admin in "${NC_ADMIN_USER[@]}" do echo "Posting '$SUBJECT' to: $admin" - "${COMMAND[@]}" notification:generate "$admin" "$NC_DOMAIN: $SUBJECT" -l "$MESSAGE" + "${COMMAND[@]}" notification:generate "$admin" "$NC_DOMAIN: $SUBJECT" -l "$MESSAGE" --object-type='update' --object-id="$SUBJECT" done echo "Done!" diff --git a/app/appinfo/info.xml b/app/appinfo/info.xml index e064273dd72c..43c22ebd1a71 100644 --- a/app/appinfo/info.xml +++ b/app/appinfo/info.xml @@ -5,7 +5,7 @@ Nextcloud All-in-One Provides a login link for admins. Add a link to the admin settings that gives access to the Nextcloud All-in-One admin interface - 0.6.0 + 0.7.0 agpl Azul AllInOne @@ -13,7 +13,7 @@ monitoring https://github.com/nextcloud/all-in-one/issues - + diff --git a/php/composer.lock b/php/composer.lock index 5f7b5f0c6046..27c1751c8dac 100644 --- a/php/composer.lock +++ b/php/composer.lock @@ -1632,16 +1632,16 @@ }, { "name": "twig/twig", - "version": "v3.14.1", + "version": "v3.14.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "f405356d20fb43603bcadc8b09bfb676cb04a379" + "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/f405356d20fb43603bcadc8b09bfb676cb04a379", - "reference": "f405356d20fb43603bcadc8b09bfb676cb04a379", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a", + "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a", "shasum": "" }, "require": { @@ -1695,7 +1695,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.14.1" + "source": "https://github.com/twigphp/Twig/tree/v3.14.2" }, "funding": [ { @@ -1707,7 +1707,7 @@ "type": "tidelift" } ], - "time": "2024-11-06T18:17:38+00:00" + "time": "2024-11-07T12:36:22+00:00" } ], "packages-dev": [ @@ -2642,23 +2642,23 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.9.0", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "1fb5ba8d045f5dd984ebded5b1cc66f29459422d" + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/1fb5ba8d045f5dd984ebded5b1cc66f29459422d", - "reference": "1fb5ba8d045f5dd984ebded5b1cc66f29459422d", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a", + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", - "phpstan/phpdoc-parser": "^1.18" + "phpstan/phpdoc-parser": "^1.18|^2.0" }, "require-dev": { "ext-tokenizer": "*", @@ -2694,9 +2694,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.9.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0" }, - "time": "2024-11-03T20:11:34+00:00" + "time": "2024-11-09T15:12:26+00:00" }, { "name": "phpstan/phpdoc-parser", diff --git a/php/templates/containers.twig b/php/templates/containers.twig index d26d3f570822..b2640b403d82 100644 --- a/php/templates/containers.twig +++ b/php/templates/containers.twig @@ -17,7 +17,7 @@
-

Nextcloud AIO v9.9.0

+

Nextcloud AIO v10.0.0

{# Add 2nd tab warning #} @@ -33,7 +33,7 @@ {% set isBackupOrRestoreRunning = false %} {% set isApacheStarting = false %} {# Setting newMajorVersion to '' will hide corresponding options/elements, can be set to an integer like 26 in order to show corresponding elements. If set, also increase installLatestMajor in https://github.com/nextcloud/all-in-one/blob/main/php/src/Controller/DockerController.php #} - {% set newMajorVersion = 30 %} + {% set newMajorVersion = '' %} {% if is_backup_container_running == true %} {% if borg_backup_mode == 'backup' or borg_backup_mode == 'restore' %} @@ -490,8 +490,10 @@

Reset backup location

If the configured backup host location {{ borg_backup_host_location }} - {% if borg_remote_repo %}or the remote repo {{ borg_remote_repo }} is wrong{% endif %}, - you can reset it by clicking on the button below. + {% if borg_remote_repo %} + or the remote repo {{ borg_remote_repo }} + {% endif %} + is wrong, you can reset it by clicking on the button below.