From 773fe64cef3d330d29cb5e63b7577a6187f1ee02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= <julian-samuel@gebuehr.net>
Date: Wed, 20 Apr 2022 10:22:00 +0200
Subject: [PATCH] Switch to an env file

---
 .../matrix-bot-matrix-registration-bot/defaults/main.yml  | 4 ++++
 .../tasks/setup_install.yml                               | 8 ++++++++
 roles/matrix-bot-matrix-registration-bot/templates/env.j2 | 6 ++++++
 .../systemd/matrix-bot-matrix-registration-bot.service.j2 | 7 +------
 4 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 roles/matrix-bot-matrix-registration-bot/templates/env.j2

diff --git a/roles/matrix-bot-matrix-registration-bot/defaults/main.yml b/roles/matrix-bot-matrix-registration-bot/defaults/main.yml
index 1733ef3e8..f7e7d314c 100644
--- a/roles/matrix-bot-matrix-registration-bot/defaults/main.yml
+++ b/roles/matrix-bot-matrix-registration-bot/defaults/main.yml
@@ -14,6 +14,10 @@ matrix_bot_matrix_registration_bot_docker_image_force_pull: "{{ matrix_bot_matri
 matrix_bot_matrix_registration_bot_base_path: "{{ matrix_base_data_path }}/matrix-registration-bot"
 matrix_bot_matrix_registration_bot_config_path: "{{ matrix_bot_matrix_registration_bot_base_path }}/config"
 
+matrix_bot_matrix_registration_bot_bot_server: "https://{{ matrix_server_fqn_matrix }}"
+matrix_bot_matrix_registration_bot_api_base_url: "https://{{ matrix_server_fqn_matrix }}"
+matrix_bot_matrix_registration_bot_logging_level: info
+
 # A list of extra arguments to pass to the container
 matrix_bot_matrix_registration_bot_container_extra_arguments: []
 
diff --git a/roles/matrix-bot-matrix-registration-bot/tasks/setup_install.yml b/roles/matrix-bot-matrix-registration-bot/tasks/setup_install.yml
index 986fc3521..5f1e3d793 100644
--- a/roles/matrix-bot-matrix-registration-bot/tasks/setup_install.yml
+++ b/roles/matrix-bot-matrix-registration-bot/tasks/setup_install.yml
@@ -12,6 +12,14 @@
     - {path: "{{ matrix_bot_matrix_registration_bot_docker_src_files_path }}", when: true}
   when: "item.when|bool"
 
+- name: Ensure matrix-registration-bot environment variables file created
+  template:
+    src: "{{ role_path }}/templates/env.j2"
+    dest: "{{ matrix_bot_matrix_registration_bot_config_path }}/env"
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_groupname }}"
+    mode: 0640
+
 - name: Ensure matrix-registration-bot image is pulled
   docker_image:
     name: "{{ matrix_bot_matrix_registration_bot_docker_image }}"
diff --git a/roles/matrix-bot-matrix-registration-bot/templates/env.j2 b/roles/matrix-bot-matrix-registration-bot/templates/env.j2
new file mode 100644
index 000000000..69ea841bc
--- /dev/null
+++ b/roles/matrix-bot-matrix-registration-bot/templates/env.j2
@@ -0,0 +1,6 @@
+BOT_SERVER={{ matrix_bot_matrix_registration_bot_bot_server }}
+BOT_USERNAME={{ matrix_bot_matrix_registration_bot_matrix_user_id_localpart }}
+BOT_PASSWORD={{ matrix_bot_matrix_registration_bot_matrix_user_password }}
+API_BASE_URL={{ matrix_bot_matrix_registration_bot_api_base_url }}
+API_TOKEN={{ matrix_bot_matrix_registration_bot_matrix_admin_token }}
+LOGGING_LEVEL={{ matrix_bot_matrix_registration_bot_logging_level }}
diff --git a/roles/matrix-bot-matrix-registration-bot/templates/systemd/matrix-bot-matrix-registration-bot.service.j2 b/roles/matrix-bot-matrix-registration-bot/templates/systemd/matrix-bot-matrix-registration-bot.service.j2
index 35a60e82f..75fdc331f 100644
--- a/roles/matrix-bot-matrix-registration-bot/templates/systemd/matrix-bot-matrix-registration-bot.service.j2
+++ b/roles/matrix-bot-matrix-registration-bot/templates/systemd/matrix-bot-matrix-registration-bot.service.j2
@@ -20,12 +20,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-bot-matrix-reg
 			--log-driver=none \
 			--cap-drop=ALL \
 			--network={{ matrix_docker_network }} \
-			-e 'BOT_SERVER=https://{{ matrix_server_fqn_matrix }}' \
-			-e 'BOT_USERNAME={{ matrix_bot_matrix_registration_bot_matrix_user_id_localpart }}' \
-			-e 'BOT_PASSWORD={{ matrix_bot_matrix_registration_bot_matrix_user_password }}' \
-			-e 'API_BASE_URL=https://{{ matrix_server_fqn_matrix }}' \
-			-e 'API_TOKEN={{ matrix_bot_matrix_registration_bot_matrix_admin_token }}' \
-			-e 'LOGGING_LEVEL=info' \
+			--env-file={{ matrix_bot_matrix_registration_bot_config_path }}/env \
 			{{ matrix_bot_matrix_registration_bot_docker_image }}
 
 ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-bot-matrix-registration-bot 2>/dev/null || true'