From 6872c396f8de4bca6a8ecae4e7e198aa1bf10d3c Mon Sep 17 00:00:00 2001 From: Gabriel Augendre Date: Sat, 12 Oct 2024 23:11:25 +0200 Subject: [PATCH] move aio to internal services --- playbooks/apps/files/Caddyfile | 18 ++++++++++-------- .../files/nextcloud-aio/docker-compose.yaml | 19 ++++++++++++++++++- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/playbooks/apps/files/Caddyfile b/playbooks/apps/files/Caddyfile index bee6b94..cb2f34a 100644 --- a/playbooks/apps/files/Caddyfile +++ b/playbooks/apps/files/Caddyfile @@ -133,14 +133,6 @@ cloud-aio.augendre.info { import common_headers reverse_proxy localhost:8014 } -aio.augendre.info { - import common_headers - reverse_proxy https://localhost:8015 { - transport http { - tls_insecure_skip_verify - } - } -} ## Ghost blogs (ports >=2368) ######################################################### @@ -278,6 +270,16 @@ display.augendre.info { reverse_proxy localhost:9010 } +aio.augendre.info { + import common_headers + import internal + reverse_proxy https://localhost:9011 { + transport http { + tls_insecure_skip_verify + } + } +} + ######################################################### # REDIRECTS ######################################################### diff --git a/playbooks/apps/files/nextcloud-aio/docker-compose.yaml b/playbooks/apps/files/nextcloud-aio/docker-compose.yaml index 06aa4ce..35faf0b 100644 --- a/playbooks/apps/files/nextcloud-aio/docker-compose.yaml +++ b/playbooks/apps/files/nextcloud-aio/docker-compose.yaml @@ -8,8 +8,25 @@ services: APACHE_PORT: 8014 APACHE_IP_BINDING: 127.0.0.1 NEXTCLOUD_DATADIR: /mnt/data/nextcloud-aio/nextcloud_data + NEXTCLOUD_ENABLE_DRI_DEVICE: true # This allows to enable the /dev/dri device in the Nextcloud container. ⚠️⚠️⚠️ Warning: this only works if the '/dev/dri' device is present on the host! If it should not exist on your host, don't set this to true as otherwise the Nextcloud container will fail to start! See https://github.com/nextcloud/all-in-one#how-to-enable-hardware-transcoding-for-nextcloud +# AIO_DISABLE_BACKUP_SECTION: false # Setting this to true allows to hide the backup section in the AIO interface. See https://github.com/nextcloud/all-in-one#how-to-disable-the-backup-section +# BORG_RETENTION_POLICY: --keep-within=7d --keep-weekly=4 --keep-monthly=6 # Allows to adjust borgs retention policy. See https://github.com/nextcloud/all-in-one#how-to-adjust-borgs-retention-policy +# COLLABORA_SECCOMP_DISABLED: false # Setting this to true allows to disable Collabora's Seccomp feature. See https://github.com/nextcloud/all-in-one#how-to-disable-collaboras-seccomp-feature +# NEXTCLOUD_MOUNT: /mnt/ # Allows the Nextcloud container to access the chosen directory on the host. See https://github.com/nextcloud/all-in-one#how-to-allow-the-nextcloud-container-to-access-directories-on-the-host +# NEXTCLOUD_UPLOAD_LIMIT: 10G # Can be adjusted if you need more. See https://github.com/nextcloud/all-in-one#how-to-adjust-the-upload-limit-for-nextcloud +# 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-defined-certification-authorities-ca +# NEXTCLOUD_STARTUP_APPS: deck twofactor_totp tasks calendar contacts notes # 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-os-packages-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 +# NEXTCLOUD_KEEP_DISABLED_APPS: false # Setting this to true will keep Nextcloud apps that are disabled in the AIO interface and not uninstall them if they should be installed. See https://github.com/nextcloud/all-in-one#how-to-keep-disabled-apps +# TALK_PORT: 3478 # This allows to adjust the port that the talk container is using. See https://github.com/nextcloud/all-in-one#how-to-adjust-the-talk-port +# WATCHTOWER_DOCKER_SOCKET_PATH: /var/run/docker.sock # Needs to be specified if the docker socket on the host is not located in the default '/var/run/docker.sock'. Otherwise mastercontainer updates will fail. For macos it needs to be '/var/run/docker.sock' +# security_opt: ["label:disable"] # Is needed when using SELinux + ports: - - "8015:8080" + - "9011:8080" restart: always container_name: nextcloud-aio-mastercontainer init: true