Compare commits

..

57 Commits

Author SHA1 Message Date
Simon L
756511f16a This does not work
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-17 16:46:24 +01:00
Simon L
4ab3520d10 another one
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-17 16:38:58 +01:00
Simon L
de01850279 another attempt
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-17 16:20:58 +01:00
Simon L
70b87ed9f8 try to fix it
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-17 16:14:11 +01:00
Simon L
e389a17a74 try to fix the elasticsearch inclusion
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-17 16:03:03 +01:00
Simon L
331442fe38 add two more points to manual-install
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-17 15:43:34 +01:00
Simon L
1208000234 Merge pull request #1541 from nextcloud/enh/1538/clamd-timeout
change clamd startup timeout to 90s
2022-12-17 15:36:43 +01:00
Simon L
083150bfb3 Merge pull request #1540 from nextcloud/enh/noid/revert-clamav-trap
Revert "fix Clamav starting trap"
2022-12-17 15:34:23 +01:00
Simon L
f4944fbf92 change clamd startup timeout to 90s
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-17 15:33:28 +01:00
Simon L
3f775653a0 Revert "fix Clamav starting trap"
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-17 15:30:45 +01:00
Simon L
c16d59f9e4 Merge pull request #1532 from nextcloud/enh/1531/add-stdbuf
add stdbuf
2022-12-17 15:28:56 +01:00
Simon L
605f8c87fb Merge pull request #1539 from nextcloud/enh/noid/reload-always
reload in case of undefined response
2022-12-17 15:27:45 +01:00
Simon L
1dee9c465c reload in case of undefined response
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-17 15:26:51 +01:00
Simon L
ec1f5aa129 Merge pull request #1506 from nextcloud/enh/noid/disable-borg-compact
make more clear what to do when borg check fails
2022-12-16 20:06:58 +01:00
Simon L
17fe0db050 Merge pull request #1534 from nextcloud/enh/noid/fix-clamav-daemon-starting-trap
fix Clamav starting trap
2022-12-16 18:53:14 +01:00
Simon L
3c40abbb60 make more clear what to do when borg check fails
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-16 18:46:08 +01:00
Simon L
163f6ea10a Merge pull request #1533 from nextcloud/enh/noid/dont-start-nextcloud-if-install-failed
Don't start the Nextcloud container if the installation failed
2022-12-16 18:12:41 +01:00
Simon L
1bd3c2cb4c add a further hint
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-16 18:12:03 +01:00
Simon L
b90226282a add stdbuf
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-16 17:53:38 +01:00
Simon L
08aa2eece3 fix Clamav starting trap
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-16 12:36:51 +01:00
Simon L
e18f8308ed Don't start the Nextcloud container if the installation failed
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-16 10:57:42 +01:00
Simon L
0b961c9dfc try - catch is not needed for onlyoffice js
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-16 10:36:13 +01:00
Simon L
9b3ad32764 fix restoring of elasticsearch volume
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-15 15:09:39 +01:00
Simon L
fb6668755c make rsync less verbose
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-15 14:32:03 +01:00
Simon L
71231b9b8b increase to 4.0.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-15 12:20:04 +01:00
Simon L
e53281610d Merge pull request #1495 from nextcloud/enh/1280/nc25
update to Nextcloud 25
2022-12-15 12:17:47 +01:00
Simon L
3568adf8c6 Merge pull request #1498 from nextcloud/enh/1032/add-collabora-volume
add a volume for collabora fonts
2022-12-15 12:14:29 +01:00
Simon L
b1d5204078 Merge pull request #1497 from nextcloud/enh/1156/add-redis-volume
add a volume for redis
2022-12-15 12:13:11 +01:00
Simon L
79946a876c remove the redis database once a backup gets restored
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-15 12:10:55 +01:00
Simon L
882fd3be26 add a volume for redis
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-15 12:09:31 +01:00
Simon L
7eb59374a2 Merge pull request #1496 from nextcloud/enh/1191/remove-mysql
remove pdo_mysql
2022-12-15 12:08:56 +01:00
Simon L
28919e27f3 Merge pull request #1513 from nextcloud/enh/noid/back-up-fts-volume
also back up the fulltextsearch volume
2022-12-15 12:08:48 +01:00
Simon L
098a6c4b29 Merge pull request #1432 from nextcloud/enh/1280/remove-appporder
remove the apporder and twofactor_totp app
2022-12-15 12:08:37 +01:00
Simon L
d20cf5777f remove the twofactor_totp app since it is bundled now
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-15 12:06:57 +01:00
Simon L
6b3be9d6e8 remove the apporder app
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-15 12:06:27 +01:00
Simon L
03e2ffb3c9 Merge pull request #1520 from nextcloud/dependabot/docker/Containers/redis/redis-6.2.8-alpine
Bump redis from 6.2.7-alpine to 6.2.8-alpine in /Containers/redis
2022-12-15 11:14:46 +01:00
Simon L
1e3dccf976 Merge pull request #1516 from nextcloud/enh/noid/fix-spaces
fix spaces in env file
2022-12-15 11:14:08 +01:00
Simon L
84a5e28784 Merge pull request #1515 from nextcloud/enh/noid/remove-container-name
manual-install - remove container_name so that it should run using do…
2022-12-15 11:13:40 +01:00
Simon L
4de666eba4 Merge pull request #1514 from nextcloud/enh/noid/sync-autoconfig
also sync autoconfig files
2022-12-15 11:13:08 +01:00
Simon L
e061a16cb7 Merge pull request #1512 from nextcloud/dependabot/docker/Containers/fulltextsearch/elasticsearch-7.17.8
Bump elasticsearch from 7.17.7 to 7.17.8 in /Containers/fulltextsearch
2022-12-15 11:11:40 +01:00
Simon L
f5e36c854e Merge pull request #1500 from nextcloud/dependabot/docker/Containers/talk/ubuntu-focal-20221130
Bump ubuntu from focal-20221019 to focal-20221130 in /Containers/talk
2022-12-15 11:11:20 +01:00
Simon L
ab384f6e29 Merge pull request #1521 from nextcloud/dependabot/github_actions/cirrus-actions/rebase-1.8
Bump cirrus-actions/rebase from 1.7 to 1.8
2022-12-14 13:10:57 +01:00
dependabot[bot]
e5ca49356c Bump cirrus-actions/rebase from 1.7 to 1.8
Bumps [cirrus-actions/rebase](https://github.com/cirrus-actions/rebase) from 1.7 to 1.8.
- [Release notes](https://github.com/cirrus-actions/rebase/releases)
- [Commits](https://github.com/cirrus-actions/rebase/compare/1.7...1.8)

---
updated-dependencies:
- dependency-name: cirrus-actions/rebase
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-14 12:06:35 +00:00
Simon L
bd81c3133f also sync autoconfig files
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-13 23:45:01 +01:00
Simon L
c6e45ef378 add exception for elasticsearch and re-order the exceptions
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-13 15:06:47 +01:00
Simon L
bea8ca86dd add a volume for collabora fonts
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-13 14:42:02 +01:00
Simon L
ab5369023b update to Nextcloud 25
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-13 14:11:11 +01:00
dependabot[bot]
f9290e49c8 Bump redis from 6.2.7-alpine to 6.2.8-alpine in /Containers/redis
Bumps redis from 6.2.7-alpine to 6.2.8-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-13 12:04:55 +00:00
Simon L
becfb3cc16 Merge pull request #1517 from nextcloud/automated/noid/psalm-baseline-update-1670905372
[Automated] Update psalm-baseline.xml
2022-12-13 09:14:46 +01:00
nextcloud-command
7cf9fe8dec Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2022-12-13 04:22:52 +00:00
Simon L
aa32d496e6 Update sample.conf
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-13 00:48:08 +01:00
Simon L
d9f994fc5d fix spaces in env file
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-13 00:45:48 +01:00
Simon L
df9457bd91 manual-install - remove container_name so that it should run using docker-swarm too
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-13 00:33:57 +01:00
Simon L
85999c297c also back up the fulltextsearch volume
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-12 18:16:24 +01:00
dependabot[bot]
af1612cda1 Bump elasticsearch from 7.17.7 to 7.17.8 in /Containers/fulltextsearch
Bumps elasticsearch from 7.17.7 to 7.17.8.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-12 12:14:04 +00:00
dependabot[bot]
211ce3c69b Bump ubuntu from focal-20221019 to focal-20221130 in /Containers/talk
Bumps ubuntu from focal-20221019 to focal-20221130.

---
updated-dependencies:
- dependency-name: ubuntu
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-09 12:06:33 +00:00
Simon L
7b4d0baa6c remove pdo_mysql
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-09 11:33:46 +01:00
21 changed files with 88 additions and 43 deletions

View File

@@ -37,7 +37,7 @@ jobs:
token: ${{ secrets.COMMAND_BOT_PAT }}
- name: Automatic Rebase
uses: cirrus-actions/rebase@1.7
uses: cirrus-actions/rebase@1.8
env:
GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}

View File

@@ -66,7 +66,7 @@ if [ "$BORG_MODE" = backup ]; then
# Test that nothing is empty
for directory in "${VOLUME_DIRS[@]}"; do
if [ -z "$(ls -A "$directory")" ]; then
if [ -z "$(ls -A "$directory")" ] && [ "$directory" != "/nextcloud_aio_volumes/nextcloud_aio_elasticsearch" ]; then
echo "$directory is empty which is not allowed."
exit 1
fi
@@ -258,13 +258,13 @@ if [ "$BORG_MODE" = restore ]; then
# Restore everything except the configuration file
if ! rsync --stats --archive --human-readable -vv --delete \
--exclude "nextcloud_aio_mastercontainer/session/"** \
--exclude "nextcloud_aio_mastercontainer/certs/"** \
--exclude "nextcloud_aio_mastercontainer/data/daily_backup_running" \
--exclude "nextcloud_aio_mastercontainer/data/session_date_file" \
--exclude "nextcloud_aio_mastercontainer/data/configuration.json" \
--exclude "nextcloud_aio_apache/caddy/"** \
--exclude "nextcloud_aio_mastercontainer/caddy/"** \
--exclude "nextcloud_aio_mastercontainer/certs/"** \
--exclude "nextcloud_aio_mastercontainer/data/configuration.json" \
--exclude "nextcloud_aio_mastercontainer/data/daily_backup_running" \
--exclude "nextcloud_aio_mastercontainer/data/session_date_file" \
--exclude "nextcloud_aio_mastercontainer/session/"** \
/tmp/borg/nextcloud_aio_volumes/ /nextcloud_aio_volumes; then
echo "Something failed while restoring from backup."
umount /tmp/borg
@@ -336,6 +336,9 @@ if [ "$BORG_MODE" = restore ]; then
# Add file to Nextcloud container so that it performs a fingerprint update the next time
touch "/nextcloud_aio_volumes/nextcloud_aio_nextcloud_data/fingerprint.update"
chmod 777 "/nextcloud_aio_volumes/nextcloud_aio_nextcloud_data/fingerprint.update"
# Delete redis cache
rm -f "/mnt/redis/dump.rdb"
fi
# Do the Backup check

View File

@@ -1,5 +1,5 @@
# Probably from here https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/Dockerfile
FROM elasticsearch:7.17.7
FROM elasticsearch:7.17.8
RUN elasticsearch-plugin install --batch ingest-attachment

View File

@@ -53,7 +53,6 @@ RUN set -ex; \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
zip \
gmp \
@@ -104,7 +103,7 @@ RUN { \
VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 24.0.8
ENV NEXTCLOUD_VERSION 25.0.2
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
@@ -199,6 +198,7 @@ RUN set -ex; \
mawk \
sudo \
grep \
coreutils \
; \
rm -rf /var/lib/apt/lists/*

View File

@@ -79,6 +79,14 @@ if [ -f "$NEXTCLOUD_DATA_DIR/update.failed" ]; then
exit 1
fi
# Do not start the container if the install failed
if [ -f "$NEXTCLOUD_DATA_DIR/install.failed" ]; then
echo "The initial Nextcloud installation failed."
echo "Please reset AIO properly and try again. For further clues what went wrong, check the logs above."
echo "See https://github.com/nextcloud/all-in-one#how-to-properly-reset-the-instance"
exit 1
fi
# Skip any update if Nextcloud was just restored
if ! [ -f "$NEXTCLOUD_DATA_DIR/skip.update" ]; then
if version_greater "$image_version" "$installed_version"; then
@@ -176,6 +184,7 @@ if ! [ -f "$NEXTCLOUD_DATA_DIR/skip.update" ]; then
rsync -rlD --include "/$dir/" --exclude '/*' /usr/src/nextcloud/ /var/www/html/
fi
done
rsync -rlD --delete --include '/config/' --exclude '/*' --exclude '/config/CAN_INSTALL' --exclude '/config/config.sample.php' --exclude '/config/config.php' /usr/src/nextcloud/ /var/www/html/
rsync -rlD --include '/version.php' --exclude '/*' /usr/src/nextcloud/ /var/www/html/
echo "Initializing finished"
@@ -202,6 +211,7 @@ if ! [ -f "$NEXTCLOUD_DATA_DIR/skip.update" ]; then
done
if [ "$try" -gt "$max_retries" ]; then
echo "installing of nextcloud failed!"
touch "$NEXTCLOUD_DATA_DIR/install.failed"
exit 1
fi
@@ -280,8 +290,13 @@ if ! [ -f "$NEXTCLOUD_DATA_DIR/skip.update" ]; then
if [ "${APPSTORAGE[$app]}" != "no" ]; then
echo "Enabling $app..."
if ! php /var/www/html/occ app:enable "$app" >/dev/null; then
echo "$app could not get enabled. Probably because it is not compatible with the new Nextcloud version."
bash /notify.sh "Could not enable the $app after the Nextcloud update!" "Feel free to look at the Nextcloud update logs and force-enable the app again from the app-store UI."
echo "The $app app could not get enabled. Probably because it is not compatible with the new Nextcloud version."
if [ "$app" = apporder ]; then
CUSTOM_HINT="The apporder app was deprecated. A possible replacement is the side_menu app, aka 'Custom menu'."
else
CUSTOM_HINT="Most likely because it is not compatible with the new Nextcloud version."
fi
bash /notify.sh "Could not enable the $app app after the Nextcloud update!" "$CUSTOM_HINT Feel free to look at the Nextcloud update logs and force-enable the app again from the app-store UI."
continue
fi
# Only restore the group settings, if the app was enabled (and is thus compatible with the new NC version)

View File

@@ -1,5 +1,5 @@
# From https://github.com/docker-library/redis/blob/master/6.2/alpine/Dockerfile
FROM redis:6.2.7-alpine
FROM redis:6.2.8-alpine
RUN apk add --update --no-cache openssl bash

View File

@@ -1,4 +1,4 @@
FROM ubuntu:focal-20221019
FROM ubuntu:focal-20221130
RUN set -ex; \
\

View File

@@ -5,7 +5,7 @@
<name>Nextcloud All In One</name>
<summary>Provides a login link for admins.</summary>
<description>Add a link to the admin settings that gives access to the Nextcloud All In One admin interface</description>
<version>0.2.0</version>
<version>0.3.0</version>
<licence>agpl</licence>
<author>Azul</author>
<namespace>AllInOne</namespace>
@@ -13,7 +13,7 @@
<category>monitoring</category>
<bugs>https://github.com/nextcloud/all-in-one/issues</bugs>
<dependencies>
<nextcloud min-version="23" max-version="24"/>
<nextcloud min-version="24" max-version="25"/>
</dependencies>
<settings>

View File

@@ -28,7 +28,7 @@ services:
# - NEXTCLOUD_MAX_TIME=3600 # Can be adjusted if you need more. See https://github.com/nextcloud/all-in-one#how-to-adjust-the-max-execution-time-for-nextcloud
# - NEXTCLOUD_MEMORY_LIMIT=512M # Can be adjusted if you need more. See https://github.com/nextcloud/all-in-one#how-to-adjust-the-php-memory-limit-for-nextcloud
# - NEXTCLOUD_TRUSTED_CACERTS_DIR=/path/to/my/cacerts # CA certificates in this directory will be trusted by the OS of the nexcloud container (Useful e.g. for LDAPS) See See https://github.com/nextcloud/all-in-one#how-to-trust-user-defiend-certification-authorities-ca
# - NEXTCLOUD_STARTUP_APPS=twofactor_totp deck tasks calendar contacts apporder # Allows to modify the Nextcloud apps that are installed on starting AIO the first time. See https://github.com/nextcloud/all-in-one#how-to-change-the-nextcloud-apps-that-are-installed-on-the-first-startup
# - NEXTCLOUD_STARTUP_APPS=deck tasks calendar contacts # Allows to modify the Nextcloud apps that are installed on starting AIO the first time. See https://github.com/nextcloud/all-in-one#how-to-change-the-nextcloud-apps-that-are-installed-on-the-first-startup
# - 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. See https://github.com/nextcloud/all-in-one#how-to-add-packets-permanently-to-the-nextcloud-container
# - NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS=imagick # This allows to add additional php extensions to the Nextcloud container permanently. Default is imagick but can be overwritten by modifying this value. See https://github.com/nextcloud/all-in-one#how-to-add-php-extensions-permanently-to-the-nextcloud-container
# - TALK_PORT=3478 # This allows to adjust the port that the talk container is using.

View File

@@ -5,12 +5,14 @@ You can run the containers that are build for AIO with docker-compose. This come
### Advantages
- You can run it without a container having access to the docker socket
- You can modify all values on your own
- You can run the containers with docker swarm
### Disadvantages
- You lose the AIO interface
- You lose update notifications and automatic updates
- You lose all AIO backup and restore features
- You need to know what you are doing, especially when modifying the docker-compose file
- For updating, you need to strictly follow the at the bottom described update routine
- Probably more
## How to use this?

View File

@@ -3,7 +3,7 @@ AIO_URL=localhost # Has no function but needs to be set!
APACHE_MAX_SIZE=10737418240 # This needs to be an integer and in sync with NEXTCLOUD_UPLOAD_LIMIT
APACHE_PORT=443 # Changing this to a different value than 443 will allow you to run it behind a reverse proxy.
CLAMAV_ENABLED=no # Setting this to "yes" enables the option in Nextcloud automatically.
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_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_ENABLED=yes # Setting this to "yes" enables the option in Nextcloud automatically.
COLLABORA_SECCOMP_POLICY=--o:security.seccomp=true # Changing the value to false allows to disable the seccomp feature of the Collabora container.
DATABASE_PASSWORD= # TODO! This needs to be a unique and good password!
@@ -18,7 +18,7 @@ NEXTCLOUD_MAX_TIME=3600 # This allows to change the upload time limit o
NEXTCLOUD_MEMORY_LIMIT=512M # This allows to change the PHP memory limit of the Nextcloud container
NEXTCLOUD_MOUNT=/mnt/ # This allows the Nextcloud container to access directories on the host. It must never be equal to the value of NEXTCLOUD_DATADIR!
NEXTCLOUD_PASSWORD= # TODO! This is the password of the initially created Nextcloud admin with username "admin".
NEXTCLOUD_STARTUP_APPS=twofactor_totp deck tasks calendar contacts apporder # Allows to modify the Nextcloud apps that are installed on starting AIO the first time
NEXTCLOUD_STARTUP_APPS="deck tasks calendar contacts" # Allows to modify the Nextcloud apps that are installed on starting AIO the first time
NEXTCLOUD_TRUSTED_CACERTS_DIR=/usr/local/share/ca-certificates/my-custom-ca # Nextcloud container will trust all the Certification Authorities, whose certificates are included in the given directory.
NEXTCLOUD_UPLOAD_LIMIT=10G # This allows to change the upload limit of the Nextcloud container
ONLYOFFICE_ENABLED=no # Setting this to "yes" enables the option in Nextcloud automatically.

View File

@@ -59,7 +59,7 @@ done
sed -i 's|_ENABLED=|_ENABLED=no # Setting this to "yes" enables the option in Nextcloud automatically.|' sample.conf
sed -i 's|TALK_ENABLED=no|TALK_ENABLED=yes|' sample.conf
sed -i 's|COLLABORA_ENABLED=no|COLLABORA_ENABLED=yes|' sample.conf
sed -i 's|COLLABORA_DICTIONARIES=|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|' sample.conf
sed -i 's|COLLABORA_DICTIONARIES=|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|' sample.conf
sed -i 's|NEXTCLOUD_DATADIR=|NEXTCLOUD_DATADIR=nextcloud_aio_nextcloud_data # You can change this to e.g. "/mnt/ncdata" to map it to a location on your host. It needs to be adjusted before the first startup and never afterwards!|' sample.conf
sed -i 's|NEXTCLOUD_MOUNT=|NEXTCLOUD_MOUNT=/mnt/ # This allows the Nextcloud container to access directories on the host. It must never be equal to the value of NEXTCLOUD_DATADIR!|' sample.conf
sed -i 's|NEXTCLOUD_UPLOAD_LIMIT=|NEXTCLOUD_UPLOAD_LIMIT=10G # This allows to change the upload limit of the Nextcloud container|' sample.conf
@@ -76,7 +76,7 @@ sed -i 's|NC_DOMAIN=|NC_DOMAIN=yourdomain.com # TODO! Needs to be chang
sed -i 's|NEXTCLOUD_PASSWORD=|NEXTCLOUD_PASSWORD= # TODO! This is the password of the initially created Nextcloud admin with username "admin".|' sample.conf
sed -i 's|TIMEZONE=|TIMEZONE=Europe/Berlin # TODO! This is the timezone that your containers will use.|' sample.conf
sed -i 's|COLLABORA_SECCOMP_POLICY=|COLLABORA_SECCOMP_POLICY=--o:security.seccomp=true # Changing the value to false allows to disable the seccomp feature of the Collabora container.|' sample.conf
sed -i 's|NEXTCLOUD_STARTUP_APPS=|NEXTCLOUD_STARTUP_APPS=twofactor_totp deck tasks calendar contacts apporder # Allows to modify the Nextcloud apps that are installed on starting AIO the first time|' sample.conf
sed -i 's|NEXTCLOUD_STARTUP_APPS=|NEXTCLOUD_STARTUP_APPS="deck tasks calendar contacts" # Allows to modify the Nextcloud apps that are installed on starting AIO the first time|' sample.conf
sed -i 's|NEXTCLOUD_ADDITIONAL_APKS=|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.|' sample.conf
sed -i 's|NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS=|NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS=imagick # This allows to add additional php extensions to the Nextcloud container permanently. Default is imagick but can be overwritten by modifying this value.|' sample.conf
sed -i 's|=$|= # TODO! This needs to be a unique and good password!|' sample.conf
@@ -101,6 +101,8 @@ echo "" >> containers.yml
echo "$OUTPUT" >> containers.yml
sed -i '/container_name/d' containers.yml
VOLUMES="$(grep -oP 'nextcloud_aio_[a-z_]+' containers.yml | sort -u)"
mapfile -t VOLUMES <<< "$VOLUMES"
echo "" >> containers.yml

View File

@@ -178,7 +178,13 @@
"REDIS_HOST_PASSWORD=%REDIS_PASSWORD%",
"TZ=%TIMEZONE%"
],
"volumes": [],
"volumes": [
{
"name": "nextcloud_aio_redis",
"location": "/data",
"writeable": true
}
],
"secrets": [
"REDIS_PASSWORD",
"ONLYOFFICE_SECRET"
@@ -201,7 +207,13 @@
"dictionaries=%COLLABORA_DICTIONARIES%",
"TZ=%TIMEZONE%"
],
"volumes": [],
"volumes": [
{
"name": "nextcloud_aio_collabora_fonts",
"location": "/opt/cool/systemplate/tmpfonts",
"writeable": true
}
],
"secrets": [],
"maxShutdownTime": 10,
"restartPolicy": "unless-stopped"
@@ -290,6 +302,16 @@
"name": "%BORGBACKUP_HOST_LOCATION%",
"location": "/mnt/borgbackup",
"writeable": true
},
{
"name": "nextcloud_aio_elasticsearch",
"location": "/nextcloud_aio_volumes/nextcloud_aio_elasticsearch",
"writeable": true
},
{
"name": "nextcloud_aio_redis",
"location": "/mnt/redis",
"writeable": true
}
],
"secrets": [
@@ -349,7 +371,8 @@
"3310"
],
"environmentVariables": [
"TZ=%TIMEZONE%"
"TZ=%TIMEZONE%",
"CLAMD_STARTUP_TIMEOUT=90"
],
"volumes": [
{

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.1.0@4defa177c89397c5e14737a80fe4896584130674">
<files psalm-version="5.2.0@fb685a16df3050d4c18d8a4100fe83abe6458cba">
<file src="public/index.php">
<MissingClosureParamType occurrences="10">
<code>$args</code>

View File

@@ -1,9 +1,7 @@
document.addEventListener("DOMContentLoaded", function(event) {
// OnlyOffice
try {
var onlyoffice = document.getElementById("onlyoffice");
var onlyoffice = document.getElementById("onlyoffice");
if (onlyoffice) {
onlyoffice.disabled = true;
} catch (error) {
// console.error(error);
}
});

View File

@@ -19,12 +19,13 @@
const xhr = e.target;
if (xhr.status === 201) {
window.location.replace(xhr.getResponseHeader('Location'));
}
if (xhr.status === 422) {
} else if (xhr.status === 422) {
showError(xhr.response);
}
if (xhr.status === 500) {
showError("Server error. Please see the logs for details.");
} else if (xhr.status === 500) {
showError("Server error. Please check the mastercontainer logs for details.");
} else {
// If the responose is not one of the above, we should reload to show the latest content
window.location.reload(1);
}
}

View File

@@ -13,11 +13,9 @@ document.addEventListener("DOMContentLoaded", function(event) {
clamav.addEventListener('change', makeOptionsFormSubmitVisible);
// OnlyOffice
try {
var onlyoffice = document.getElementById("onlyoffice");
var onlyoffice = document.getElementById("onlyoffice");
if (onlyoffice) {
onlyoffice.addEventListener('change', makeOptionsFormSubmitVisible);
} catch (error) {
// console.error(error);
}
// Collabora

View File

@@ -726,7 +726,7 @@ class ConfigurationManager
if (is_string($apps)) {
return trim($apps);
}
return 'twofactor_totp deck tasks calendar contacts apporder';
return 'deck tasks calendar contacts';
}
public function GetCollaboraDictionaries() : string {

View File

@@ -16,7 +16,7 @@
</header>
<div class="content">
<h1>Nextcloud AIO v3.2.0</h1>
<h1>Nextcloud AIO v4.0.0</h1>
{# Add 2nd tab warning #}
<script type="text/javascript" src="second-tab-warning.js"></script>
@@ -111,7 +111,7 @@
{% if borg_backup_mode == 'test' %}
Please adjust the path and/or the password in order to make it work!<br><br>
{% elseif borg_backup_mode == 'check' %}
The backup archive seems to be corrupt. Please try to use a different intact backup archive or try to fix it by following <a href="https://borgbackup.readthedocs.io/en/stable/faq.html?highlight=repair#:~:text=repairing%20a%20damaged%20repository"><b>this documentation</b></a>
The backup archive seems to be corrupt. Please try to use a different intact backup archive or try to fix it by following <a href="https://borgbackup.readthedocs.io/en/stable/faq.html#i-get-an-integrityerror-or-similar-what-now"><b>this documentation</b></a>
{% endif %}
{% elseif backup_exit_code == 0 %}
<span class="status success"></span> Last {{ borg_backup_mode }} successful! (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup">Logs</a>)<br /><br />
@@ -328,6 +328,9 @@
<h2>Backup and restore</h2>
{% if backup_exit_code > 0 %}
<span class="status error"></span> Last {{ borg_backup_mode }} failed! (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup">Logs</a>)<br /><br />
{% if borg_backup_mode == "check" %}
The backup archive seems to be corrupt. You can try to fix it by following <a href="https://borgbackup.readthedocs.io/en/stable/faq.html#i-get-an-integrityerror-or-similar-what-now"><b>this documentation</b></a><br /><br />
{% endif %}
{% if has_backup_run_once == false %}
You may change the backup path again since the initial backup was not successful. After submitting the new value, you need to click on 'Create Backup' for testing the new value.<br /><br />
<form method="POST" action="/api/configuration" class="xhr">

View File

@@ -467,7 +467,7 @@ If you get an error during the domain validation which states that your ip-addre
You can run AIO also with docker rootless. How to do this is documented here: [docker-rootless.md](https://github.com/nextcloud/all-in-one/blob/main/docker-rootless.md)
### How to change the Nextcloud apps that are installed on the first startup?
You might want to adjust the Nextcloud apps that are installed upon the first startup of the Nextcloud container. You can do so by adding `-e NEXTCLOUD_STARTUP_APPS="twofactor_totp deck tasks calendar contacts apporder"` to the docker run command of the mastercontainer and customize the value to your fitting. It must be a string with small letters a-z, spaces and hyphens or '_'.
You might want to adjust the Nextcloud apps that are installed upon the first startup of the Nextcloud container. You can do so by adding `-e NEXTCLOUD_STARTUP_APPS="deck tasks calendar contacts"` to the docker run command of the mastercontainer and customize the value to your fitting. It must be a string with small letters a-z, spaces and hyphens or '_'.
### How to add packets permanently to the Nextcloud container?
Some Nextcloud apps require additional external dependencies that must be bundled within Nextcloud container in order to work correctly. As we cannot put each and every dependency for all apps into the container - as this would make the project very fast unmaintainable - there is an official way how you can add additional dependencies into the Nextcloud container. However note that doing this is disrecommended since we do not test Nextcloud apps that require external dependencies.

View File

@@ -15,7 +15,7 @@
- [ ] When starting the mastercontainer with `-e NEXTCLOUD_TRUSTED_CACERTS_DIR=/path/to/my/cacerts`, the resulting nextcloud container should trust all the Certification Authorities, whose certificates are included in the directory `/path/to/my/cacerts` on the host.
See https://github.com/nextcloud/all-in-one#how-to-trust-user-defiend-certification-authorities-ca
- [ ] When starting the mastercontainer with `-e COLLABORA_SECCOMP_DISABLED=true`, the resulting collabora container should have `--o:security.seccomp=false` applied to it.
- [ ] When starting the mastercontainer with `-e NEXTCLOUD_STARTUP_APPS=deck`, the resulting Nextcloud should have only installed the deck app and not the other apps that get installed by default. Default are `twofactor_totp deck tasks calendar contacts apporder`.
- [ ] When starting the mastercontainer with `-e NEXTCLOUD_STARTUP_APPS=deck`, the resulting Nextcloud should have only installed the deck app and not the other apps that get installed by default. Default are `deck tasks calendar contacts`.
- [ ] When starting the mastercontainer with `-e NEXTCLOUD_ADDITIONAL_APKS=zip`, the resulting Nextcloud container should have the zip package installed and not imagemagick.
- [ ] When starting the mastercontainer with `-e NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS=inotify`, the resulting Nextcloud container should have the inotify extension installed and not the imagick extension.