From 84c76c0063ec750ec826cbe558d6701207ef7242 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Mon, 10 Mar 2025 17:19:19 +0000
Subject: [PATCH] Split enq configuration files into worker/server
---
roles/queue/tasks/main.yml | 12 ++++++++++--
.../{enq.default.j2 => enq-server.default.j2} | 2 --
roles/queue/templates/enq-worker.default.j2 | 1 +
3 files changed, 11 insertions(+), 4 deletions(-)
rename roles/queue/templates/{enq.default.j2 => enq-server.default.j2} (54%)
create mode 100644 roles/queue/templates/enq-worker.default.j2
diff --git a/roles/queue/tasks/main.yml b/roles/queue/tasks/main.yml
index ae4e8d70..784b9b3a 100644
--- a/roles/queue/tasks/main.yml
+++ b/roles/queue/tasks/main.yml
@@ -16,10 +16,18 @@
- enq-server.service
- enq-worker.service
+- name: Remove old configuration file
+ file:
+ path: "/etc/default/enq"
+ state: absent
+
- name: Configure queuing system (enq)
template:
- src: "enq.default.j2"
- dest: "/etc/default/enq"
+ src: "{{ item }}.default.j2"
+ dest: "/etc/default/{{ item }}"
+ loop:
+ - enq-worker
+ - enq-server
notify: reload enq
- name: Enable enq systemd units
diff --git a/roles/queue/templates/enq.default.j2 b/roles/queue/templates/enq-server.default.j2
similarity index 54%
rename from roles/queue/templates/enq.default.j2
rename to roles/queue/templates/enq-server.default.j2
index 22fc3135..8016be7c 100644
--- a/roles/queue/templates/enq.default.j2
+++ b/roles/queue/templates/enq-server.default.j2
@@ -1,3 +1 @@
SERVER_OPTIONS="--shard={{ shard_id }} --addr=:3733 --http-addr=:3734 --auth-token={{ enq_shared_secret }} --ssl-cert=/etc/credentials/x509/enq/server/cert.pem --ssl-key=/etc/credentials/x509/enq/server/private_key.pem --ssl-ca=/etc/credentials/x509/enq/ca.pem --topology=dynamic:%s.queue.{{ domain }}:3733"
-
-WORKER_OPTIONS="--id={{ inventory_hostname }} --http-addr=:3735 --auth-token={{ enq_shared_secret }} --ssl-cert=/etc/credentials/x509/enq/client/cert.pem --ssl-key=/etc/credentials/x509/enq/client/private_key.pem --ssl-ca=/etc/credentials/x509/enq/ca.pem"
diff --git a/roles/queue/templates/enq-worker.default.j2 b/roles/queue/templates/enq-worker.default.j2
new file mode 100644
index 00000000..03e1284c
--- /dev/null
+++ b/roles/queue/templates/enq-worker.default.j2
@@ -0,0 +1 @@
+WORKER_OPTIONS="--id={{ inventory_hostname }} --http-addr=:3735 --auth-token={{ enq_shared_secret }} --ssl-cert=/etc/credentials/x509/enq/client/cert.pem --ssl-key=/etc/credentials/x509/enq/client/private_key.pem --ssl-ca=/etc/credentials/x509/enq/ca.pem"
--
GitLab