Add more service databases to terraform

roles/acme_dns/vars/main.yml

@@ -10,8 +10,8 @@ acme_dns_svc:
   db:
     host: "{{ postgres.host }}"
     port: "{{ postgres.port }}"
-    user: "{{ vault_acmedns.db.user }}"
-    pass: "{{ vault_acmedns.db.pass }}"
+    user: "{{ opentofu.postgresql_service_roles.acme_dns.name }}"
+    pass: "{{ opentofu.postgresql_service_roles.acme_dns.password }}"
     db: acme_dns
 
 acme_dns_compose:

roles/healthcheck/files/Dockerfile

@@ -3,5 +3,4 @@ FROM ubuntu
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt update -y \
-	&& apt install -y curl dnsutils msmtp gettext-base python3-pip python3-requests \
-	&& pip install matrix-nio
+	&& apt install -y curl dnsutils msmtp gettext-base python3-matrix-nio python3-requests

roles/healthcheck/tasks/docker.yml

@@ -1,7 +1,7 @@
 ---
-- name: Copy the docker-compose file
-  ansible.builtin.copy:
-    src: docker-compose.yml
+- name: Template the docker-compose file
+  ansible.builtin.template:
+    src: docker-compose.yml.j2
     dest: "{{ (service_path, 'docker-compose.yml') | path_join }}"
     mode: "0644"
 - name: Copy the Dockerfile

roles/healthcheck/templates/docker-compose.yml.j2

@@ -1,5 +1,3 @@
-version: "3.7"
-
 x-common-elements:
   &common-elements
   build:

roles/tinytinyrss/vars/main.yml

@@ -7,8 +7,8 @@ tinytinyrss_svc:
     host: "{{ postgres.host }}"
     port: "{{ postgres.port }}"
     database: tinytinyrss
-    user: "{{ vault_tinytinyrss.db.user }}"
-    pass: "{{ vault_tinytinyrss.db.pass }}"
+    user: "{{ opentofu.postgresql_service_roles.tinytinyrss.name }}"
+    pass: "{{ opentofu.postgresql_service_roles.tinytinyrss.password }}"
 
 tinytinyrss_env:
   TTRSS_DB_TYPE: pgsql

roles/umami/vars/main.yml

@@ -1,7 +1,7 @@
 ---
 umami_db_host: "{{ postgres.host }}"
-umami_db_user: "{{ vault_umami.db.user }}"
-umami_db_pass: "{{ vault_umami.db.pass }}"
+umami_db_user: "{{ opentofu.postgresql_service_roles.umami.name }}"
+umami_db_pass: "{{ opentofu.postgresql_service_roles.umami.password }}"
 umami_db_database: umami
 
 umami_hash_salt: "{{ vault_umami.hash_salt }}"

roles/wiki_js/vars/main.yml

@@ -8,9 +8,9 @@ wiki_js_svc:
   db:
     host: "{{ postgres.host }}"
     port: "{{ postgres.port }}"
-    user: "{{ vault_wiki_js.db.user }}"
-    pass: "{{ vault_wiki_js.db.pass }}"
-    name: wikijs
+    user: "{{ opentofu.postgresql_service_roles.wiki_js.name }}"
+    pass: "{{ opentofu.postgresql_service_roles.wiki_js.password }}"
+    name: wiki_js
 
 wiki_js_env:
   DB_TYPE: postgres