ansible/roles/mcaptcha/tasks/main.yml

@@ -42,9 +42,9 @@
 
 - name: Copy mCaptcha systemd servicefile
   become: true
-  ansible.builtin.copy:
+  ansible.builtin.template:
-    src: ./artifacts/mcaptcha/mcaptcha.service
+    src: ./templates/mcaptcha/mcaptcha.service.j2
-    dest: /etc/systemd/system/
+    dest: /etc/systemd/system/mcaptcha.service
     owner: root
     group: root
     force: true
@@ -57,7 +57,7 @@
     state: directory
     mode: "0755"
 
-- name: Copy mCaptcha systemd servicefile
+- name: Copy mCaptcha config file
   become: true
   notify: restart mcaptcha
   ansible.builtin.template:

ansible/templates/mcaptcha/mcaptcha.service.j2

@@ -2,18 +2,23 @@
 Description=mCaptcha: PoW CAPTCHA system
 After=syslog.target
 After=network.target
-###
+
-# Don't forget to add the database service dependencies
+{% if cache_type == 'redis' %}
-###
+Wants=redis.service
-#
+After=redis.service
-#Wants=mariadb.service
+{% endif %}
-#After=mariadb.service
+
-#
+{% if database_type == 'postgres' %}
 Wants=postgresql.service
 After=postgresql.service
-#
+{% endif %}
-#Wants=redis.service
+
-#After=redis.service
+{% if database_type == 'mariadb' %}
+Wants=mariadb.service
+After=mariadb.service
+{% endif %}
+
+
 
 [Service]
 RestartSec=2s