From 468ed3455032a48529d17787ddf83a8fc93f1f55 Mon Sep 17 00:00:00 2001 From: Bert-Jan Fikse Date: Fri, 10 Apr 2026 11:16:56 +0200 Subject: [PATCH 1/2] feat: ability to set extra networks for nextcloud needed for ldap outpost Signed-off-by: Bert-Jan Fikse --- roles/nextcloud/defaults/main.yml | 1 + roles/nextcloud/tasks/main.yml | 6 ++++++ roles/nextcloud/templates/docker-compose.yml.j2 | 12 +++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/roles/nextcloud/defaults/main.yml b/roles/nextcloud/defaults/main.yml index 0adf71e..478bfb7 100644 --- a/roles/nextcloud/defaults/main.yml +++ b/roles/nextcloud/defaults/main.yml @@ -14,6 +14,7 @@ nextcloud_image: "nextcloud:fpm" nextcloud_redis_image: "redis:latest" nextcloud_port: 80 nextcloud_extra_hosts: [] +nextcloud_extra_networks: [] nextcloud_allow_local_remote_servers: false # Set to true to allow requests to local network (dev only) nextcloud_postgres_image: "postgres:15" diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index 530baf7..8d2a5cd 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -19,6 +19,12 @@ state: directory mode: '0755' +- name: Ensure extra networks exist + community.docker.docker_network: + name: "{{ item }}" + state: present + loop: "{{ nextcloud_extra_networks }}" + - name: Create docker-compose file for nextcloud template: src: docker-compose.yml.j2 diff --git a/roles/nextcloud/templates/docker-compose.yml.j2 b/roles/nextcloud/templates/docker-compose.yml.j2 index 9a98033..fc86bdd 100644 --- a/roles/nextcloud/templates/docker-compose.yml.j2 +++ b/roles/nextcloud/templates/docker-compose.yml.j2 @@ -66,6 +66,9 @@ services: - {{ nextcloud_docker_volume_dir }}/nextcloud/:/var/www/html networks: - {{ nextcloud_backend_network }} +{% for net in nextcloud_extra_networks %} + - {{ net }} +{% endfor %} nextcloud: image: {{ nextcloud_image }} @@ -102,6 +105,9 @@ services: - {{ nextcloud_docker_volume_dir }}/nextcloud/:/var/www/html networks: - {{ nextcloud_backend_network }} +{% for net in nextcloud_extra_networks %} + - {{ net }} +{% endfor %} {% if nextcloud_extra_hosts is defined and nextcloud_extra_hosts | length > 0 %} extra_hosts: {% for host in nextcloud_extra_hosts %} @@ -145,4 +151,8 @@ services: networks: {{ nextcloud_backend_network }}: {{ nextcloud_traefik_network }}: - external: true \ No newline at end of file + external: true +{% for net in nextcloud_extra_networks %} + {{ net }}: + external: true +{% endfor %} \ No newline at end of file From e2fae25592345999aebb13a36d9c6e3dccc31895 Mon Sep 17 00:00:00 2001 From: Bert-Jan Fikse Date: Fri, 10 Apr 2026 11:18:28 +0200 Subject: [PATCH 2/2] feat: make nextcloud_notify_push_image configurable Signed-off-by: Bert-Jan Fikse --- roles/nextcloud/defaults/main.yml | 1 + roles/nextcloud/templates/docker-compose.yml.j2 | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/nextcloud/defaults/main.yml b/roles/nextcloud/defaults/main.yml index 478bfb7..7535b5a 100644 --- a/roles/nextcloud/defaults/main.yml +++ b/roles/nextcloud/defaults/main.yml @@ -59,6 +59,7 @@ nextcloud_trusted_proxies: "172.16.0.0/12" # File locking and real-time push notifications nextcloud_enable_notify_push: false +nextcloud_notify_push_image: "icewind1991/notify_push:1.3.1" # Non-default apps to install and enable nextcloud_apps_to_install: diff --git a/roles/nextcloud/templates/docker-compose.yml.j2 b/roles/nextcloud/templates/docker-compose.yml.j2 index fc86bdd..9f15760 100644 --- a/roles/nextcloud/templates/docker-compose.yml.j2 +++ b/roles/nextcloud/templates/docker-compose.yml.j2 @@ -82,8 +82,8 @@ services: POSTGRES_DB: {{ nextcloud_postgres_db }} POSTGRES_USER: {{ nextcloud_postgres_user }} POSTGRES_PASSWORD: {{ nextcloud_postgres_password }} - NEXTCLOUD_ADMIN_USER: {{ nextcloud_admin_user }} - NEXTCLOUD_ADMIN_PASSWORD: {{ nextcloud_admin_password }} + NEXTCLOUD_ADMIN_USER: {{ nextcloud_admin_user }} + NEXTCLOUD_ADMIN_PASSWORD: {{ nextcloud_admin_password }} REDIS_HOST: redis PHP_MEMORY_LIMIT: {{ nextcloud_memory_limit_mb }}M PHP_UPLOAD_LIMIT: {{ nextcloud_upload_limit_mb }}M @@ -117,7 +117,7 @@ services: {% if nextcloud_enable_notify_push %} notify-push: - image: icewind1991/notify_push + image: {{ nextcloud_notify_push_image }} restart: always depends_on: - redis