service: set reasonable defaults for copypath modes

roles/alertmanager/tasks/main.yml

@@ -1,8 +1,7 @@
 ---
-
 - name: Prometheus alertmanager container
   include_role:
-    name: container
+    name: service
   vars:
     docker_service: alertmanager
     docker_image: prom/alertmanager

roles/dokuwiki/defaults/main.yml

@@ -1,4 +1,3 @@
 ---
-
 dokuwiki_wiki_name: DokuWiki
 dokuwiki_admin_email: "{{ admin_email }}"

roles/dokuwiki/tasks/main.yml

@@ -1,18 +1,11 @@
 ---
-
 - name: Dokuwiki container
   import_role:
-    name: container
+    name: service
   vars:
     docker_service: dokuwiki
-    docker_image: bitnami/dokuwiki
+    docker_image: dokuwiki/dokuwiki:stable
     docker_image_http_port: 8080
     docker_mounts:
       - name: data
-        path: /bitnami/dokuwiki
-    docker_env:
-      DOKUWIKI_USERNAME: admin
-      DOKUWIKI_FULL_NAME: Admin
-      DOKUWIKI_PASSWORD: "{{ dokuwiki_admin_password }}"
-      DOKUWIKI_EMAIL: "{{ dokuwiki_admin_email }}"
-      DOKUWIKI_WIKI_NAME: "{{ dokuwiki_wiki_name }}"
+        path: /storage

roles/gitea/meta/main.yml

@@ -26,7 +26,7 @@ dependencies:
       GITEA__mailer__ENABLED: "true"
       GITEA__mailer__HOST: "{{ smtp_server }}:587"
       GITEA__mailer__FROM: "{{ smtp_from }}"
-      GITEA__mailer__MAILER_TYPE: smtp
+      GITEA__mailer__PROTOCOL: smtp
       GITEA__mailer__USER: "{{ smtp_user | default(omit) }}"
       GITEA__mailer__PASSWD: "{{ smtp_pw | default(omit) }}"
       GITEA__service__REQUIRE_SIGNIN_VIEW: "{{ gitea_require_signin_view | default(omit) }}"

roles/grafana/tasks/main.yml

@@ -1,8 +1,7 @@
 ---
-
 - name: Grafana container
-  import_role:
-    name: container
+  include_role:
+    name: service
   vars:
     docker_service: grafana
     docker_image: grafana/grafana

roles/prometheus/tasks/main.yml

@@ -1,8 +1,7 @@
 ---
-
 - name: Prometheus container
   include_role:
-    name: container
+    name: service
   vars:
     docker_service: prometheus
     docker_image: prom/prometheus
@@ -33,7 +32,7 @@
 
 - name: Webhook container for prometheus
   include_role:
-    name: container
+    name: service
   vars:
     docker_service: prometheus_webhook
     docker_image: thecatlady/webhook
@@ -47,7 +46,7 @@
 
 - name: Blackbox exporter for prometheus
   include_role:
-    name: container
+    name: service
   vars:
     docker_service: blackbox_exporter
     docker_image: prom/blackbox-exporter

roles/service/tasks/mounts.yml

@@ -41,7 +41,8 @@
       copy:
         src: "files/{{ item.copypath }}"
         dest: "{{ docker_mounts_dir }}/"
-        mode: "{{ item.mode | default('0755') }}"
+        directory_mode: "{{ item.mode | default('0755') }}"
+        mode: "{{ item.mode | default('0644') }}"
       when: item.copypath is defined
       loop: "{{ docker_mounts }}"
       notify: Restart container