Compare commits

...

68 Commits

Author SHA1 Message Date
Simon L
59421d51d2 increase to 7.6.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-11-02 13:53:58 +01:00
Simon L
c85bacc940 change php-max-children calculation
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-11-01 18:05:11 +01:00
Simon L
2221cc7f52 Merge pull request #3659 from Aytsuqi/main 2023-11-01 16:27:56 +01:00
Simon L
d121d97683 Merge pull request #3657 from nextcloud/dependabot/github_actions/helm/chart-testing-action-2.6.0 2023-11-01 16:26:52 +01:00
Aytsuqi
7060cba6c9 rewording reverse-proxy.md
following up on further discussion with szaimen and Zoey2936 on PR#3656 

Signed-off-by: Aytsuqi <141279848+Aytsuqi@users.noreply.github.com>
2023-11-01 16:12:39 +01:00
dependabot[bot]
e4c685c0e7 Bump helm/chart-testing-action from 2.5.0 to 2.6.0
Bumps [helm/chart-testing-action](https://github.com/helm/chart-testing-action) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/helm/chart-testing-action/releases)
- [Commits](https://github.com/helm/chart-testing-action/compare/v2.5.0...v2.6.0)

---
updated-dependencies:
- dependency-name: helm/chart-testing-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-11-01 12:31:35 +00:00
Simon L
a1bd8b0f07 Merge pull request #3656 from Aytsuqi/main
Update reverse-proxy.md typo
2023-11-01 13:19:17 +01:00
Aytsuqi
6133e82c14 Update reverse-proxy.md typo
Just a very little typo that confused me while I was reading documentation yesterday. I assume this was what the title wanted to convey?

Signed-off-by: Aytsuqi <141279848+Aytsuqi@users.noreply.github.com>
2023-11-01 12:08:29 +01:00
Simon L
e6b6ec4cfd update screenshot for npm conf
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-11-01 10:49:17 +01:00
xis
fe00d1dac8 Nextcloud-DLNA community container (#3614) 2023-10-31 18:25:34 +01:00
Simon L
38fb544090 Merge pull request #3653 from nextcloud/dependabot/github_actions/helm/chart-testing-action-2.5.0
Bump helm/chart-testing-action from 2.4.0 to 2.5.0
2023-10-31 17:41:08 +01:00
dependabot[bot]
ee86a9dd72 Bump helm/chart-testing-action from 2.4.0 to 2.5.0
Bumps [helm/chart-testing-action](https://github.com/helm/chart-testing-action) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/helm/chart-testing-action/releases)
- [Commits](https://github.com/helm/chart-testing-action/compare/v2.4.0...v2.5.0)

---
updated-dependencies:
- dependency-name: helm/chart-testing-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-31 12:44:01 +00:00
Simon L
fcfecb737c Merge pull request #3610 from ShapeShifter499/patch-1 2023-10-30 15:19:45 +01:00
Lance
7ffe4fbd5f Update migration.md, add links about synchronization
Make it more obvious about the added note on synchronizing after migration

Signed-off-by: Lance <Gero3977@gmail.com>
2023-10-30 07:11:31 -07:00
Simon L
1aa518d19c Merge pull request #3611 from nextcloud/enh/noid/database-host 2023-10-30 15:09:33 +01:00
Simon L
736c40ce30 Merge pull request #3651 from nextcloud/dependabot/docker/Containers/nextcloud/php-8.1.25-fpm-alpine3.18 2023-10-30 14:09:55 +01:00
Simon L
b6a5c7d048 Merge pull request #3650 from nextcloud/dependabot/docker/Containers/clamav/clamav/clamav-1.2.1-12 2023-10-30 14:09:43 +01:00
Simon L
dfc8b0e522 Merge pull request #3649 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-23.05.5.3.1 2023-10-30 14:09:31 +01:00
Simon L
3a3ddcad2e Merge pull request #3648 from nextcloud/dependabot/docker/Containers/mastercontainer/php-8.2.12-fpm-alpine3.18 2023-10-30 14:09:17 +01:00
Simon L
af278e8923 Merge pull request #3647 from nextcloud/dependabot/docker/Containers/mastercontainer/docker-24.0.7-cli 2023-10-30 14:09:06 +01:00
Simon L
1a1b15ecd8 Merge pull request #3646 from nextcloud/dependabot/docker/Containers/talk/nats-2.10.4-scratch 2023-10-30 14:08:53 +01:00
Simon L
7a337f4c89 Merge pull request #3645 from nextcloud/dependabot/docker/Containers/talk/strukturag/nextcloud-spreed-signaling-1.2.0 2023-10-30 14:08:40 +01:00
Simon L
02dde8e94c Merge pull request #3644 from nextcloud/aio-helm-update 2023-10-30 14:08:13 +01:00
Simon L
a15cf13119 Merge pull request #3643 from nextcloud/talk-container-update 2023-10-30 14:07:53 +01:00
dependabot[bot]
e548e4861f Bump php in /Containers/nextcloud
Bumps php from 8.1.24-fpm-alpine3.18 to 8.1.25-fpm-alpine3.18.

---
updated-dependencies:
- dependency-name: php
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-30 12:51:31 +00:00
dependabot[bot]
f585cc650f Bump clamav/clamav from 1.2.1-11 to 1.2.1-12 in /Containers/clamav
Bumps clamav/clamav from 1.2.1-11 to 1.2.1-12.

---
updated-dependencies:
- dependency-name: clamav/clamav
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-30 12:40:58 +00:00
dependabot[bot]
aec7df53c4 Bump collabora/code in /Containers/collabora
Bumps collabora/code from 23.05.5.2.1 to 23.05.5.3.1.

---
updated-dependencies:
- dependency-name: collabora/code
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-30 12:20:03 +00:00
dependabot[bot]
7466fb0e58 Bump php in /Containers/mastercontainer
Bumps php from 8.2.11-fpm-alpine3.18 to 8.2.12-fpm-alpine3.18.

---
updated-dependencies:
- dependency-name: php
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-30 12:12:11 +00:00
dependabot[bot]
0cf0215d23 Bump docker from 24.0.6-cli to 24.0.7-cli in /Containers/mastercontainer
Bumps docker from 24.0.6-cli to 24.0.7-cli.

---
updated-dependencies:
- dependency-name: docker
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-30 12:12:04 +00:00
dependabot[bot]
59d6a319d1 Bump nats from 2.10.3-scratch to 2.10.4-scratch in /Containers/talk
Bumps nats from 2.10.3-scratch to 2.10.4-scratch.

---
updated-dependencies:
- dependency-name: nats
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-30 12:11:25 +00:00
dependabot[bot]
7dd3622fd3 Bump strukturag/nextcloud-spreed-signaling in /Containers/talk
Bumps strukturag/nextcloud-spreed-signaling from 1.1.3 to 1.2.0.

---
updated-dependencies:
- dependency-name: strukturag/nextcloud-spreed-signaling
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-30 12:11:09 +00:00
szaimen
67fab3111b Helm Chart updates
Signed-off-by: GitHub <noreply@github.com>
2023-10-30 12:08:29 +00:00
szaimen
a68717847f talk-update automated change
Signed-off-by: GitHub <noreply@github.com>
2023-10-30 12:03:47 +00:00
Simon L
ebca5442ae Merge pull request #3642 from nextcloud/enh/noid/backup-additional-volumes 2023-10-30 12:08:05 +01:00
Simon L
918afa1a94 allow to back up empty additional volumes
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-10-30 10:57:59 +01:00
Simon L
54c806c960 update plex readme to use a better link
Signed-off-by: Simon L <szaimen@e.mail.de>

Signed-off-by: Simon L. <szaimen@e.mail.de>
2023-10-30 10:53:11 +01:00
Simon L
8b0d2b3534 Merge pull request #3594 from Habbie/patch-1 2023-10-30 10:50:30 +01:00
Simon L
9168bdaad5 adjust name in postgres container as well
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-10-30 10:48:27 +01:00
Simon L
9cbcb93c93 Merge pull request #3641 from nextcloud/enh/noid/enable-apps 2023-10-30 10:47:30 +01:00
Simon L
b36f71ff74 also enable integration apps after installing them
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-10-30 10:44:09 +01:00
Simon L
f4ee3ff6b0 Merge pull request #3639 from nextcloud/enh/noid/fix-generated-images-path 2023-10-30 09:39:49 +01:00
Simon L
1937fde61d add AIO_DATABASE_HOST
Allow to get local ip-address of database container which allows to talk to it even in host mode (the container that requires this needs to be started first then)

Signed-off-by: Simon L <szaimen@e.mail.de>
2023-10-30 08:54:05 +01:00
Simon L
2156e60d18 Merge pull request #3608 from nextcloud/enh/noid/change-priority 2023-10-30 08:50:55 +01:00
Simon L
faaee07000 Merge pull request #3584 from nextcloud/enh/noid/postgres-close-idling-sessions 2023-10-30 08:48:32 +01:00
Simon L
a770fc879d Merge pull request #3583 from nextcloud/enh/noid/improve-pullcontainer 2023-10-30 08:47:45 +01:00
Simon L
a80ab8aff2 Merge pull request #3619 from nextcloud/nextcloud-container-update 2023-10-30 08:43:53 +01:00
Simon L
b0b0adf7ce Merge pull request #3618 from nextcloud/talk-container-update 2023-10-30 08:43:27 +01:00
Simon L
3f9f5d1e95 Merge pull request #3617 from nextcloud/dependabot/docker/Containers/clamav/clamav/clamav-1.2.1-11 2023-10-30 08:43:10 +01:00
Simon L
deec58be46 Merge pull request #3612 from nextcloud/imaginary-container-update 2023-10-30 08:42:52 +01:00
Simon L
269731530b Merge pull request #3609 from nextcloud/aio-dependency-update 2023-10-30 08:42:18 +01:00
Simon L
99b5db03b2 Merge pull request #3591 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-23.05.5.2.1 2023-10-30 08:41:48 +01:00
Simon L
2d3b35ed3d local-ai - fix path to generated images
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-10-30 08:37:10 +01:00
Simon L
b9ee292f8a Fix typo
Signed-off-by: Simon L. <szaimen@e.mail.de>
2023-10-30 03:14:20 +01:00
Lance
dadb57f74f Update migration.md, fix spelling
Fix a spelling mistake

Signed-off-by: Lance <Gero3977@gmail.com>
2023-10-28 08:44:57 -07:00
szaimen
69568b0889 nextcloud-update automated change
Signed-off-by: GitHub <noreply@github.com>
2023-10-27 13:01:15 +00:00
szaimen
5da8dc0c15 talk-update automated change
Signed-off-by: GitHub <noreply@github.com>
2023-10-27 12:57:30 +00:00
szaimen
50bdcc7ba6 imaginary-update automated change
Signed-off-by: GitHub <noreply@github.com>
2023-10-27 12:56:56 +00:00
szaimen
552a7babc4 php dependency updates
Signed-off-by: GitHub <noreply@github.com>
2023-10-27 12:25:39 +00:00
dependabot[bot]
969dca4879 Bump clamav/clamav from 1.2.0-9 to 1.2.1-11 in /Containers/clamav
Bumps clamav/clamav from 1.2.0-9 to 1.2.1-11.

---
updated-dependencies:
- dependency-name: clamav/clamav
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-27 12:14:10 +00:00
Simon L
db47b9c573 increase to 7.5.1
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-10-27 13:11:51 +02:00
Simon L
416f50b70c do not go lower than 100 connections
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-10-26 18:26:40 +02:00
Lance
782e949742 Update migration.md
Include proper command specific for Nextcloud AIO

Signed-off-by: Lance <Gero3977@gmail.com>
2023-10-25 07:49:49 -07:00
Lance
0decfe4900 Update migration.md with info about synchronization
Add information about synchronizing after migration. There maybe issues if the server has been offline for a while and a user reconnects clients for synchronization.

Signed-off-by: Lance <Gero3977@gmail.com>
2023-10-25 07:39:09 -07:00
Simon L
d887ed8de1 change priority of app-settings-section to 0
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-10-25 12:32:00 +02:00
Peter van Dijk
b7de89ba6a fix reference to column in wikipedia timezone list
Signed-off-by: Peter van Dijk <peter@7bits.nl>
2023-10-23 21:35:19 +02:00
dependabot[bot]
5b5f472180 Bump collabora/code in /Containers/collabora
Bumps collabora/code from 23.05.5.1.1 to 23.05.5.2.1.

---
updated-dependencies:
- dependency-name: collabora/code
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-23 12:40:47 +00:00
Simon L
6168ea3335 do not catch error during pullcontainer so that it throws and logs if it cannot get the image
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-10-22 17:32:15 +02:00
Simon L
00ec781b68 postgresql - close idling sessions automatically
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-10-21 15:40:57 +02:00
37 changed files with 146 additions and 59 deletions

View File

@@ -21,7 +21,7 @@ jobs:
version: v3.11.1
- name: Set up chart-testing
uses: helm/chart-testing-action@v2.4.0
uses: helm/chart-testing-action@v2.6.0
- name: Run chart-testing (lint)
id: lint

View File

@@ -72,10 +72,10 @@ if [ "$BORG_MODE" = backup ]; then
exit 1
fi
# Test that nothing is empty
for directory in "${VOLUME_DIRS[@]}"; do
if [ -z "$(ls -A "$directory")" ] && [ "$directory" != "/nextcloud_aio_volumes/nextcloud_aio_elasticsearch" ]; then
echo "$directory is empty which is not allowed."
# Test that default volumes are not empty
for volume in "${DEFAULT_VOLUMES[@]}"; do
if [ -z "$(ls -A "/nextcloud_aio_volumes/$volume")" ] && [ "$volume" != "nextcloud_aio_elasticsearch" ]; then
echo "/nextcloud_aio_volumes/$volume is empty which should not happen!"
exit 1
fi
done

View File

@@ -1,5 +1,5 @@
# Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/1.1/alpine/Dockerfile
FROM clamav/clamav:1.2.0-9
FROM clamav/clamav:1.2.1-12
COPY clamav.conf /tmp/clamav.conf

View File

@@ -1,5 +1,5 @@
# From a file located probably somewhere here: https://github.com/CollaboraOnline/online/tree/master/docker
FROM collabora/code:23.05.5.1.1
FROM collabora/code:23.05.5.3.1
USER root

View File

@@ -1,6 +1,6 @@
FROM golang:1.21.3-alpine3.18 as go
ENV IMAGINARY_HASH b632dae8cc321452c3f85bcae79c580b1ae1ed84
ENV IMAGINARY_HASH 7efb66c243056e5b3b65215e101be7915983e364
RUN set -ex; \
apk add --no-cache \

View File

@@ -1,11 +1,11 @@
# Docker CLI is a requirement
FROM docker:24.0.6-cli as docker
FROM docker:24.0.7-cli as docker
# Caddy is a requirement
FROM caddy:2.7.5-alpine as caddy
# From https://github.com/docker-library/php/blob/master/8.2/alpine3.18/fpm/Dockerfile
FROM php:8.2.11-fpm-alpine3.18
FROM php:8.2.12-fpm-alpine3.18
EXPOSE 80
EXPOSE 8080

View File

@@ -1,4 +1,4 @@
FROM php:8.1.24-fpm-alpine3.18
FROM php:8.1.25-fpm-alpine3.18
ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 10G
@@ -70,7 +70,7 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \
pecl install memcached-3.2.0; \
pecl install redis-6.0.1; \
pecl install redis-6.0.2; \
pecl install imagick-3.7.0; \
\
docker-php-ext-enable \

View File

@@ -33,8 +33,13 @@ REDIS_CONF
echo "Setting php max children..."
MEMORY=$(awk '/MemTotal/ {printf "%d", $2/1024}' /proc/meminfo)
PHP_MAX_CHILDREN=$((MEMORY/50))
# 100 is the default, we do not want to go lower than this
if [ "$PHP_MAX_CHILDREN" -lt 100 ]; then
PHP_MAX_CHILDREN=100
fi
if [ -n "$PHP_MAX_CHILDREN" ]; then
sed -i "s/^pm.max_children =.*/pm.max_children = $PHP_MAX_CHILDREN/" /usr/local/etc/php-fpm.d/www.conf
sed -i "s/^;pm.process_idle_timeout =.*/pm.process_idle_timeout = 3s/" /usr/local/etc/php-fpm.d/www.conf
fi
# Check permissions in ncdata

View File

@@ -31,7 +31,7 @@ fi
if [ -f "$DUMP_DIR/initialization.failed" ]; then
echo "The database initialization failed. Most likely was a wrong timezone selected."
echo "The selected timezone is '$TZ'."
echo "Please check if it is in 'TZ database name' column of the timezone list: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List"
echo "Please check if it is in the 'TZ identifier' column of the timezone list: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List"
echo "For further clues on what went wrong, look at the logs above."
echo "You might start again from scratch by following https://github.com/nextcloud/all-in-one#how-to-properly-reset-the-instance and selecting a proper timezone."
exit 1
@@ -152,13 +152,21 @@ if [ -f "/var/lib/postgresql/data/postgresql.conf" ]; then
MEMORY=$(awk '/MemTotal/ {printf "%d", $2/1024}' /proc/meminfo)
MAX_CONNECTIONS=$((MEMORY/50+3))
if [ -n "$MAX_CONNECTIONS" ]; then
# 100 is the default, we do not want to go lower than this
if [ "$MAX_CONNECTIONS" -lt 100 ]; then
MAX_CONNECTIONS=100
fi
sed -i "s|^max_connections =.*|max_connections = $MAX_CONNECTIONS|" "/var/lib/postgresql/data/postgresql.conf"
fi
# Modify conf
# Do not log checkpoints
if grep -q "#log_checkpoints" /var/lib/postgresql/data/postgresql.conf; then
sed -i 's|#log_checkpoints.*|log_checkpoints = off|' /var/lib/postgresql/data/postgresql.conf
fi
# Close idling connections automatically after 3s which does not seem to happen automatically so that we run into max_connections limits
if grep -q "#idle_session_timeout" /var/lib/postgresql/data/postgresql.conf; then
sed -i 's|#idle_session_timeout.*|idle_session_timeout = 3000|' /var/lib/postgresql/data/postgresql.conf
fi
fi
# Catch docker stop attempts

View File

@@ -2,7 +2,7 @@ FROM python:3.12.0-alpine3.18
COPY --chmod=775 start.sh /start.sh
ENV RECORDING_VERSION v17.1.1
ENV RECORDING_VERSION v17.1.2
ENV ALLOW_ALL false
ENV HPB_PROTOCOL https
ENV SKIP_VERIFY false

View File

@@ -1,6 +1,6 @@
FROM nats:2.10.3-scratch as nats
FROM nats:2.10.4-scratch as nats
FROM eturnal/eturnal:1.12.0 AS eturnal
FROM strukturag/nextcloud-spreed-signaling:1.1.3 as signaling
FROM strukturag/nextcloud-spreed-signaling:1.2.0 as signaling
FROM alpine:3.18.4 as janus
ARG JANUS_VERSION=v0.14.0

View File

@@ -86,9 +86,10 @@ internalsecret = the-shared-secret-for-internal-clients
# only be used while running the benchmark client against the server.
allowall = false
# Common shared secret for requests from and to the backend servers if
# "allowall" is enabled. This must be the same value as configured in the
# Nextcloud admin ui.
# Common shared secret for requests from and to the backend servers. Used if
# "allowall" is enabled or as fallback for individual backends that don't have
# their own secret set.
# This must be the same value as configured in the Nextcloud admin ui.
#secret = the-shared-secret-for-allowall
# Timeout in seconds for requests to the backend.
@@ -109,8 +110,9 @@ connectionsperhost = 8
# URL of the Nextcloud instance
#url = https://cloud.domain.invalid
# Shared secret for requests from and to the backend servers. This must be the
# same value as configured in the Nextcloud admin ui.
# Shared secret for requests from and to the backend servers. Leave empty to use
# the common shared secret from above.
# This must be the same value as configured in the Nextcloud admin ui.
#secret = the-shared-secret
# Limit the number of sessions that are allowed to connect to this backend.
@@ -129,8 +131,9 @@ connectionsperhost = 8
# URL of the Nextcloud instance
#url = https://cloud.otherdomain.invalid
# Shared secret for requests from and to the backend servers. This must be the
# same value as configured in the Nextcloud admin ui.
# Shared secret for requests from and to the backend servers. Leave empty to use
# the common shared secret from above.
# This must be the same value as configured in the Nextcloud admin ui.
#secret = the-shared-secret
[nats]

View File

@@ -78,6 +78,6 @@ class Admin implements ISettings {
* E.g.: 70
*/
public function getPriority(): int {
return 5;
return 0;
}
}

View File

@@ -0,0 +1,39 @@
{
"aio_services_v1": [
{
"container_name": "nextcloud-aio-dlna",
"display_name": "DLNA",
"documentation": "https://github.com/nextcloud/all-in-one/tree/main/community-containers/dlna",
"image": "thanek/nextcloud-dlna",
"image_tag": "latest",
"internal_port": "host",
"restart": "unless-stopped",
"depends_on": [
"nextcloud-aio-database"
],
"environment": [
"NC_DOMAIN=%NC_DOMAIN%",
"NC_PORT=443",
"NEXTCLOUD_DLNA_SERVER_PORT=9999",
"NEXTCLOUD_DLNA_FRIENDLY_NAME=nextcloud-aio",
"NEXTCLOUD_DATA_DIR=/data",
"NEXTCLOUD_DB_TYPE=postgres",
"NEXTCLOUD_DB_HOST=%AIO_DATABASE_HOST%",
"NEXTCLOUD_DB_PORT=5432",
"NEXTCLOUD_DB_NAME=nextcloud_database",
"NEXTCLOUD_DB_USER=oc_nextcloud",
"NEXTCLOUD_DB_PASS=%DATABASE_PASSWORD%"
],
"secrets": [
"DATABASE_PASSWORD"
],
"volumes": [
{
"source": "%NEXTCLOUD_DATADIR%",
"destination": "/data",
"writeable": false
}
]
}
]
}

View File

@@ -0,0 +1,15 @@
## DLNA server
This container bundles DLNA server for your Nextcloud files to be accessible by the clients in your local network. Simply run the container and look for a new media server `nextcloud-aio` in your local network.
### Notes
- This container will work only if the Nextcloud installation is in your home network, it is not suitable for installations on remote servers.
- This is not working with Docker Desktop since it requires the `host` networking mode in docker, and it doesn't really share the host's network interfaces in this system
- If you have a firewall like ufw configured, you might need to open at least port 9999 TCP and 1900 UDP first in order to make it work.
- See https://github.com/nextcloud/all-in-one/tree/main/community-containers#community-containers how to add it to the AIO stack
### Repository
https://github.com/thanek/nextcloud-dlna
### Maintainer
https://github.com/thanek

View File

@@ -25,6 +25,7 @@
],
"nextcloud_exec_commands": [
"php /var/www/html/occ app:install integration_libretranslate",
"php /var/www/html/occ app:enable integration_libretranslate",
"php /var/www/html/occ config:app:set integration_libretranslate host --value='http://nextcloud-aio-libretranslate'",
"php /var/www/html/occ config:app:set integration_libretranslate port --value='5000'"
]

View File

@@ -1,4 +1,4 @@
## Local AI
## LibreTranslate
This container bundles LibreTranslate and auto-configures it for you.
### Notes

View File

@@ -20,7 +20,7 @@
},
{
"source": "nextcloud_aio_localai_images",
"destination": "/images",
"destination": "/tmp/generated/images/",
"writeable": true
},
{
@@ -35,8 +35,10 @@
"echo 'Scanning nextcloud-aio-local-ai folder for admin user...'",
"php /var/www/html/occ files:scan --path='/admin/files/nextcloud-aio-local-ai'",
"php /var/www/html/occ app:install integration_openai",
"php /var/www/html/occ app:enable integration_openai",
"php /var/www/html/occ config:app:set integration_openai url --value http://nextcloud-aio-local-ai:8080",
"php /var/www/html/occ app:install assistant"
"php /var/www/html/occ app:install assistant",
"php /var/www/html/occ app:enable assistant"
]
}
]

View File

@@ -5,7 +5,7 @@ This container bundles Plex and auto-configures it for you.
- This is not working on arm64 since Plex does only provide x64 docker images.
- This is not working on Docker Desktop since it needs `network_mode: host` in order to work correctly.
- If you have a firewall like ufw configured, you might need to open all Plex ports in there first in order to make it work. Especially port 32400 is important!
- After adding and starting the container, you need to visit http://ip.address.of.server:32400 in order to claim your server with a plex account
- After adding and starting the container, you need to visit http://ip.address.of.server:32400/manage in order to claim your server with a plex account
- The data of Plex will be automatically included in AIOs backup solution!
- See https://github.com/nextcloud/all-in-one/tree/main/community-containers#community-containers how to add it to the AIO stack

View File

@@ -18,6 +18,7 @@ The procedure for migrating only the files works like this:
1. Next, run `sudo docker run --rm --volume nextcloud_aio_nextcloud_data:/mnt/ncdata:rw alpine chown -R 33:0 /mnt/ncdata/` and `sudo docker run --rm --volume nextcloud_aio_nextcloud_data:/mnt/ncdata:rw alpine chmod -R 750 /mnt/ncdata/` to apply the correct permissions. (Or if `NEXTCLOUD_DATADIR` was provided, apply `chown -R 33:0` and `chmod -R 750` to the chosen path.)
1. Start the containers again and wait until all containers are running
1. Run `sudo docker exec --user www-data -it nextcloud-aio-nextcloud php occ files:scan-app-data && sudo docker exec --user www-data -it nextcloud-aio-nextcloud php occ files:scan --all` in order to scan all files in the datadirectory.
1. If the restored data is older than any clients you want to continue to sync, for example if the server was down for a period of time during migration, you may want to take a look at [Synchronising with clients after migration](/migration.md#synchronising-with-clients-after-migration) below.
## Migrate the files and the database
**Please note**: this is much more complicated than migrating only the files and also not as failproof so be warned! Also, this will not work on former snap installations as the snap is read-only and thus you cannot install the necessary `pdo_pgsql` PHP extension. So if migrating from snap, you will need to use one of the other methods. However you could try to ask if the snaps maintainer could add this one small PHP extension to the snap here: https://github.com/nextcloud-snap/nextcloud-snap/issues which would allow for an easy migration.
@@ -84,5 +85,21 @@ The procedure for migrating the files and the database works like this:
Now the whole Nextcloud instance should work again.<br>
If not, feel free to restore the AIO instance from backup and start at step 8 again.
If the restored data is older than any clients you want to continue to sync, for example if the server was down for a period of time during migration, you may want to take a look at [Synchronising with clients after migration](/migration.md#synchronising-with-clients-after-migration) below.
## Use the user_migration app
A new way since the Nextcloud update to 24 is to use the new [user_migration app](https://apps.nextcloud.com/apps/user_migration#app-gallery). It allows to export the most important data on one instance and import it on a different Nextcloud instance. For that, you need to install and enable the user_migration app on your old instance, trigger the export for the user, create the user on the new instance, log in with that user and import the archive that was created during the export. This then needs to be done for each user that you want to migrate.
If the restored data is older than any clients you want to continue to sync, for example if the server was down for a period of time during migration, you may want to take a look at [Synchronising with clients after migration](/migration.md#synchronising-with-clients-after-migration) below.
# Synchronising with clients after migration
#### From https://docs.nextcloud.com/server/latest/admin_manual/maintenance/restore.html#synchronising-with-clients-after-data-recovery
By default the Nextcloud server is considered the authoritative source for the data. If the data on the server and the client differs clients will default to fetching the data from the server.
If the recovered backup is outdated the state of the clients may be more up to date than the state of the server. In this case also make sure to run `sudo docker exec --user www-data -it nextcloud-aio-nextcloud php occ maintenance:data-fingerprint` command afterwards. It changes the logic of the synchronisation algorithm to try an recover as much data as possible. Files missing on the server are therefore recovered from the clients and in case of different content the users will be asked.
>[!Note]
>The usage of maintenance:data-fingerprint can cause conflict dialogues and difficulties deleting files on the client. Therefore its only recommended to prevent dataloss if the backup was outdated.
If you are running multiple application servers you will need to make sure the config files are synced between them so that the updated data-fingerprint is applied on all instances.

View File

@@ -1,6 +1,6 @@
name: nextcloud-aio-helm-chart
description: A generated Helm Chart for Nextcloud AIO from Skippbox Kompose
version: 7.5.0
version: 7.5.1
apiVersion: v2
keywords:
- latest

View File

@@ -57,7 +57,7 @@ spec:
value: nextcloud-aio-talk
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-apache:20231027_071516-latest
image: nextcloud/aio-apache:20231030_072910-latest
name: nextcloud-aio-apache
ports:
- containerPort: {{ .Values.APACHE_PORT }}

View File

@@ -39,7 +39,7 @@ spec:
value: "90"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-clamav:20231027_071516-latest
image: nextcloud/aio-clamav:20231030_072910-latest
name: nextcloud-aio-clamav
ports:
- containerPort: 3310

View File

@@ -37,7 +37,7 @@ spec:
value: --o:ssl.enable=false --o:ssl.termination=true --o:mount_jail_tree=false --o:logging.level=warning --o:home_mode.enable=true {{ .Values.COLLABORA_SECCOMP_POLICY }} --o:remote_font_config.url=https://{{ .Values.NC_DOMAIN }}/apps/richdocuments/settings/fonts.json
- name: server_name
value: "{{ .Values.NC_DOMAIN }}"
image: nextcloud/aio-collabora:20231027_071516-latest
image: nextcloud/aio-collabora:20231030_072910-latest
name: nextcloud-aio-collabora
ports:
- containerPort: 9980

View File

@@ -61,7 +61,7 @@ spec:
value: nextcloud
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-postgresql:20231027_071516-latest
image: nextcloud/aio-postgresql:20231030_072910-latest
name: nextcloud-aio-database
ports:
- containerPort: 5432

View File

@@ -55,7 +55,7 @@ spec:
value: basic
- name: xpack.security.enabled
value: "false"
image: nextcloud/aio-fulltextsearch:20231027_071516-latest
image: nextcloud/aio-fulltextsearch:20231030_072910-latest
name: nextcloud-aio-fulltextsearch
ports:
- containerPort: 9200

View File

@@ -27,7 +27,7 @@ spec:
- env:
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-imaginary:20231027_071516-latest
image: nextcloud/aio-imaginary:20231030_072910-latest
name: nextcloud-aio-imaginary
ports:
- containerPort: 9000

View File

@@ -123,7 +123,7 @@ spec:
value: "{{ .Values.TIMEZONE }}"
- name: UPDATE_NEXTCLOUD_APPS
value: "{{ .Values.UPDATE_NEXTCLOUD_APPS }}"
image: nextcloud/aio-nextcloud:20231027_071516-latest
image: nextcloud/aio-nextcloud:20231030_072910-latest
name: nextcloud-aio-nextcloud
ports:
- containerPort: 9000

View File

@@ -50,7 +50,7 @@ spec:
value: nextcloud-aio-redis
- name: REDIS_HOST_PASSWORD
value: "{{ .Values.REDIS_PASSWORD }}"
image: nextcloud/aio-notify-push:20231027_071516-latest
image: nextcloud/aio-notify-push:20231030_072910-latest
name: nextcloud-aio-notify-push
ports:
- containerPort: 7867

View File

@@ -43,7 +43,7 @@ spec:
value: "{{ .Values.ONLYOFFICE_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-onlyoffice:20231027_071516-latest
image: nextcloud/aio-onlyoffice:20231030_072910-latest
name: nextcloud-aio-onlyoffice
ports:
- containerPort: 80

View File

@@ -38,7 +38,7 @@ spec:
value: "{{ .Values.REDIS_PASSWORD }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-redis:20231027_071516-latest
image: nextcloud/aio-redis:20231030_072910-latest
name: nextcloud-aio-redis
ports:
- containerPort: 6379

View File

@@ -37,7 +37,7 @@ spec:
value: "{{ .Values.TURN_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-talk:20231027_071516-latest
image: nextcloud/aio-talk:20231030_072910-latest
name: nextcloud-aio-talk
ports:
- containerPort: {{ .Values.TALK_PORT }}

View File

@@ -33,7 +33,7 @@ spec:
value: "{{ .Values.RECORDING_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-talk-recording:20231027_071516-latest
image: nextcloud/aio-talk-recording:20231030_072910-latest
name: nextcloud-aio-talk-recording
ports:
- containerPort: 1234

10
php/composer.lock generated
View File

@@ -391,16 +391,16 @@
},
{
"name": "laravel/serializable-closure",
"version": "v1.3.1",
"version": "v1.3.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/serializable-closure.git",
"reference": "e5a3057a5591e1cfe8183034b0203921abe2c902"
"reference": "076fe2cf128bd54b4341cdc6d49b95b34e101e4c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/e5a3057a5591e1cfe8183034b0203921abe2c902",
"reference": "e5a3057a5591e1cfe8183034b0203921abe2c902",
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/076fe2cf128bd54b4341cdc6d49b95b34e101e4c",
"reference": "076fe2cf128bd54b4341cdc6d49b95b34e101e4c",
"shasum": ""
},
"require": {
@@ -447,7 +447,7 @@
"issues": "https://github.com/laravel/serializable-closure/issues",
"source": "https://github.com/laravel/serializable-closure"
},
"time": "2023-07-14T13:56:28+00:00"
"time": "2023-10-17T13:38:16+00:00"
},
{
"name": "nikic/fast-route",

View File

@@ -403,6 +403,9 @@ class DockerActionManager
} else {
$replacements[1] = '';
}
// Allow to get local ip-address of database container which allows to talk to it even in host mode (the container that requires this needs to be started first then)
} elseif ($out[1] === 'AIO_DATABASE_HOST') {
$replacements[1] = gethostbyname('nextcloud-aio-database');
} else {
$secret = $this->configurationManager->GetSecret($out[1]);
if ($secret === "") {
@@ -577,14 +580,8 @@ class DockerActionManager
public function PullContainer(Container $container) : void
{
$url = $this->BuildApiUrl(sprintf('images/create?fromImage=%s', urlencode($this->BuildImageName($container))));
try {
$this->guzzleClient->post($url);
} catch (RequestException $e) {
error_log('Could not get image ' . $this->BuildImageName($container) . ' from docker hub. Probably due to rate limits. ' . $e->getMessage());
// Don't exit here because it is possible that the image is already present
// and we ran into docker hub limits.
// We will exit later if not image should be available.
}
// do not catch any exception so that it always throws and logs the error
$this->guzzleClient->post($url);
}
private function isContainerUpdateAvailable(string $id) : string

View File

@@ -16,7 +16,7 @@
</header>
<div class="content">
<h1>Nextcloud AIO v7.5.0</h1>
<h1>Nextcloud AIO v7.6.0</h1>
{# Add 2nd tab warning #}
<script type="text/javascript" src="second-tab-warning.js"></script>
@@ -649,7 +649,7 @@
<input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
<input class="button" type="submit" value="Submit timezone" onclick="return confirm('Are you sure that this is a valid timezone? Please double check by following the wikipedia article and checking the correct column since if not, it will break the startup since the database will not get correctly initialized and you will end in a startup loop.')" />
</form>
You need to make sure that the timezone that you enter is valid. An example is <b>Europe/Berlin</b>. You can get valid values by looking at the 'TZ database name' column of this list: <a href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List"><b>click here</b></a>. The default is <b>Etc/UTC</b> if nothing is entered.<br><br>
You need to make sure that the timezone that you enter is valid. An example is <b>Europe/Berlin</b>. You can get valid values by looking at the 'TZ identifier' column of this list: <a href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List"><b>click here</b></a>. The default is <b>Etc/UTC</b> if nothing is entered.<br><br>
{% else %}
The timezone for Nextcloud is currently set to <b>{{ timezone }}</b>. You can reset the timezone again by clicking on the button below.<br><br/>
<form method="POST" action="/api/configuration" class="xhr">

View File

@@ -8,7 +8,7 @@ In order to run Nextcloud behind a web server or reverse proxy (like Apache, Ngi
**Attention:** The process to run Nextcloud behind a reverse proxy consists of at least steps 1, 2 and 4:
1. **Configure the reverse proxy! See [point 1](#1-add-this-to-your-reverse-proxy-config)**
1. **Use the in this document provided startup command! See [point 2](#2-use-this-startup-command)**
1. **Use this startup command! See [point 2](#2-use-this-startup-command)**
1. Optional: If the reverse proxy is installed on the same host and in the host network, you should limit the apache container to only listen on localhost. See [point 3](#3-limit-the-access-to-the-apache-container)
1. **Open the AIO interface. See [point 4](#4-open-the-aio-interface)**
1. Optional: Get a valid certificate for the AIO interface! See [point 5](#5-optional-get-a-valid-certificate-for-the-aio-interface)
@@ -383,7 +383,7 @@ Second, see these screenshots for a working config:
![grafik](https://user-images.githubusercontent.com/75573284/213889724-1ab32264-3e0c-4d83-b067-9fe9d1672fb2.png)
![grafik](https://user-images.githubusercontent.com/75573284/213889797-42642302-b079-4378-a4a6-079f4f67058c.png)
![grafik](https://github.com/nextcloud/all-in-one/assets/24786786/fecbb5ef-d2f4-4e0f-bc4b-82207e2c2809)
![grafik](https://user-images.githubusercontent.com/75573284/213889746-87dbe8c5-4d1f-492f-b251-bbf82f1510d0.png)