Fix typos and misplaced files

playbooks/change-password.yml

@@ -3,7 +3,7 @@
   hosts: all
   become: true
   vars_prompt:
-    - name: name
+    - name: user
       prompt: User
       private: false
     - name: password

playbooks/roles/caddy/defaults/main.yml

@@ -1 +1,32 @@
-caddy_ports_extra: []
+---
+caddy_acmedns_user: "{{ vault_caddy.acmedns.user }}"
+caddy_acmedns_pass: "{{ vault_caddy.acmedns.pass }}"
+caddy_acmedns_subd: "{{ vault_caddy.acmedns.subd }}"
+caddy_acmedns_url: "https://{{ acme_dns.host }}"
+
+caddy_ports: "{{ host_services | services_get_attr('ports') | flatten | services_ports_to_docker('reverse_proxy') }}"
+
+caddy_env:
+  CADDY_ADMIN: unix//run/caddy-admin.sock
+
+  ACMEDNS_USER: "{{ caddy_acmedns_user }}"
+  ACMEDNS_PASS: "{{ caddy_acmedns_pass }}"
+  ACMEDNS_SUBD: "{{ caddy_acmedns_subd }}"
+  ACMEDNS_URL: "{{ caddy_acmedns_url }}"
+
+caddy_compose:
+  watchtower: false
+  image: "{{ (container_registry.public, 'services/caddy:2-alpine') | path_join }}"
+  volumes:
+    - "./config:/etc/caddy/"
+    - data:/data
+  file:
+    services:
+      app:
+        build:
+          context: .
+        ports: "{{ caddy_ports }}"
+        extra_hosts:
+          - host.docker.internal:host-gateway
+    volumes:
+      data:

playbooks/roles/caddy/defaults/vars/main.yml

@@ -1,32 +0,0 @@
----
-caddy_acmedns_user: "{{ vault_caddy.acmedns.user }}"
-caddy_acmedns_pass: "{{ vault_caddy.acmedns.pass }}"
-caddy_acmedns_subd: "{{ vault_caddy.acmedns.subd }}"
-caddy_acmedns_url: "https://{{ acme_dns.host }}"
-
-caddy_ports: "{{ host_services | services_get_attr('ports') | flatten | services_ports_to_docker('reverse_proxy') }}"
-
-caddy_env:
-  CADDY_ADMIN: unix//run/caddy-admin.sock
-
-  ACMEDNS_USER: "{{ caddy_acmedns_user }}"
-  ACMEDNS_PASS: "{{ caddy_acmedns_pass }}"
-  ACMEDNS_SUBD: "{{ caddy_acmedns_subd }}"
-  ACMEDNS_URL: "{{ caddy_acmedns_url }}"
-
-caddy_compose:
-  watchtower: false
-  image: "{{ (container_registry.public, 'services/caddy:2-alpine') | path_join }}"
-  volumes:
-    - "./config:/etc/caddy/"
-    - data:/data
-  file:
-    services:
-      app:
-        build:
-          context: .
-        ports: "{{ caddy_ports }}"
-        extra_hosts:
-          - host.docker.internal:host-gateway
-    volumes:
-      data: