Few fixes

micxer · Jan 17, 2025 · 7f00c3f · 7f00c3f
1 parent 346e78c
commit 7f00c3f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -7,6 +7,7 @@ homestack_traefik_version: 2.11.3
 homestack_error_pages_version: 2.27
 homestack_error_pages_theme: matrix
 # homestack_traefik_hostingde_api_key:  # must be set
+homestack_traefik_hostingde_domain: example.com
 homestack_traefik_base_domain: example.com
 # homestack_traefik_base_path:  # must be set
 
@@ -23,7 +24,7 @@ homestack_nextcloud_mysql_root_password: "password"
 homestack_nextcloud_admin_user: admin
 homestack_nextcloud_admin_password: 5UP3r53Cr37P455W0rD
 # local_domain: # must be set
-homestack_nextcloud_image: nextcloud:29.0.7-apache
+homestack_nextcloud_image_version: 29.0.7-apache
 # homestack_nextcloud_smtp_host: ""  # must be set
 # homestack_nextcloud_smtp_name: ""  # must be set
 # homestack_nextcloud_smtp_password: ""  # must be set

diff --git a/tasks/nextcloud.yml b/tasks/nextcloud.yml
@@ -41,7 +41,7 @@
   ansible.builtin.template:
     src: "docker-compose-nextcloud.yml.j2"
     dest: "{{ homestack_output_path }}/docker-compose-nextcloud.yml"
-    owner: "{{ homestack_nextcloud_uid }}"
-    group: "{{ homestack_nextcloud_gid }}"
+    owner: "{{ homestack_uid }}"
+    group: "{{ homestack_gid }}"
     mode: "0600"
     backup: true
diff --git a/templates/docker-compose-nextcloud.yml.j2 b/templates/docker-compose-nextcloud.yml.j2
@@ -123,6 +123,7 @@ services:
       retries: 10
     image: nextcloud:{{ homestack_nextcloud_image_version }}
     networks:
+      - traefik
       - nextcloud
     restart: unless-stopped
     volumes_from:

diff --git a/templates/docker-compose-traefik.yml.j2 b/templates/docker-compose-traefik.yml.j2
@@ -6,7 +6,7 @@ services:
     image: traefik:{{ homestack_traefik_version }}
     environment:
       HOSTINGDE_API_KEY: "{{ homestack_traefik_hostingde_api_key }}"
-      HOSTINGDE_ZONE_NAME: "{{ homestack_traefik_base_domain }}"
+      HOSTINGDE_ZONE_NAME: "{{ homestack_traefik_hostingde_domain }}"
       TZ: Europe/Berlin
     healthcheck:
       test: ["CMD", "traefik", "healthcheck"]
@@ -71,7 +71,7 @@ services:
       TEMPLATE_NAME: "{{ homestack_error_pages_theme }}"
     image: ghcr.io/tarampampam/error-pages:{{ homestack_error_pages_version }}
     labels:
-      traefik.enable: "True"
+      traefik.enable: true
       traefik.http.routers.error-pages-router.rule: "HostRegexp(`{host:.+}`)"
       traefik.http.routers.error-pages-router.priority: "1"
       traefik.http.routers.error-pages-router.entrypoints: "websecure"