From 772a7ce546155262c25c026001b80a36edb7f180 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Wed, 31 Jan 2024 22:14:19 +0100
Subject: apps/whawty: switch to new 0.3 release candidate

---
 roles/apps/whawty/auth/defaults/main.yml                  | 2 +-
 roles/apps/whawty/auth/instance/tasks/main.yml            | 8 ++++----
 roles/apps/whawty/auth/instance/templates/listener.yml.j2 | 8 ++++++++
 roles/apps/whawty/auth/instance/templates/pod-spec.yml.j2 | 6 ++----
 roles/apps/whawty/auth/instance/templates/web.yml.j2      | 6 ------
 5 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 roles/apps/whawty/auth/instance/templates/listener.yml.j2
 delete mode 100644 roles/apps/whawty/auth/instance/templates/web.yml.j2

(limited to 'roles/apps/whawty/auth')

diff --git a/roles/apps/whawty/auth/defaults/main.yml b/roles/apps/whawty/auth/defaults/main.yml
index a7f2dea8..8f203802 100644
--- a/roles/apps/whawty/auth/defaults/main.yml
+++ b/roles/apps/whawty/auth/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 # whawty_auth_instances:
 #   test:
-#     version: 0.2-rc9
+#     version: 0.3-rc1
 #     port: 3080
 #     store:
 #       default: 1
diff --git a/roles/apps/whawty/auth/instance/tasks/main.yml b/roles/apps/whawty/auth/instance/tasks/main.yml
index ece9fd14..8bada57c 100644
--- a/roles/apps/whawty/auth/instance/tasks/main.yml
+++ b/roles/apps/whawty/auth/instance/tasks/main.yml
@@ -62,10 +62,10 @@
   include_role:
     name: "x509/{{ whawty_auth_instances[whawty_auth_instance].publish.zone.certificate_provider }}/cert"
 
-- name: generate app web config
+- name: generate app listener config
   template:
-    src: web.yml.j2
-    dest: "{{ whawty_auth_instance_basepath }}/config/web.yml"
+    src: listener.yml.j2
+    dest: "{{ whawty_auth_instance_basepath }}/config/listener.yml"
     mode: 0400
     owner: app
 
@@ -106,7 +106,7 @@
   vars:
     whawty_auth_instance_config_hash_items__yaml: |
       - path: "{{ whawty_auth_instance_basepath }}/config/store.yml"
-      - path: "{{ whawty_auth_instance_basepath }}/config/web.yml"
+      - path: "{{ whawty_auth_instance_basepath }}/config/listener.yml"
       {% if 'sync' in whawty_auth_instances[whawty_auth_instance] %}
       - path: "{{ whawty_auth_instance_basepath }}/sync/group"
       - path: "{{ whawty_auth_instance_basepath }}/sync/passwd"
diff --git a/roles/apps/whawty/auth/instance/templates/listener.yml.j2 b/roles/apps/whawty/auth/instance/templates/listener.yml.j2
new file mode 100644
index 00000000..a69bdc58
--- /dev/null
+++ b/roles/apps/whawty/auth/instance/templates/listener.yml.j2
@@ -0,0 +1,8 @@
+https:
+  listen:
+  - ":{{ whawty_auth_instances[whawty_auth_instance].port }}"
+  tls:
+    certificate: /tls/publish-crt.pem
+    certificate-key: /tls/publish-key.pem
+    min-protocol-version: "TLSv1.3"
+    prefer-server-ciphers: true
diff --git a/roles/apps/whawty/auth/instance/templates/pod-spec.yml.j2 b/roles/apps/whawty/auth/instance/templates/pod-spec.yml.j2
index 99c6e733..01a956cc 100644
--- a/roles/apps/whawty/auth/instance/templates/pod-spec.yml.j2
+++ b/roles/apps/whawty/auth/instance/templates/pod-spec.yml.j2
@@ -7,10 +7,8 @@ containers:
   image: "ghcr.io/whawty/auth/app:v{{ whawty_auth_instances[whawty_auth_instance].version }}"
   args:
   - "run"
-  - "--web-addr"
-  - ":{{ whawty_auth_instances[whawty_auth_instance].port }}"
-  - "--web-config"
-  - "/config/web.yml"
+  - "--listener"
+  - "/config/listener.yml"
   env:
   - name: "WHAWTY_AUTH_STORE_CONFIG"
     value: "/config/store.yml"
diff --git a/roles/apps/whawty/auth/instance/templates/web.yml.j2 b/roles/apps/whawty/auth/instance/templates/web.yml.j2
deleted file mode 100644
index d7f35f2e..00000000
--- a/roles/apps/whawty/auth/instance/templates/web.yml.j2
+++ /dev/null
@@ -1,6 +0,0 @@
----
-tls:
-  certificate: /tls/publish-crt.pem
-  certificate-key: /tls/publish-key.pem
-  min-protocol-version: "TLSv1.3"
-  prefer-server-ciphers: true
-- 
cgit v1.2.3