diff --git a/roles/nextcloud/defaults/main.yml b/roles/nextcloud/defaults/main.yml index 7535b5a..0adf71e 100644 --- a/roles/nextcloud/defaults/main.yml +++ b/roles/nextcloud/defaults/main.yml @@ -14,7 +14,6 @@ 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" @@ -59,7 +58,6 @@ 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/tasks/main.yml b/roles/nextcloud/tasks/main.yml index 8d2a5cd..530baf7 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -19,12 +19,6 @@ 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 9f15760..9a98033 100644 --- a/roles/nextcloud/templates/docker-compose.yml.j2 +++ b/roles/nextcloud/templates/docker-compose.yml.j2 @@ -66,9 +66,6 @@ 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 }} @@ -82,8 +79,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 @@ -105,9 +102,6 @@ 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 %} @@ -117,7 +111,7 @@ services: {% if nextcloud_enable_notify_push %} notify-push: - image: {{ nextcloud_notify_push_image }} + image: icewind1991/notify_push restart: always depends_on: - redis @@ -151,8 +145,4 @@ services: networks: {{ nextcloud_backend_network }}: {{ nextcloud_traefik_network }}: - external: true -{% for net in nextcloud_extra_networks %} - {{ net }}: - external: true -{% endfor %} \ No newline at end of file + external: true \ No newline at end of file