Compare commits

...

118 Commits

Author SHA1 Message Date
Simon L
c5697a8637 temporarily disable apcu_clear_cache again
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-14 09:22:36 +02:00
Simon L
71481cd731 fix remaining problem with apache container
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-13 15:44:27 +02:00
Simon L
8bf8e3f562 fix starting of apache
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-13 15:18:32 +02:00
Simon L
b1b96a5d8c fix apache build
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-13 15:01:28 +02:00
Simon L
7c55c449b8 Merge pull request #2952 from nextcloud/enh/noid/revert-collabora-read-only
Revert "make collabora container read-only"
2023-07-13 14:57:26 +02:00
Simon L
3e3dbf26b5 Revert "make collabora container read-only"
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-13 14:55:56 +02:00
Simon L
9a1de583c6 try to fix further stuff
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-13 14:54:45 +02:00
Simon L
4a60b4d004 a few fixes
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-13 14:40:51 +02:00
Simon L
6bab59c5f9 increase to 6.3.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-13 14:19:28 +02:00
Simon L
1d67da4bd5 Merge pull request #2874 from nextcloud/enh/2506/apache
make apache container read-only
2023-07-13 14:18:49 +02:00
Simon L
2d0b92db77 make apache container read-only
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-13 13:55:20 +02:00
Simon L
6272d8d223 Merge pull request #2876 from nextcloud/enh/2506/talk-recording
make talk-recording read-only
2023-07-13 12:16:28 +02:00
Simon L
d5f309df3a Merge pull request #2875 from nextcloud/enh/2506/talk
make talk container read-only
2023-07-13 12:15:58 +02:00
Simon L
bb63abd8a6 Merge pull request #2872 from nextcloud/enh/2506/collabora
make collabora container read-only
2023-07-13 12:14:26 +02:00
Simon L
581456b450 Merge pull request #2871 from nextcloud/enh/2506/postgresql
make postgresql container read-only
2023-07-13 12:13:56 +02:00
Simon L
554cb34d74 Merge pull request #2870 from nextcloud/enh/2506/domaincheck
make domaincheck container read-only
2023-07-13 12:13:28 +02:00
Simon L
ea46ed4095 move showpassword to global scope
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-13 12:01:46 +02:00
Simon L
9f77ac6c78 helm - generate release notes
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-12 16:11:42 +02:00
Simon L
2c913a676a Merge pull request #2944 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-23.05.1.3.1
Bump collabora/code from 23.05.1.2.1 to 23.05.1.3.1 in /Containers/collabora
2023-07-12 14:53:17 +02:00
dependabot[bot]
2e0a741575 Bump collabora/code in /Containers/collabora
Bumps collabora/code from 23.05.1.2.1 to 23.05.1.3.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-12 12:36:35 +00:00
Simon L
16c60f1530 Merge pull request #2943 from nextcloud/dependabot/docker/Containers/imaginary/golang-1.20.6-alpine3.18
Bump golang from 1.20.5-alpine3.18 to 1.20.6-alpine3.18 in /Containers/imaginary
2023-07-12 14:23:07 +02:00
dependabot[bot]
69a3b365e5 Bump golang in /Containers/imaginary
Bumps golang from 1.20.5-alpine3.18 to 1.20.6-alpine3.18.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-12 12:11:46 +00:00
Simon L
4e201c0dab Merge pull request #2941 from nextcloud/dependabot/docker/Containers/nextcloud/php-8.1.21-fpm-alpine3.18
Bump php from 8.1.20-fpm-alpine3.18 to 8.1.21-fpm-alpine3.18 in /Containers/nextcloud
2023-07-11 14:59:59 +02:00
dependabot[bot]
6550e012c3 Bump php in /Containers/nextcloud
Bumps php from 8.1.20-fpm-alpine3.18 to 8.1.21-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-07-11 12:59:19 +00:00
Simon L
113a00d2d2 Merge pull request #2940 from nextcloud/dependabot/docker/Containers/redis/redis-7.0.12-alpine
Bump redis from 7.0.11-alpine to 7.0.12-alpine in /Containers/redis
2023-07-11 14:58:34 +02:00
Simon L
17b01980f4 Merge pull request #2939 from nextcloud/dependabot/docker/Containers/mastercontainer/docker-24.0.4-cli
Bump docker from 24.0.3-cli to 24.0.4-cli in /Containers/mastercontainer
2023-07-11 14:58:21 +02:00
Simon L
8993da2632 Merge pull request #2938 from nextcloud/dependabot/docker/Containers/mastercontainer/php-8.2.8-fpm-alpine3.18
Bump php from 8.2.7-fpm-alpine3.18 to 8.2.8-fpm-alpine3.18 in /Containers/mastercontainer
2023-07-11 14:58:06 +02:00
dependabot[bot]
04e2872669 Bump redis from 7.0.11-alpine to 7.0.12-alpine in /Containers/redis
Bumps redis from 7.0.11-alpine to 7.0.12-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-11 12:33:20 +00:00
dependabot[bot]
48239ef9fa Bump docker from 24.0.3-cli to 24.0.4-cli in /Containers/mastercontainer
Bumps docker from 24.0.3-cli to 24.0.4-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-07-11 12:32:11 +00:00
dependabot[bot]
c8e2bfd7ba Bump php in /Containers/mastercontainer
Bumps php from 8.2.7-fpm-alpine3.18 to 8.2.8-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-07-11 12:32:07 +00:00
Simon L
86bb1f6a7c Merge pull request #2931 from notEvil/i2921
Fix cp command in migration.md
2023-07-10 17:22:40 +02:00
notEvil
f10b5baee9 Fixes cp command in migration.md
Signed-off-by: notEvil <not_evil@rappold1.at>
2023-07-10 16:49:04 +02:00
Simon L
37ebc38b19 Merge pull request #2922 from nextcloud/enh/noid/coturn-pin-alpine-version
coturn - pin alpine version correctly
2023-07-10 16:48:18 +02:00
Simon L
6f3f87b24c Merge pull request #2930 from nextcloud/enh/noid/remove-dd-warning
Remove warning about Docker Desktop v4.19
2023-07-10 16:47:36 +02:00
Simon L
3794140e71 Merge pull request #2926 from nextcloud/enh/noid/imaginary-add-tmpfs
imaginary - add tmpfs in /tmp
2023-07-10 16:47:21 +02:00
Simon L
527c6410df coturn - pin alpine version correctly
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-10 16:46:42 +02:00
Simon L
dc34c8dff0 Merge pull request #2911 from nextcloud/dependabot/docker/Containers/mastercontainer/docker-24.0.3-cli
Bump docker from 24.0.2-cli to 24.0.3-cli in /Containers/mastercontainer
2023-07-10 16:45:56 +02:00
Simon L
893814724f Merge pull request #2907 from nextcloud/dependabot/docker/Containers/talk/strukturag/nextcloud-spreed-signaling-1.1.3
Bump strukturag/nextcloud-spreed-signaling from 1.1.2 to 1.1.3 in /Containers/talk
2023-07-10 16:45:37 +02:00
Simon L
2097a4b8c0 Merge pull request #2906 from nextcloud/talk-container-update
talk update
2023-07-10 16:45:06 +02:00
Simon L
b5a1e74693 Merge pull request #2894 from nextcloud/dependabot/composer/php/php-di/slim-bridge-3.4.0
Bump php-di/slim-bridge from 3.3.0 to 3.4.0 in /php
2023-07-10 16:44:24 +02:00
Simon L
0d92844449 Merge pull request #2888 from t-h2o/docs_misspelling
documentation: misspelling
2023-07-10 16:43:45 +02:00
Simon L
dc3bf6f7ed Remove warning about Docker Desktop v4.19
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-10 16:40:46 +02:00
Simon L
382593d553 imaginary - add tmpfs in /tmp
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-10 16:30:39 +02:00
dependabot[bot]
0cc222fc0c Bump docker from 24.0.2-cli to 24.0.3-cli in /Containers/mastercontainer
Bumps docker from 24.0.2-cli to 24.0.3-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-07-07 12:04:40 +00:00
dependabot[bot]
ad6be7c914 Bump strukturag/nextcloud-spreed-signaling in /Containers/talk
Bumps strukturag/nextcloud-spreed-signaling from 1.1.2 to 1.1.3.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-05 12:26:16 +00:00
szaimen
8dde61eb89 talk-update automated change
Signed-off-by: GitHub <noreply@github.com>
2023-07-05 12:03:26 +00:00
dependabot[bot]
25f9f99ed9 Bump php-di/slim-bridge from 3.3.0 to 3.4.0 in /php
Bumps [php-di/slim-bridge](https://github.com/PHP-DI/Slim-Bridge) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/PHP-DI/Slim-Bridge/releases)
- [Commits](https://github.com/PHP-DI/Slim-Bridge/compare/3.3.0...3.4.0)

---
updated-dependencies:
- dependency-name: php-di/slim-bridge
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-30 12:13:12 +00:00
|°_°|
5cb1d88238 docs: misspelling
sed -i \
's/envorinmental/environment/g' \
$(find . -type f)

Signed-off-by: |°_°| <grivel.theo@protonmail.com>
2023-06-29 23:50:37 +02:00
Simon L
fbeb120d0f Merge pull request #2884 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-23.05.1.2.1
Bump collabora/code from 23.05.0.5.1 to 23.05.1.2.1 in /Containers/collabora
2023-06-28 15:30:00 +02:00
dependabot[bot]
8b55ed5826 Bump collabora/code in /Containers/collabora
Bumps collabora/code from 23.05.0.5.1 to 23.05.1.2.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-28 12:59:09 +00:00
Simon L
ac2d639bd8 Merge pull request #2882 from nextcloud/automated/noid/psalm-baseline-update-1687925361
[Automated] Update psalm-baseline.xml
2023-06-28 09:14:44 +02:00
nextcloud-command
47661ec3ea Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2023-06-28 04:09:21 +00:00
Simon L
6ec853a3d5 Merge pull request #2878 from nextcloud/automated/noid/psalm-baseline-update-1687838928
[Automated] Update psalm-baseline.xml
2023-06-27 10:04:15 +02:00
nextcloud-command
84ad270e45 Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2023-06-27 04:08:48 +00:00
Simon L
0c2905b658 Merge pull request #2869 from nextcloud/enh/2830/rework-notify-push
rework notify-push in order to export values as env
2023-06-26 18:22:09 +02:00
Simon L
5189f0cd51 make talk-recording read-only
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-26 18:18:26 +02:00
Simon L
ab5449f835 make talk container read-only
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-26 18:11:00 +02:00
Simon L
6747613a34 Merge pull request #2787 from nextcloud/password-field
show AIO password
2023-06-26 17:50:38 +02:00
Simon L
182f24bb4c allow hyphens
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-26 17:43:14 +02:00
Simon L
671edeb1d1 make collabora container read-only
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-26 17:43:14 +02:00
Zoey
a5a1ea504a Update php/public/forms.js
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-06-26 17:42:46 +02:00
Zoey
dd02dc82a5 Update php/public/forms.js
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-06-26 17:42:33 +02:00
Simon L
1354243f09 Merge pull request #2868 from nextcloud/enh/noid/revert-tempdir-adjustment
revert adjustment of tempdirectory
2023-06-26 17:40:40 +02:00
Simon L
b3d0b99383 Merge pull request #2873 from nextcloud/enh/2860/backup-time
adjust wording for backup time
2023-06-26 17:29:02 +02:00
Simon L
e02a16c680 adjust wording for backup time
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-26 17:11:51 +02:00
Simon L
9fddad59b5 make postgresql container read-only
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-26 16:51:10 +02:00
Simon L
cc9dbc9590 make domaincheck container read-only
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-26 16:06:14 +02:00
Simon L
48ee5774b7 rework notify-push in order to export values as env
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-26 15:56:38 +02:00
Simon L
134905c028 Merge pull request #2867 from nextcloud/enh/noid/adjust-migration-docs
adjust migration docs
2023-06-26 15:22:36 +02:00
Simon L
dfe6bd5ff0 revert adjustment of tempdirectory
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-26 15:21:55 +02:00
Zoey
559101a308 Update php/templates/login.twig
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-06-26 15:13:14 +02:00
Zoey
1ba0f1b7a3 Update php/templates/login.twig
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-06-26 15:12:01 +02:00
Simon L
fce23622e9 Merge pull request #2858 from nextcloud/enh/noid/add-low-space-notification
add low-on-space notification
2023-06-26 15:08:43 +02:00
Simon L
405b9bd7bc Merge pull request #2865 from nextcloud/imaginary-container-update
Imaginary update
2023-06-26 15:03:15 +02:00
Simon L
8da2a51282 Merge pull request #2866 from nextcloud/aio-yaml-update
Yaml updates
2023-06-26 15:02:13 +02:00
Simon L
4d2d66a7d1 adjust an additional point and wording
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-26 14:53:33 +02:00
41it
581b125ea6 Update migration.md
Added hint to install same apps on new installation.

Signed-off-by: 41it <137164547+41it@users.noreply.github.com>
2023-06-26 14:53:33 +02:00
Simon L
2b5d3de48e adjust wording
Signed-off-by: Simon L <szaimen@e.mail.de>

Signed-off-by: Simon L. <szaimen@e.mail.de>
2023-06-26 14:48:02 +02:00
Zoey
620c72de23 Update php/public/forms.js
Signed-off-by: Zoey <zoey@z0ey.de>
2023-06-26 14:46:38 +02:00
Zoey
203b7cb3fc Update php/templates/login.twig
Signed-off-by: Zoey <zoey@z0ey.de>
2023-06-26 14:46:38 +02:00
Zoey
13a9b9beaf Update containers.twig
Signed-off-by: Zoey <zoey@z0ey.de>
2023-06-26 14:46:38 +02:00
Zoey
f8d02440c1 fix js
Signed-off-by: Zoey <zoey@z0ey.de>
2023-06-26 14:46:38 +02:00
Zoey
a77df43dff update
Signed-off-by: Zoey <zoey@z0ey.de>
2023-06-26 14:46:38 +02:00
Zoey
e8ed7aa236 Update forms.js
Signed-off-by: Zoey <zoey@z0ey.de>
2023-06-26 14:46:38 +02:00
Zoey
ae1d14dbc5 reorder options
Signed-off-by: Zoey <zoey@z0ey.de>
2023-06-26 14:46:38 +02:00
Zoey
9e26e24820 show AIO password
Signed-off-by: Zoey <zoey@z0ey.de>
2023-06-26 14:46:38 +02:00
szaimen
53ef726114 Yaml updates
Signed-off-by: GitHub <noreply@github.com>
2023-06-26 12:10:47 +00:00
szaimen
161c967679 imaginary-update automated change
Signed-off-by: GitHub <noreply@github.com>
2023-06-26 12:10:27 +00:00
Simon L
2a83c57425 fix psalm
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-26 12:45:29 +02:00
Simon L
addb52fd8c Merge pull request #2857 from nextcloud/enh/noid/add-low-disk-space-warning
add logging in case disk space is low and thus login might fail
2023-06-26 12:41:08 +02:00
Simon L
27b482f75d Merge pull request #2842 from nextcloud/enh/noid/files-antivirus-improvment
small improvement to files_antivirus settings
2023-06-26 12:40:11 +02:00
Simon L
24dc09ce94 Merge pull request #2828 from nextcloud/enh/2825/enable-http3
apache - expose udp for http3 to work
2023-06-26 12:39:31 +02:00
Simon L
8452addc1f Merge pull request #2826 from nextcloud/enh/noid/disable-http3-mastercontainer
mastercontainer - disable http3
2023-06-26 12:39:00 +02:00
Simon L
a145979c7f Merge pull request #2815 from nextcloud/enh/noid/add-imaginary-note
add note to AIO interface that imaginary is incompatible with SSE
2023-06-26 12:35:53 +02:00
Simon L
06c9ba5ac9 Merge pull request #2847 from nextcloud/talk-container-update
talk update
2023-06-26 12:34:51 +02:00
Simon L
d30a9efcd6 Merge pull request #2817 from nextcloud/enh/noid/remove-r3-coturn
remove r3 from coturn version
2023-06-26 12:34:25 +02:00
Simon L
78ae2d174d Merge pull request #2840 from nextcloud/dependabot/docker/Containers/talk/nats-2.9.19-scratch
Bump nats from 2.9.18-scratch to 2.9.19-scratch in /Containers/talk
2023-06-26 12:34:15 +02:00
Simon L
345ef54850 Merge pull request #2864 from nextcloud/aio-helm-update
Helm Chart updates
2023-06-26 12:30:28 +02:00
szaimen
921952c042 Helm Chart updates
Signed-off-by: GitHub <noreply@github.com>
2023-06-26 10:27:30 +00:00
Simon L
d9a4d29392 Merge pull request #2861 from nextcloud/enh/noid/disable-watchtower-pulling
disable watchtower pulling for containers
2023-06-26 12:26:31 +02:00
Simon L
6d860e4f76 Merge pull request #2782 from nextcloud/aio-yaml-update
Yaml updates
2023-06-26 12:17:44 +02:00
Simon L
68d95af47d disable watchtower pulling for containers
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-26 00:56:08 +02:00
Simon L
52b3281ad8 add last note regarding that one can add further storages to backup later on
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-26 00:16:10 +02:00
szaimen
4e8ce65e02 talk-update automated change
Signed-off-by: GitHub <noreply@github.com>
2023-06-25 12:03:06 +00:00
szaimen
998e7f07d2 Yaml updates
Signed-off-by: GitHub <noreply@github.com>
2023-06-25 12:02:30 +00:00
Simon L
463a695326 add low-on-space notification
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-25 01:32:42 +02:00
Simon L
66452b40ff add logging in case disk space is low and thus login might fail
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-25 01:00:18 +02:00
Simon L
27dbeec29d Merge pull request #2852 from nextcloud/enh/noid/huge-docker-logs
add back instructions about huge docker logs
2023-06-24 15:07:25 +02:00
Simon L
4ed373636d add comment what level 30 and debug-level 3 means
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-24 14:09:57 +02:00
Simon L
020e3d6cb6 add back instructions about huge docker logs
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-24 13:59:09 +02:00
Simon L
d0cae68636 remove logrotate advice as it should not be needed anymore
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-23 14:53:33 +02:00
Simon L
3f3811bd3e small improvement to files_antivirus settings
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-21 20:03:05 +02:00
dependabot[bot]
efa9b096ce Bump nats from 2.9.18-scratch to 2.9.19-scratch in /Containers/talk
Bumps nats from 2.9.18-scratch to 2.9.19-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-06-21 12:58:54 +00:00
Simon L
cff1e5a070 address review
Signed-off-by: Simon L <szaimen@e.mail.de>

Co-authored-by: Zoey <zoey@z0ey.de>
Signed-off-by: Simon L. <szaimen@e.mail.de>
2023-06-20 22:19:33 +02:00
Simon L
9777f70294 apache - expose udp for http3 to work
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-20 21:30:56 +02:00
Simon L
01ec0cb0c2 mastercontainer - disable http3
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-20 21:22:21 +02:00
Simon L
4492f17809 remove r3 from coturn version
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-19 16:36:48 +02:00
Simon L
f520018ce3 add note to AIO interface that imaginary is incompatible with SSE
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-19 16:00:25 +02:00
60 changed files with 342 additions and 106 deletions

View File

@@ -46,3 +46,4 @@ jobs:
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
CR_RELEASE_NAME_TEMPLATE: "helm-chart-{{ .Version }}"
CR_SKIP_EXISTING: true
CR_GENERATE_RELEASE_NOTES: true

View File

@@ -22,6 +22,7 @@ RUN set -ex; \
\
mkdir -p /mnt/data; \
chown -R www-data:www-data /mnt/data; \
chown -R 777 /tmp; \
\
apk add --no-cache \
bash \
@@ -59,9 +60,14 @@ RUN set -ex; \
mkdir /var/run/supervisord; \
chown www-data:www-data /var/run/supervisord; \
chown www-data:www-data /var/log/supervisord; \
chmod 777 /var/run/supervisord; \
chmod 777 /var/log/supervisord; \
\
chown -R www-data:www-data /usr/local/apache2; \
chmod +r -R /usr/local/apache2; \
mkdir -p /usr/local/apache2/logs; \
chmod 777 -R /home/www-data; \
chmod 777 -R /usr/local/apache2/logs; \
\
echo "root:$(openssl rand -base64 12)" | chpasswd
@@ -71,4 +77,4 @@ ENTRYPOINT ["/start.sh"]
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
HEALTHCHECK CMD /healthcheck.sh
LABEL com.centurylinklabs.watchtower.monitor-only="true"
LABEL com.centurylinklabs.watchtower.enable="false"

View File

@@ -35,18 +35,18 @@ if [ "$APACHE_PORT" != '443' ]; then
else
CADDYFILE="$(sed 's|auto_https.*|auto_https disable_redirects|' /Caddyfile)"
fi
echo "$CADDYFILE" > /Caddyfile
echo "$CADDYFILE" > /tmp/Caddyfile
# Change the trusted_proxies in case of reverse proxies
if [ "$APACHE_PORT" != '443' ]; then
CADDYFILE="$(sed 's|# trusted_proxies placeholder|trusted_proxies static private_ranges|' /Caddyfile)"
CADDYFILE="$(sed 's|# trusted_proxies placeholder|trusted_proxies static private_ranges|' /tmp/Caddyfile)"
else
CADDYFILE="$(sed 's|trusted_proxies.*private_ranges|# trusted_proxies placeholder|' /Caddyfile)"
CADDYFILE="$(sed 's|trusted_proxies.*private_ranges|# trusted_proxies placeholder|' /tmp/Caddyfile)"
fi
echo "$CADDYFILE" > /Caddyfile
echo "$CADDYFILE" > /tmp/Caddyfile
# Fix the Caddyfile format
caddy fmt --overwrite /Caddyfile
caddy fmt --overwrite /tmp/Caddyfile
# Add caddy path
mkdir -p /mnt/data/caddy/

View File

@@ -20,4 +20,4 @@ stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=/usr/bin/caddy run --config /Caddyfile
command=/usr/bin/caddy run --config /tmp/Caddyfile

View File

@@ -18,5 +18,5 @@ COPY --chmod=770 *.sh /
ENTRYPOINT ["/start.sh"]
USER root
LABEL com.centurylinklabs.watchtower.monitor-only="true"
LABEL com.centurylinklabs.watchtower.enable="false"
ENV BORG_RETENTION_POLICY="--keep-within=7d --keep-weekly=4 --keep-monthly=6"

View File

@@ -15,4 +15,4 @@ VOLUME /var/lib/clamav
USER clamav
LABEL com.centurylinklabs.watchtower.monitor-only="true"
LABEL com.centurylinklabs.watchtower.enable="false"

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.0.5.1
FROM collabora/code:23.05.1.3.1
USER root
@@ -11,9 +11,9 @@ RUN set -ex; \
tzdata \
netcat-openbsd \
; \
rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/*;
USER 100
HEALTHCHECK CMD nc -z localhost 9980 || exit 1
LABEL com.centurylinklabs.watchtower.monitor-only="true"
LABEL com.centurylinklabs.watchtower.enable="false"

View File

@@ -3,10 +3,11 @@ RUN set -ex; \
apk add --no-cache bash lighttpd netcat-openbsd; \
adduser -S www-data -G www-data; \
rm -rf /etc/lighttpd/lighttpd.conf; \
chmod +r -R /etc/lighttpd; \
chmod 777 -R /etc/lighttpd; \
mkdir -p /var/www/domaincheck; \
chown www-data:www-data -R /var/www
COPY --chown=www-data:www-data lighttpd.conf /etc/lighttpd/lighttpd.conf
chown www-data:www-data -R /var/www; \
chmod 777 -R /var/www/domaincheck
COPY --chown=www-data:www-data lighttpd.conf /lighttpd.conf
COPY --chmod=775 start.sh /start.sh
@@ -14,4 +15,4 @@ USER www-data
ENTRYPOINT ["/start.sh"]
HEALTHCHECK CMD nc -z localhost $APACHE_PORT || exit 1
LABEL com.centurylinklabs.watchtower.monitor-only="true"
LABEL com.centurylinklabs.watchtower.enable="false"

View File

@@ -11,7 +11,7 @@ if [ -z "$APACHE_PORT" ]; then
export APACHE_PORT="443"
fi
CONF_FILE="$(sed "s|ipv6-placeholder|\[::\]:$APACHE_PORT|" /etc/lighttpd/lighttpd.conf)"
CONF_FILE="$(sed "s|ipv6-placeholder|\[::\]:$APACHE_PORT|" /lighttpd.conf)"
echo "$CONF_FILE" > /etc/lighttpd/lighttpd.conf
# Check config file

View File

@@ -16,4 +16,4 @@ RUN set -ex; \
USER 1000:0
HEALTHCHECK CMD nc -z localhost 9200 || exit 1
LABEL com.centurylinklabs.watchtower.monitor-only="true"
LABEL com.centurylinklabs.watchtower.enable="false"

View File

@@ -1,4 +1,4 @@
FROM golang:1.20.5-alpine3.18 as go
FROM golang:1.20.6-alpine3.18 as go
ENV IMAGINARY_HASH b632dae8cc321452c3f85bcae79c580b1ae1ed84
@@ -35,4 +35,4 @@ ENV MALLOC_ARENA_MAX=2
ENTRYPOINT ["imaginary", "-return-size", "-max-allowed-resolution", "222.2"]
HEALTHCHECK CMD nc -z localhost "$PORT" || exit 1
LABEL com.centurylinklabs.watchtower.monitor-only="true"
LABEL com.centurylinklabs.watchtower.enable="false"

View File

@@ -10,6 +10,10 @@
log {
level ERROR
}
servers {
protocols h1 h2 h2c
}
}
http://:80 {

View File

@@ -1,11 +1,11 @@
# Docker CLI is a requirement
FROM docker:24.0.2-cli as docker
FROM docker:24.0.4-cli as docker
# Caddy is a requirement
FROM caddy:2.6.4-alpine as caddy
# From https://github.com/docker-library/php/blob/master/8.2/alpine3.18/fpm/Dockerfile
FROM php:8.2.7-fpm-alpine3.18
FROM php:8.2.8-fpm-alpine3.18
EXPOSE 80
EXPOSE 8080

View File

@@ -57,6 +57,9 @@ while true; do
# Remove dangling images
sudo -u www-data docker image prune --force
# Check for available free space
sudo -u www-data php /var/www/docker-aio/php/src/Cron/CheckFreeDiskSpace.php
# Remove mastercontainer from default bridge network
if sudo -u www-data docker inspect nextcloud-aio-mastercontainer --format "{{.NetworkSettings.Networks}}" | grep -q "bridge"; then
sudo -u www-data docker network disconnect bridge nextcloud-aio-mastercontainer

View File

@@ -64,7 +64,6 @@ fi
# Check if api version is supported
if ! sudo -u www-data docker info &>/dev/null; then
print_red "Cannot connect to the docker socket. Cannot proceed."
echo "If you are on Docker Desktop v4.19 or higher, see https://github.com/nextcloud/all-in-one/issues/2450"
echo "If SELinux is enabled on your host, see https://github.com/nextcloud/all-in-one#are-there-known-problems-when-selinux-is-enabled"
echo "If you are on TrueNas SCALE, see https://github.com/nextcloud/all-in-one#can-i-run-aio-on-truenas-scale"
exit 1

View File

@@ -1,4 +1,4 @@
FROM php:8.1.20-fpm-alpine3.18
FROM php:8.1.21-fpm-alpine3.18
ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 10G
@@ -223,4 +223,4 @@ ENTRYPOINT ["/start.sh"]
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
HEALTHCHECK CMD sudo -E -u www-data bash /healthcheck.sh
LABEL com.centurylinklabs.watchtower.monitor-only="true"
LABEL com.centurylinklabs.watchtower.enable="false"

View File

@@ -444,12 +444,14 @@ if [ -z "$OBJECTSTORE_S3_BUCKET" ] && [ -z "$OBJECTSTORE_SWIFT_URL" ]; then
exit 1
fi
# Configure tempdirectory
mkdir -p "$NEXTCLOUD_DATA_DIR/tmp/"
if ! grep -q upload_tmp_dir /usr/local/etc/php/conf.d/nextcloud.ini; then
echo "upload_tmp_dir = $NEXTCLOUD_DATA_DIR/tmp/" >> /usr/local/etc/php/conf.d/nextcloud.ini
# Delete formerly configured tempdirectory as the default is usually faster (if the datadir is on a HDD or network FS)
if [ "$(php /var/www/html/occ config:system:get tempdirectory)" = "$NEXTCLOUD_DATA_DIR/tmp/" ]; then
php /var/www/html/occ config:system:delete tempdirectory
if [ -d "$NEXTCLOUD_DATA_DIR/tmp/" ]; then
rm -r "$NEXTCLOUD_DATA_DIR/tmp/"
fi
fi
php /var/www/html/occ config:system:set tempdirectory --value="$NEXTCLOUD_DATA_DIR/tmp/"
fi
# Perform fingerprint update if instance was restored
@@ -648,7 +650,7 @@ if [ "$CLAMAV_ENABLED" = 'yes' ]; then
php /var/www/html/occ config:app:set files_antivirus av_port --value="3310"
php /var/www/html/occ config:app:set files_antivirus av_host --value="$CLAMAV_HOST"
php /var/www/html/occ config:app:set files_antivirus av_stream_max_length --value="104857600"
php /var/www/html/occ config:app:set files_antivirus av_max_file_size --value="-1"
php /var/www/html/occ config:app:set files_antivirus av_max_file_size --value="104857600"
php /var/www/html/occ config:app:set files_antivirus av_infected_action --value="only_log"
fi
else

View File

@@ -18,4 +18,4 @@ USER 33
ENTRYPOINT ["/start.sh"]
HEALTHCHECK CMD nc -z localhost 7867 || exit 1
LABEL com.centurylinklabs.watchtower.monitor-only="true"
LABEL com.centurylinklabs.watchtower.enable="false"

View File

@@ -27,12 +27,14 @@ elif [ "$CPU_ARCH" != "x86_64" ]; then
export CPU_ARCH="aarch64"
fi
# Set sensitive values as env
export DATABASE_URL="postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST/$POSTGRES_DB"
export REDIS_URL="redis://:$REDIS_HOST_PASSWORD@$REDIS_HOST"
# Run it
/nextcloud/custom_apps/notify_push/bin/"$CPU_ARCH"/notify_push \
--database-prefix="oc_" \
--nextcloud-url "https://$NC_DOMAIN" \
--port 7867 \
--redis-url "redis://:$REDIS_HOST_PASSWORD@$REDIS_HOST" \
--database-url "postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST/$POSTGRES_DB"
--port 7867
exec "$@"

View File

@@ -4,4 +4,4 @@ FROM onlyoffice/documentserver:7.4.0.1
# USER root is probably used
HEALTHCHECK CMD nc -z localhost 80 || exit 1
LABEL com.centurylinklabs.watchtower.monitor-only="true"
LABEL com.centurylinklabs.watchtower.enable="false"

View File

@@ -22,6 +22,7 @@ RUN set -ex; \
# Fix default permissions
chown -R postgres:postgres /var/lib/postgresql; \
chown -R postgres:postgres /var/run/postgresql; \
chmod -R 777 /var/run/postgresql; \
chown -R postgres:postgres "$PGDATA"; \
\
mkdir /mnt/data; \
@@ -37,4 +38,4 @@ USER postgres
ENTRYPOINT ["/start.sh"]
HEALTHCHECK CMD /healthcheck.sh
LABEL com.centurylinklabs.watchtower.monitor-only="true"
LABEL com.centurylinklabs.watchtower.enable="false"

View File

@@ -1,5 +1,5 @@
# From https://github.com/docker-library/redis/blob/master/7.0/alpine/Dockerfile
FROM redis:7.0.11-alpine
FROM redis:7.0.12-alpine
COPY --chmod=775 start.sh /start.sh
@@ -13,4 +13,4 @@ USER redis
ENTRYPOINT ["/start.sh"]
HEALTHCHECK CMD redis-cli -a $REDIS_HOST_PASSWORD PING || exit 1
LABEL com.centurylinklabs.watchtower.monitor-only="true"
LABEL com.centurylinklabs.watchtower.enable="false"

View File

@@ -2,7 +2,7 @@ FROM python:3.11.4-alpine3.18
COPY --chmod=775 start.sh /start.sh
ENV RECORDING_VERSION v17.0.0
ENV RECORDING_VERSION v17.0.1
RUN set -ex; \
apk add --no-cache \
@@ -31,6 +31,9 @@ RUN set -ex; \
touch /etc/recording.conf; \
chown recording:recording -R \
/tmp /etc/recording.conf; \
mkdir -p /conf; \
chmod 777 /conf; \
chmod 777 /tmp; \
apk del --no-cache \
git \
wget \
@@ -40,7 +43,7 @@ RUN set -ex; \
WORKDIR /tmp
USER recording
ENTRYPOINT ["/start.sh"]
CMD ["python", "-m", "nextcloud.talk.recording", "--config", "/etc/recording.conf"]
CMD ["python", "-m", "nextcloud.talk.recording", "--config", "/conf/recording.conf"]
HEALTHCHECK CMD nc -z localhost 1234 || exit 1
LABEL com.centurylinklabs.watchtower.monitor-only="true"
LABEL com.centurylinklabs.watchtower.enable="false"

View File

@@ -12,8 +12,9 @@ elif [ -z "$INTERNAL_SECRET" ]; then
exit 1
fi
cat << RECORDING_CONF > "/etc/recording.conf"
cat << RECORDING_CONF > "/conf/recording.conf"
[logs]
# 30 means Warning
level = 30
[http]

View File

@@ -1,9 +1,7 @@
FROM nats:2.9.18-scratch as nats
FROM strukturag/nextcloud-spreed-signaling:1.1.2 as signaling
FROM coturn/coturn:4.6.2-r3-alpine
FROM nats:2.9.19-scratch as nats
FROM strukturag/nextcloud-spreed-signaling:1.1.3 as signaling
FROM coturn/coturn:4.6.2-alpine3.18
USER root
# Pin alpine version manually as long as https://github.com/coturn/coturn/issues/1226 is not done
ENV ALPINE_VERSION=3.18
COPY --from=nats /nats-server /usr/local/bin/nats-server
COPY --from=signaling /usr/bin/nextcloud-spreed-signaling /usr/local/bin/nextcloud-spreed-signaling
@@ -12,7 +10,6 @@ COPY --chmod=775 start.sh /start.sh
COPY --chmod=664 supervisord.conf /supervisord.conf
RUN set -ex; \
grep VERSION_ID /etc/os-release | grep -q "$ALPINE_VERSION.[0-9]\+$"; \
apk add --no-cache \
ca-certificates \
tzdata \
@@ -44,24 +41,28 @@ RUN set -ex; \
echo "root:$(openssl rand -base64 12)" | chpasswd; \
\
touch \
/etc/nats.conf \
/etc/signaling.conf \
/etc/turnserver.conf; \
/etc/nats.conf; \
echo "listen: 127.0.0.1:4222" | tee /etc/nats.conf; \
mkdir -p \
/var/tmp \
/conf \
/var/lib/turn \
/var/log/supervisord \
/var/lib/turn \
/var/run/supervisord; \
chown talk:talk -R \
/usr \
/etc/janus \
/etc/nats.conf \
/etc/signaling.conf \
/etc/turnserver.conf \
/var/lib/turn \
/var/log/supervisord \
/var/run/supervisord;
/var/run/supervisord; \
chmod 777 -R \
/tmp \
/conf \
/var/run/supervisord \
/var/lib/turn \
/var/log/supervisord;
# Set default talk port https://github.com/nextcloud/all-in-one/issues/1011
ENV TALK_PORT=3478
@@ -71,4 +72,4 @@ ENTRYPOINT ["/start.sh"]
CMD ["supervisord", "-c", "/supervisord.conf"]
HEALTHCHECK CMD (nc -z localhost 8081 && nc -z localhost 8188 && nc -z localhost 4222 && nc -z localhost "$TALK_PORT" && nc -z "$NC_DOMAIN" "$TALK_PORT") || exit 1
LABEL com.centurylinklabs.watchtower.monitor-only="true"
LABEL com.centurylinklabs.watchtower.enable="false"

View File

@@ -89,7 +89,7 @@ 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.
#secret = the-shared-secret
#secret = the-shared-secret-for-allowall
# Timeout in seconds for requests to the backend.
timeout = 10

View File

@@ -20,7 +20,7 @@ IPv4_ADDRESS_TALK="$(dig nextcloud-aio-talk A +short)"
set +x
# Turn
cat << TURN_CONF > "/etc/turnserver.conf"
cat << TURN_CONF > "/conf/turnserver.conf"
listening-port=$TALK_PORT
fingerprint
use-auth-secret
@@ -54,7 +54,7 @@ denied-peer-ip=240.0.0.0-255.255.255.255
TURN_CONF
# Signling
cat << SIGNALING_CONF > "/etc/signaling.conf"
cat << SIGNALING_CONF > "/conf/signaling.conf"
[http]
listen = 0.0.0.0:8081

View File

@@ -13,7 +13,7 @@ stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=turnserver -c /etc/turnserver.conf
command=turnserver -c /conf/turnserver.conf
[program:nats-server]
stdout_logfile=/dev/stdout
@@ -27,6 +27,7 @@ stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
# debug-level 3 means warning
command=janus --config=/etc/janus/janus.jcfg --disable-colors --log-stdout --full-trickle --debug-level 3
[program:signaling]
@@ -34,4 +35,4 @@ stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=nextcloud-spreed-signaling -config /etc/signaling.conf
command=nextcloud-spreed-signaling -config /conf/signaling.conf

View File

@@ -11,4 +11,4 @@ COPY --chmod=775 start.sh /start.sh
USER root
ENTRYPOINT ["/start.sh"]
LABEL com.centurylinklabs.watchtower.monitor-only="true"
LABEL com.centurylinklabs.watchtower.enable="false"

View File

@@ -5,9 +5,11 @@ services:
- nextcloud-aio-collabora
- nextcloud-aio-talk
- nextcloud-aio-nextcloud
- nextcloud-aio-notify-push
image: nextcloud/aio-apache:latest
ports:
- ${APACHE_IP_BINDING}:${APACHE_PORT}:${APACHE_PORT}/tcp
- ${APACHE_IP_BINDING}:${APACHE_PORT}:${APACHE_PORT}/udp
environment:
- NC_DOMAIN=${NC_DOMAIN}
- NEXTCLOUD_HOST=nextcloud-aio-nextcloud
@@ -18,6 +20,7 @@ services:
- TZ=${TIMEZONE}
- APACHE_MAX_SIZE=${APACHE_MAX_SIZE}
- APACHE_MAX_TIME=${NEXTCLOUD_MAX_TIME}
- NOTIFY_PUSH_HOST=nextcloud-aio-notify-push
volumes:
- nextcloud_aio_nextcloud:/var/www/html:ro
- nextcloud_aio_apache:/mnt/data:rw
@@ -55,7 +58,6 @@ services:
image: nextcloud/aio-nextcloud:latest
expose:
- "9000"
- "7867"
volumes:
- nextcloud_aio_nextcloud:/var/www/html:rw
- ${NEXTCLOUD_DATADIR}:/mnt/ncdata:rw
@@ -107,6 +109,26 @@ services:
networks:
- nextcloud-aio
nextcloud-aio-notify-push:
image: nextcloud/aio-notify-push:latest
expose:
- "7867"
volumes:
- nextcloud_aio_nextcloud:/nextcloud:ro
environment:
- NC_DOMAIN=${NC_DOMAIN}
- NEXTCLOUD_HOST=nextcloud-aio-nextcloud
- REDIS_HOST=nextcloud-aio-redis
- REDIS_HOST_PASSWORD=${REDIS_PASSWORD}
- POSTGRES_HOST=nextcloud-aio-database
- POSTGRES_PASSWORD=${DATABASE_PASSWORD}
- POSTGRES_DB=nextcloud_database
- POSTGRES_USER=nextcloud
restart: unless-stopped
networks:
- nextcloud-aio
read_only: true
nextcloud-aio-redis:
image: nextcloud/aio-redis:latest
expose:
@@ -189,6 +211,11 @@ services:
- clamav
networks:
- nextcloud-aio
read_only: true
tmpfs:
- /var/lock
- /var/log/clamav
- /tmp
nextcloud-aio-onlyoffice:
image: nextcloud/aio-onlyoffice:latest
@@ -220,6 +247,7 @@ services:
- imaginary
networks:
- nextcloud-aio
read_only: true
nextcloud-aio-fulltextsearch:
image: nextcloud/aio-fulltextsearch:latest

View File

@@ -14,7 +14,7 @@ The procedure for migrating only the files works like this:
1. Install Nextcloud AIO on a new server/linux installation, enter your domain and wait until all containers are running
1. Recreate all users that were present on your former installation
1. Take a backup using Nextcloud AIO's built-in backup solution (so that you can easily restore to this state again) (Note: this will stop all containers and is expected: don't start the container again at this point!)
1. Restore the datadirectory of your former instance: for `/path/to/nextcloud/data/` run `sudo docker cp --follow-link /path/to/nextcloud/data/ nextcloud-aio-nextcloud:/mnt/ncdata/` Note: the `/` at the end are necessary.
1. Restore the datadirectory of your former instance: for `/path/to/nextcloud/data/` run `sudo docker cp --follow-link /path/to/nextcloud/data/. nextcloud-aio-nextcloud:/mnt/ncdata/` Note: the `/.` and `/` at the end are necessary.
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.
@@ -24,7 +24,7 @@ The procedure for migrating only the files works like this:
The procedure for migrating the files and the database works like this:
1. Make sure that your old instance is on exactly the same version like the version used in Nextcloud AIO. (e.g. 23.0.0) You can find the used version here: [click here](https://github.com/nextcloud/all-in-one/search?l=Dockerfile&q=NEXTCLOUD_VERSION&type=). If not, simply upgrade your former installation to that version or wait until the version used in Nextcloud AIO got updated to the same version of your former installation or the other way around.
1. Take a backup of your former instance (especially from your datadirectory and database)
1. First, on the old instance, update all Nextcloud apps to its latest version via the app management site (important for the restore later on). Then take a backup of your former instance (especially from your datadirectory and database).
1. If your former installation didn't use Postgresql already, you will now need to convert your old installation to use Postgresql as database temporarily (in order to be able to perform a pg_dump afterwards):
1. Install Postgresql on your former installation: on a Debian based OS should the following command work:
```
@@ -56,7 +56,7 @@ The procedure for migrating the files and the database works like this:
```
**Please note:** The exact name of the database export file is important! (`database-dump.sql`)<br>
And of course you need to to use the correct name that the Postgresql database has for the export (if `$PG_DATABASE` doesn't work directly).
1. At this point, you can finally install Nextcloud AIO on a new server/linux installation, enter your domain in the AIO interface (use the same domain that you used on your former installation) and wait until all containers are running. Then you should check the included Nextcloud version by running `sudo docker inspect nextcloud-aio-nextcloud | grep NEXTCLOUD_VERSION`.
1. At this point, you can finally install Nextcloud AIO on a new server/linux installation, enter your domain in the AIO interface (use the same domain that you used on your former installation) and wait until all containers are running. Then you should check the included Nextcloud version by running `sudo docker inspect nextcloud-aio-nextcloud | grep NEXTCLOUD_VERSION`. Also install all apps via the apps management site that were installed on the old Nextcloud installation. Otherwise they will show as installed, but will not work.
1. Next, take a backup using Nextcloud AIO's built-in backup solution (so that you can easily restore to this state again) (Note: this will stop all containers and is expected: don't start the container again at this point!)
1. Now, we are slowly starting to import your files and database. First, you need to modify the datadirectory that is stored inside the database export:
1. Find out what the directory of your old Nextcloud installation is by e.g. opening the config.php file and looking at the value `datadirectory`.
@@ -75,7 +75,7 @@ The procedure for migrating the files and the database works like this:
sudo docker run --rm --volume nextcloud_aio_database_dump:/mnt/data:rw alpine chmod 777 /mnt/data/database-dump.sql
sudo docker run --rm --volume nextcloud_aio_database_dump:/mnt/data:rw alpine rm /mnt/data/initial-cleanup-done
```
1. If the commands above were executed successfully, restore the datadirectory of your former instance into your datadirectory: `sudo docker run --rm --volume nextcloud_aio_nextcloud_data:/mnt/ncdata:rw alpine sh -c "rm -rf /mnt/ncdata/*"` and `sudo docker cp --follow-link /path/to/nextcloud/data/ nextcloud-aio-nextcloud:/mnt/ncdata/` Note: the `/` at the end are necessary. (Or if `NEXTCLOUD_DATADIR` was provided, first delete the files in there and then copy the files to the chosen path.)
1. If the commands above were executed successfully, restore the datadirectory of your former instance into your datadirectory: `sudo docker run --rm --volume nextcloud_aio_nextcloud_data:/mnt/ncdata:rw alpine sh -c "rm -rf /mnt/ncdata/*"` and `sudo docker cp --follow-link /path/to/nextcloud/data/. nextcloud-aio-nextcloud:/mnt/ncdata/` Note: the `/.` and `/` at the end are necessary. (Or if `NEXTCLOUD_DATADIR` was provided, first delete the files in there and then copy the files to the chosen path.)
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 on the datadirectory. (Or if `NEXTCLOUD_DATADIR` was provided, apply `chown -R 33:0` and `chmod -R 750` to the chosen path.)
1. Edit the Nextcloud AIO config.php file using `sudo docker run -it --rm --volume nextcloud_aio_nextcloud:/var/www/html:rw alpine sh -c "apk add --no-cache nano && nano /var/www/html/config/config.php"` and modify only `passwordsalt`, `secret`, `instanceid` and set it to the old values that you used on your old installation. If you are brave, feel free to modify further values e.g. add your old LDAP config or S3 storage config. (Some things like Mail server config can be added back using Nextcloud's webinterface later on).
1. When you are done and saved your changes to the file, finally start the containers again and wait until all containers are running.

View File

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

View File

@@ -48,13 +48,15 @@ spec:
value: "{{ .Values.NC_DOMAIN }}"
- name: NEXTCLOUD_HOST
value: nextcloud-aio-nextcloud
- name: NOTIFY_PUSH_HOST
value: nextcloud-aio-notify-push
- name: ONLYOFFICE_HOST
value: nextcloud-aio-onlyoffice
- name: TALK_HOST
value: nextcloud-aio-talk
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-apache:20230613_120442-latest
image: nextcloud/aio-apache:20230626_101439-latest
name: nextcloud-aio-apache
ports:
- containerPort: {{ .Values.APACHE_PORT }}

View File

@@ -29,7 +29,16 @@ spec:
- chmod
- "777"
- /nextcloud-aio-clamav
- /nextcloud-aio-clamav-tmpfs0
- /nextcloud-aio-clamav-tmpfs1
- /nextcloud-aio-clamav-tmpfs2
volumeMounts:
- name: nextcloud-aio-clamav-tmpfs2
mountPath: /nextcloud-aio-clamav-tmpfs2
- name: nextcloud-aio-clamav-tmpfs1
mountPath: /nextcloud-aio-clamav-tmpfs1
- name: nextcloud-aio-clamav-tmpfs0
mountPath: /nextcloud-aio-clamav-tmpfs0
- name: nextcloud-aio-clamav
mountPath: /nextcloud-aio-clamav
containers:
@@ -38,15 +47,27 @@ spec:
value: "90"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-clamav:20230613_120442-latest
image: nextcloud/aio-clamav:20230626_101439-latest
name: nextcloud-aio-clamav
ports:
- containerPort: 3310
volumeMounts:
- mountPath: /var/lib/clamav
name: nextcloud-aio-clamav
- mountPath: /var/lock
name: nextcloud-aio-clamav-tmpfs0
- mountPath: /var/log/clamav
name: nextcloud-aio-clamav-tmpfs1
- mountPath: /tmp
name: nextcloud-aio-clamav-tmpfs2
volumes:
- name: nextcloud-aio-clamav
persistentVolumeClaim:
claimName: nextcloud-aio-clamav
- emptyDir: {}
name: nextcloud-aio-clamav-tmpfs0
- emptyDir: {}
name: nextcloud-aio-clamav-tmpfs1
- emptyDir: {}
name: nextcloud-aio-clamav-tmpfs2
{{- end }}

View File

@@ -36,7 +36,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:20230613_120442-latest
image: nextcloud/aio-collabora:20230626_101439-latest
name: nextcloud-aio-collabora
ports:
- containerPort: 9980

View File

@@ -60,7 +60,7 @@ spec:
value: nextcloud
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-postgresql:20230613_120442-latest
image: nextcloud/aio-postgresql:20230626_101439-latest
name: nextcloud-aio-database
ports:
- containerPort: 5432

View File

@@ -42,7 +42,7 @@ spec:
value: "{{ .Values.TIMEZONE }}"
- name: discovery.type
value: single-node
image: nextcloud/aio-fulltextsearch:20230613_120442-latest
image: nextcloud/aio-fulltextsearch:20230626_101439-latest
name: nextcloud-aio-fulltextsearch
ports:
- containerPort: 9200

View File

@@ -26,7 +26,7 @@ spec:
- env:
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-imaginary:20230613_120442-latest
image: nextcloud/aio-imaginary:20230626_101439-latest
name: nextcloud-aio-imaginary
ports:
- containerPort: 9000

View File

@@ -116,11 +116,10 @@ spec:
value: "{{ .Values.TIMEZONE }}"
- name: UPDATE_NEXTCLOUD_APPS
value: "{{ .Values.UPDATE_NEXTCLOUD_APPS }}"
image: nextcloud/aio-nextcloud:20230613_120442-latest
image: nextcloud/aio-nextcloud:20230626_101439-latest
name: nextcloud-aio-nextcloud
ports:
- containerPort: 9000
- containerPort: 7867
volumeMounts:
- mountPath: /var/www/html
name: nextcloud-aio-nextcloud

View File

@@ -12,8 +12,5 @@ spec:
- name: "9000"
port: 9000
targetPort: 9000
- name: "7867"
port: 7867
targetPort: 7867
selector:
io.kompose.service: nextcloud-aio-nextcloud

View File

@@ -0,0 +1,63 @@
apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-notify-push
name: nextcloud-aio-notify-push
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-notify-push
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-notify-push
spec:
initContainers:
- name: init-volumes
image: alpine
command:
- chmod
- "777"
- /nextcloud-aio-nextcloud
volumeMounts:
- name: nextcloud-aio-nextcloud
mountPath: /nextcloud-aio-nextcloud
containers:
- env:
- name: NC_DOMAIN
value: "{{ .Values.NC_DOMAIN }}"
- name: NEXTCLOUD_HOST
value: nextcloud-aio-nextcloud
- name: POSTGRES_DB
value: nextcloud_database
- name: POSTGRES_HOST
value: nextcloud-aio-database
- name: POSTGRES_PASSWORD
value: "{{ .Values.DATABASE_PASSWORD }}"
- name: POSTGRES_USER
value: nextcloud
- name: REDIS_HOST
value: nextcloud-aio-redis
- name: REDIS_HOST_PASSWORD
value: "{{ .Values.REDIS_PASSWORD }}"
image: nextcloud/aio-notify-push:20230626_101439-latest
name: nextcloud-aio-notify-push
ports:
- containerPort: 7867
volumeMounts:
- mountPath: /nextcloud
name: nextcloud-aio-nextcloud
readOnly: true
volumes:
- name: nextcloud-aio-nextcloud
persistentVolumeClaim:
claimName: nextcloud-aio-nextcloud

View File

@@ -0,0 +1,16 @@
apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-notify-push
name: nextcloud-aio-notify-push
spec:
ports:
- name: "7867"
port: 7867
targetPort: 7867
selector:
io.kompose.service: nextcloud-aio-notify-push

View File

@@ -42,7 +42,7 @@ spec:
value: "{{ .Values.ONLYOFFICE_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-onlyoffice:20230613_120442-latest
image: nextcloud/aio-onlyoffice:20230626_101439-latest
name: nextcloud-aio-onlyoffice
ports:
- containerPort: 80

View File

@@ -37,7 +37,7 @@ spec:
value: "{{ .Values.REDIS_PASSWORD }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-redis:20230613_120442-latest
image: nextcloud/aio-redis:20230626_101439-latest
name: nextcloud-aio-redis
ports:
- containerPort: 6379

View File

@@ -36,7 +36,7 @@ spec:
value: "{{ .Values.TURN_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-talk:20230613_120442-latest
image: nextcloud/aio-talk:20230626_101439-latest
name: nextcloud-aio-talk
ports:
- containerPort: {{ .Values.TALK_PORT }}

View File

@@ -32,7 +32,7 @@ spec:
value: "{{ .Values.RECORDING_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-talk-recording:20230613_120442-latest
image: nextcloud/aio-talk-recording:20230626_101439-latest
name: nextcloud-aio-talk-recording
ports:
- containerPort: 1234

View File

@@ -31,6 +31,7 @@ NEXTCLOUD_TRUSTED_CACERTS_DIR: # Setting this to any value allows to auto
NEXTCLOUD_UPLOAD_LIMIT: 10G # This allows to change the upload limit of the Nextcloud container
TALK_PORT: 3478 # This allows to adjust the port that the talk container is using.
UPDATE_NEXTCLOUD_APPS: no # When setting to yes (with quotes), it will automatically update all installed Nextcloud apps upon container startup on saturdays.
STORAGE_CLASS: # By setting this, you can adjust the storage class for your volumes
APACHE_STORAGE_SIZE: 1Gi # You can change the size of the apache volume that default to 1Gi with this value
CLAMAV_STORAGE_SIZE: 1Gi # You can change the size of the clamav volume that default to 1Gi with this value

12
php/composer.lock generated
View File

@@ -699,16 +699,16 @@
},
{
"name": "php-di/slim-bridge",
"version": "3.3.0",
"version": "3.4.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-DI/Slim-Bridge.git",
"reference": "9374b67ebf2f135b32c34907b7891b02b935d845"
"reference": "d14c95b34b3c5ba2e8c40020dd93fdcc8f3ba875"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-DI/Slim-Bridge/zipball/9374b67ebf2f135b32c34907b7891b02b935d845",
"reference": "9374b67ebf2f135b32c34907b7891b02b935d845",
"url": "https://api.github.com/repos/PHP-DI/Slim-Bridge/zipball/d14c95b34b3c5ba2e8c40020dd93fdcc8f3ba875",
"reference": "d14c95b34b3c5ba2e8c40020dd93fdcc8f3ba875",
"shasum": ""
},
"require": {
@@ -734,9 +734,9 @@
"description": "PHP-DI integration in Slim",
"support": {
"issues": "https://github.com/PHP-DI/Slim-Bridge/issues",
"source": "https://github.com/PHP-DI/Slim-Bridge/tree/3.3.0"
"source": "https://github.com/PHP-DI/Slim-Bridge/tree/3.4.0"
},
"time": "2023-01-13T15:49:44+00:00"
"time": "2023-06-29T14:08:47+00:00"
},
{
"name": "psr/container",

View File

@@ -141,7 +141,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^/[a-z/_]+$"
"pattern": "^/[a-z/_0-9-]+$"
}
},
"volumes": {

View File

@@ -16,6 +16,11 @@
"ip_binding": "%APACHE_IP_BINDING%",
"port_number": "%APACHE_PORT%",
"protocol": "tcp"
},
{
"ip_binding": "%APACHE_IP_BINDING%",
"port_number": "%APACHE_PORT%",
"protocol": "udp"
}
],
"internal_port": "%APACHE_PORT%",
@@ -50,6 +55,14 @@
],
"networks": [
"nextcloud-aio"
],
"read_only": true,
"tmpfs": [
"/var/log/supervisord",
"/var/run/supervisord",
"/usr/local/apache2/logs",
"/tmp",
"/home/www-data"
]
},
{
@@ -91,6 +104,10 @@
],
"networks": [
"nextcloud-aio"
],
"read_only": true,
"tmpfs": [
"/var/run/postgresql"
]
},
{
@@ -327,6 +344,14 @@
],
"networks": [
"nextcloud-aio"
],
"read_only": true,
"tmpfs": [
"/var/log/supervisord",
"/var/run/supervisord",
"/conf",
"/var/lib/turn",
"/tmp"
]
},
{
@@ -354,6 +379,11 @@
],
"networks": [
"nextcloud-aio"
],
"read_only": true,
"tmpfs": [
"/tmp",
"/conf"
]
},
{
@@ -449,7 +479,12 @@
"secrets": [
"INSTANCE_ID"
],
"stop_grace_period": 1
"stop_grace_period": 1,
"read_only": true,
"tmpfs": [
"/etc/lighttpd",
"/var/www/domaincheck"
]
},
{
"container_name": "nextcloud-aio-clamav",
@@ -537,7 +572,10 @@
"networks": [
"nextcloud-aio"
],
"read_only": true
"read_only": true,
"tmpfs": [
"/tmp"
]
},
{
"container_name": "nextcloud-aio-fulltextsearch",

View File

@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.12.0@f90118cdeacd0088e7215e64c0c99ceca819e176"/>
<files psalm-version="5.13.1@086b94371304750d1c673315321a55d15fc59015"/>

View File

@@ -1,4 +1,14 @@
"use strict";
function showPassword(id) {
let passwordField = document.getElementById(id);
if (passwordField.type === "password" && passwordField.value !== "") {
passwordField.type = "text";
} else if (passwordField.type === "text" && passwordField.value === "") {
passwordField.type = "password";
}
}
(function (){
let lastError;

View File

@@ -28,6 +28,12 @@ class AuthManager {
$date = new DateTime();
$dateTime = $date->getTimestamp();
$_SESSION['date_time'] = $dateTime;
$df = disk_free_space(DataConst::GetSessionDirectory());
if ($df !== false && (int)$df < 10240) {
error_log(DataConst::GetSessionDirectory() . " has only less than 10KB free space. The login might not succeed because of that!");
}
file_put_contents(DataConst::GetSessionDateFile(), (string)$dateTime);
}

View File

@@ -48,7 +48,7 @@ class ContainerDefinitionFetcher
if (!$validator->isValid()) {
error_log("JSON does not validate. Violations:");
foreach ($validator->getErrors() as $error) {
error_log(printf("[%s] %s\n", $error['property'], $error['message']));
error_log((string)printf("[%s] %s\n", $error['property'], $error['message']));
}
}
}

View File

@@ -173,7 +173,8 @@ class DockerController
$this->startTopContainer(true);
// Clear apcu cache in order to check if container updates are available
apcu_clear_cache();
// Temporarily disabled as it leads much faster to docker rate limits
// apcu_clear_cache();
return $response->withStatus(201)->withHeader('Location', '/');
}

View File

@@ -0,0 +1,26 @@
<?php
declare(strict_types=1);
// increase memory limit to 2GB
ini_set('memory_limit', '2048M');
use DI\Container;
use AIO\Data\DataConst;
require __DIR__ . '/../../vendor/autoload.php';
$container = \AIO\DependencyInjection::GetContainer();
/** @var \AIO\Docker\DockerActionManager $dockerActionManger */
$dockerActionManger = $container->get(\AIO\Docker\DockerActionManager::class);
/** @var \AIO\ContainerDefinitionFetcher $containerDefinitionFetcher */
$containerDefinitionFetcher = $container->get(\AIO\ContainerDefinitionFetcher::class);
$id = 'nextcloud-aio-nextcloud';
$nextcloudContainer = $containerDefinitionFetcher->GetContainerById($id);
$df = disk_free_space(DataConst::GetDataDirectory());
if ($df !== false && (int)$df < 1024 * 1024 * 1024 * 5) {
error_log("The drive that hosts the mastercontainer volume has less than 5 GB free space. Container updates and backups might not succeed due to that!");
$dockerActionManger->sendNotification($nextcloudContainer, 'Low on space!', 'The drive that hosts the mastercontainer volume has less than 5 GB free space. Container updates and backups might not succeed due to that!');
}

View File

@@ -16,7 +16,7 @@
</header>
<div class="content">
<h1>Nextcloud AIO v6.2.1</h1>
<h1>Nextcloud AIO v6.3.0</h1>
{# Add 2nd tab warning #}
<script type="text/javascript" src="second-tab-warning.js"></script>
@@ -99,7 +99,7 @@
<input class="button" type="submit" value="Submit domain" />
</form>
{% if skip_domain_validation == false %}
Make sure that this server is reachable on port 443 (port 443/tcp is open/forwarded in your firewall/router) and that you've correctly set up the DNS config for the domain that you enter (set the A record to your public ipv4-address and if you need ipv6, set the AAAA record to your public ipv6-address. A CNAME record if of course also possible). You should see hints on what went wrong if your domain does not get accepted in the top right corner.<br><br>
Make sure that this server is reachable on port 443 (port 443/tcp is open/forwarded in your firewall/router and 443/udp as well if you want to enable http3) and that you've correctly set up the DNS config for the domain that you enter (set the A record to your public ipv4-address and if you need ipv6, set the AAAA record to your public ipv6-address. A CNAME record if of course also possible). You should see hints on what went wrong if your domain does not get accepted in the top right corner.<br><br>
<details>
<summary>Click here for further hints</summary><br />
If you should not have a domain yet, you can get one for free e.g. from duckdns.org and others.<br><br>
@@ -468,7 +468,7 @@
{% if automatic_updates == true %}
Also your containers, the mastercontainer and on saturdays your Nextcloud apps will be automatically updated.
{% endif %}
You can disable this option again by clicking on the button below.<br><br/>
To change your backup time, first disable Daily Backups and then re-enable them with your new backup time.<br><br/>
<form method="POST" action="/api/configuration" class="xhr">
<input type="hidden" name="delete_daily_backup_time" value="yes"/>
<input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
@@ -509,8 +509,8 @@
<summary>Click here to change your AIO password</summary><br />
You can change your AIO password below:<br><br />
<form method="POST" action="/api/configuration" class="xhr">
<input type="text" autocomplete="current-password" name="current-master-password" placeholder="Your current AIO password"/>
<input type="text" autocomplete="new-password" name="new-master-password" placeholder="Your new AIO password"/>
<input type="password" autocomplete="current-password" name="current-master-password" placeholder="Your current AIO password" id="current-master-password" oninput="showPassword('current-master-password')">
<input type="password" autocomplete="new-password" name="new-master-password" placeholder="Your new AIO password" id="new-master-password" oninput="showPassword('new-master-password')">
<input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
<input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
<input class="button" type="submit" value="Submit password change" />
@@ -548,9 +548,9 @@
<input type="checkbox" id="fulltextsearch" name="fulltextsearch"><label for="fulltextsearch">Fulltextsearch (needs ~1GB additional RAM)</label><br>
{% endif %}
{% if is_imaginary_enabled == true %}
<input type="checkbox" id="imaginary" name="imaginary" checked="checked"><label for="imaginary">Imaginary (for previews of heic, heif, illustrator, pdf, svg, tiff and webp)</label><br><br>
<input type="checkbox" id="imaginary" name="imaginary" checked="checked"><label for="imaginary">Imaginary (for previews of heic, heif, illustrator, pdf, svg, tiff and webp. Imaginary is currently <a href="https://github.com/nextcloud/server/issues/34262">incompatible with server-side-encryption</a>)</label><br><br>
{% else %}
<input type="checkbox" id="imaginary" name="imaginary"><label for="imaginary">Imaginary (for previews of heic, heif, illustrator, pdf, svg, tiff and webp)</label><br><br>
<input type="checkbox" id="imaginary" name="imaginary"><label for="imaginary">Imaginary (for previews of heic, heif, illustrator, pdf, svg, tiff and webp. Imaginary is currently <a href="https://github.com/nextcloud/server/issues/34262">incompatible with server-side-encryption</a>)</label><br><br>
{% endif %}
{% if is_talk_enabled == true %}
<input type="checkbox" id="talk" name="talk" checked="checked"><label for="talk">Nextcloud Talk (needs ports {{ talk_port }}/TCP and {{ talk_port }}/UDP open/forwarded in your firewall/router)</label><br><br>

View File

@@ -8,7 +8,8 @@
{% if is_login_allowed == true %}
<p>Log in using your Nextcloud AIO password:</p>
<form method="POST" action="/api/auth/login" class="xhr">
<input type="text" autocomplete="off" name="password" placeholder="Password" />
<input type="password" autocomplete="current-password" name="password" placeholder="Password" id="master-password" oninput="showPassword('master-password')">
<input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
<input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
<input type="submit" class="button" value="Log in" />

View File

@@ -136,6 +136,7 @@ You can check this on Linux by running: `uname -m`
### Which ports are mandatory to be open in your firewall/router?
Only those (if you access the Mastercontainer Interface internally via port 8080):
- `443/TCP` for the Apache container
- `443/UDP` if you want to enable http3 for the Apache container
- `3478/TCP` and `3478/UDP` for the Talk container
### Explanation of used ports:
@@ -143,6 +144,7 @@ Only those (if you access the Mastercontainer Interface internally via port 8080
- `80/TCP`: redirects to Nextcloud (is used for getting the certificate via ACME http-challenge for the Mastercontainer)
- `8443/TCP`: Mastercontainer Interface with valid certificate (only works if port 80 and 8443 are open/forwarded in your firewall/router and you point a domain to your server. It generates a valid certificate then automatically and access via e.g. `https://public.domain.com:8443/` is possible.)
- `443/TCP`: will be used by the Apache container later on and needs to be open/forwarded in your firewall/router
- `443/UDP`: will be used by the Apache container later on and needs to be open/forwarded in your firewall/router if you want to enable http3
- `3478/TCP` and `3478/UDP`: will be used by the Turnserver inside the Talk container and needs to be open/forwarded in your firewall/router
### How to run AIO on macOS?
@@ -589,7 +591,7 @@ After using this option, please make sure to apply the correct permissions to th
You can then navigate to the apps management page, activate the external storage app, navigate to `https://your-nc-domain.com/settings/admin/externalstorages` and add a local external storage directory that will be accessible inside the container at the same place that you've entered. E.g. `/mnt/your-drive-mountpoint` will be mounted to `/mnt/your-drive-mountpoint` inside the container, etc.
Be aware though that these locations will not be covered by the built-in backup solution!
Be aware though that these locations will not be covered by the built-in backup solution - but you can add further Docker volumes and host paths that you want to back up after the initial backup is done.
**Please note:** If you can't see the type "local storage" in the external storage admin options, a restart of the containers from the AIO interface may be required.
@@ -642,7 +644,7 @@ The [facerecognition app](https://apps.nextcloud.com/apps/facerecognition) requi
The [memories app](https://apps.nextcloud.com/apps/memories) allows to enable hardware transcoding for videos. In order to use that, you need to add `--env NEXTCLOUD_ENABLE_DRI_DEVICE=true` to the docker run command of the mastercontainer (but before the last line `nextcloud/all-in-one:latest`! If it was started already, you will need to stop the mastercontainer, remove it (no data will be lost) and recreate it using the docker run command that you initially used) which will mount the `/dev/dri` device into the container. Additionally, you need to add required packets to the Nextcloud container by using [this feature](https://github.com/nextcloud/all-in-one#how-to-add-os-packages-permanently-to-the-nextcloud-container) and adding the required Alpine packages that are documented [here](https://github.com/pulsejet/memories/wiki/QSV-Transcoding).
### Huge docker logs
When your containers run for a few days without a restart, the container logs that you can view from the AIO interface can get really huge. You can limit the loge sizes by enabling logrotate for docker container logs. Feel free to enable this by following those instructions: https://sandro-keil.de/blog/logrotate-for-docker-container/
If you should run into issues with huge docker logs, you can adjust the log size by following https://docs.docker.com/config/containers/logging/local/#usage. However for the included AIO containers, this should usually not be needed because almost all of them have the log level set to warn so they should not produce many logs.
### Access/Edit Nextcloud files/folders manually
The files and folders that you add to Nextcloud are by default stored in the following docker directory: `nextcloud_aio_nextcloud:/mnt/ncdata/` (usually `/var/lib/docker/volumes/nextcloud_aio_nextcloud_data/_data/` on linux host systems). If needed, you can modify/add/delete files/folders there but **ATTENTION**: be very careful when doing so because you might corrupt your AIO installation! Best is to create a backup using the built-in backup solution before editing/changing files/folders in there because you will then be able to restore your instance to the backed up state.

View File

@@ -642,7 +642,7 @@ Simply translate the docker run command into a docker-compose file. You can have
## 3. Limit the access to the apache container
Use this envorinmental variable during the initial startup of the mastercontainer to make the apache container only listen on localhost: `--env APACHE_IP_BINDING=127.0.0.1`. **Attention:** This is only recommended to be set if you use `localhost` in your reverse proxy config to connect to your AIO instance. If you use an ip-address instead of localhost, you should set it to `0.0.0.0`.
Use this environment variable during the initial startup of the mastercontainer to make the apache container only listen on localhost: `--env APACHE_IP_BINDING=127.0.0.1`. **Attention:** This is only recommended to be set if you use `localhost` in your reverse proxy config to connect to your AIO instance. If you use an ip-address instead of localhost, you should set it to `0.0.0.0`.
## 4. Open the AIO interface.
After starting AIO, you should be able to access the AIO Interface via `https://ip.address.of.the.host:8080`. Enter your domain that you've entered in the reverse proxy config and you should be done. Please do not forget to open/forward port `3478/TCP` and `3478/UDP` in your firewall/router for the Talk container!