Add vikunja opentofu stuff and fix some issues

roles/acme_dns/vars/main.yml

@@ -10,9 +10,9 @@ acme_dns_svc:
   db:
     host: "{{ postgres.host }}"
     port: "{{ postgres.port }}"
-    user: "{{ opentofu.postgresql_service_roles.acme_dns.name }}"
-    pass: "{{ opentofu.postgresql_service_roles.acme_dns.password }}"
-    db: acme_dns
+    user: "{{ opentofu.postgresql_data.acme_dns.user }}"
+    pass: "{{ opentofu.postgresql_data.acme_dns.pass }}"
+    db: "{{ opentofu.postgresql_data.acme_dns.database }}"
 
 acme_dns_compose:
   watchtower: true

roles/forgejo/vars/main.yml

@@ -14,9 +14,9 @@ forgejo_svc:
 forgejo_env:
   FORGEJO__database__DB_TYPE: postgres
   FORGEJO__database__HOST: "{{ svc.db.host }}:{{ svc.db.port }}"
-  FORGEJO__database__NAME: forgejo
-  FORGEJO__database__USER: "{{ opentofu.postgresql_service_roles.forgejo.name }}"
-  FORGEJO__database__PASSWD: "{{ opentofu.postgresql_service_roles.forgejo.password }}"
+  FORGEJO__database__NAME: "{{ opentofu.postgresql_service_roles.forgejo.database }}"
+  FORGEJO__database__USER: "{{ opentofu.postgresql_service_roles.forgejo.user }}"
+  FORGEJO__database__PASSWD: "{{ opentofu.postgresql_service_roles.forgejo.pass }}"
   FORGEJO__database__SSL_MODE: verify-full
 
   FORGEJO__repository__ENABLE_PUSH_CREATE_USER: true

roles/linkwarden/vars/main.yml

@@ -2,9 +2,9 @@
 linkwarden_secret: "{{ vault_linkwarden.secret }}"
 
 linkwarden_db_host_port: "{{ postgres.host }}:{{ postgres.port }}"
-linkwarden_db_user: "{{ opentofu.postgresql_service_roles.linkwarden.name }}"
-linkwarden_db_pass: "{{ opentofu.postgresql_service_roles.linkwarden.password }}"
-linkwarden_db_database: linkwarden
+linkwarden_db_user: "{{ opentofu.postgresql_data.linkwarden.user }}"
+linkwarden_db_pass: "{{ opentofu.postgresql_data.linkwarden.pass }}"
+linkwarden_db_database: "{{ opentofu.postgresql_data.linkwarden.database }}"
 
 linkwarden_s3_accesskey: "{{ opentofu.scaleway_data.linkwarden.access_key }}"
 linkwarden_s3_secretkey: "{{ opentofu.scaleway_data.linkwarden.secret_key }}"

roles/tinytinyrss/vars/main.yml

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

roles/umami/vars/main.yml

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

roles/vikunja/vars/main.yml

@@ -6,9 +6,9 @@ vikunja_svc:
   db:
     host: "{{ postgres.host }}"
     port: "{{ postgres.port }}"
-    database: vikunja
-    user: "{{ vault_vikunja.db.user }}"
-    pass: "{{ vault_vikunja.db.pass }}"
+    user: "{{ opentofu.postgresql_data.vikunja.user }}"
+    pass: "{{ opentofu.postgresql_data.vikunja.pass }}"
+    database: "{{ opentofu.postgresql_data.vikunja.database }}"
 
 vikunja_yml:
   service:
@@ -40,10 +40,10 @@ vikunja_yml:
       enabled: true
       providers:
         - name: auth.serguzim.me
-          authurl: https://auth.serguzim.me/application/o/todo-serguzim-me/
-          logouturl: https://auth.serguzim.me/application/o/todo-serguzim-me/end-session/
-          clientid: "{{ vault_vikunja.oidc_client.id }}"
-          clientsecret: "{{ vault_vikunja.oidc_client.secret }}"
+          authurl: "{{ opentofu.authentik_data.vikunja.base_url }}"
+          logouturl: "{{ (opentofu.authentik_data.vikunja.base_url, 'end-session') | path_join }}"
+          clientid: "{{ opentofu.authentik_data.vikunja.client_id }}"
+          clientsecret: "{{ opentofu.authentik_data.vikunja.client_secret }}"
 
   metrics:
     enabled: true

roles/wiki_js/vars/main.yml

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