Fix ansible issues

.envrc

@@ -0,0 +1 @@
+use nix

_ansible/roles/acme-dns/tasks/main.yml

@@ -10,23 +10,27 @@
         path: "{{ service_path }}"
         state: directory
         mode: "0755"
+
     - name: Create a service-config directory for {{ svc.name }}
       ansible.builtin.file:
         path: "{{ config_path }}"
         state: directory
-        mode: "0755"
+        mode: "0700"
 
-    - name: Template {{ svc.name }} docker-compose
+    - name: Template docker-compose for {{ svc.name }}
       ansible.builtin.template:
         src: docker-compose.yml.j2
         dest: "{{ (service_path, 'docker-compose.yml') | path_join }}"
+        mode: "0644"
 
-    - name: Template {{ svc.name }} config
+    - name: Template config for {{ svc.name }}
       ansible.builtin.template:
         src: config.cfg.j2
         dest: "{{ (config_path, 'config.cfg') | path_join }}"
+        mode: "0600"
 
-    - name: Template {{ svc.name }} caddy config
+    - name: Template caddy config for {{ svc.name }}
       ansible.builtin.template:
         src: caddy_site.conf.j2
         dest: "{{ (caddy_config_path, svc.domain + '.conf') | path_join }}"
+        mode: "0644"

_ansible/roles/acme-dns/vars/main.yml

@@ -16,12 +16,11 @@ svc:
 compose:
   watchtower: true
   image: joohoi/acme-dns
-
+  file:
-compose_file:
+    services:
-  services:
+      app:
-    app:
+        ports:
-      ports:
+          - "53:53"
-        - "53:53"
+          - "53:53/udp"
-        - "53:53/udp"
+        volumes:
-      volumes:
+          - ./config:/etc/acme-dns:ro
-        - ./config:/etc/acme-dns:ro

_ansible/roles/umami/tasks/main.yml

@@ -12,17 +12,20 @@
         state: directory
         mode: "0755"
 
-    - name: Template {{ svc.name }} docker-compose
+    - name: Template docker-compose for {{ svc.name }}
       ansible.builtin.template:
         src: docker-compose.yml.j2
         dest: "{{ (service_path, 'docker-compose.yml') | path_join }}"
+        mode: "0644"
 
-    - name: Template {{ svc.name }} service.env file
+    - name: Template service.env file for {{ svc.name }}
       ansible.builtin.template:
         src: service.env.j2
         dest: "{{ (service_path, 'service.env') | path_join }}"
+        mode: "0600"
 
-    - name: Template {{ svc.name }} caddy config
+    - name: Template caddy config for {{ svc.name }}
       ansible.builtin.template:
         src: caddy_site.conf.j2
         dest: "{{ (caddy_config_path, svc.domain + '.conf') | path_join }}"
+        mode: "0644"

_ansible/templates/docker-compose.yml.j2

@@ -1,6 +1,6 @@
-{% set compose_file = compose_file | default({}) %}
+{% set compose_file = compose.file | default({}) %}
 {% set compose_file = compose_default_file | combine(compose_file, recursive=True) %}
 {% if compose.env | default(False) %}
-	{% set compose_file = compose_file | combine(compose_env_file, recursive=True) %}
+{% set compose_file = compose_file | combine(compose_env_file, recursive=True) %}
 {% endif %}
 {{ compose_file | to_nice_yaml }}

shell.nix

@@ -0,0 +1,7 @@
+with import <nixpkgs> {};
+mkShell {
+	nativeBuildInputs = [
+		ansible
+		ansible-lint
+	];
+}