From 1034729a2a3948e5a2e14d6dc86b8f2db390a256 Mon Sep 17 00:00:00 2001
From: phil <phil@systemausfall.org>
Date: Fri, 4 Mar 2022 15:38:44 +0100
Subject: [PATCH] zammad: Aktualisiere cron-Job

---
 defaults/main.yml |  2 --
 tasks/cron.yml    | 16 ++++++++++++++++
 tasks/main.yml    |  3 +++
 tasks/zammad.yml  | 10 ----------
 4 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 tasks/cron.yml

diff --git a/defaults/main.yml b/defaults/main.yml
index d1a9ae7..9794185 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-cron_file: /etc/cron.d/zammad
-
 es_version: "7.10.2"
 es_url: "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{{ es_version }}-amd64.deb"
 es_dl_path: /data
diff --git a/tasks/cron.yml b/tasks/cron.yml
new file mode 100644
index 0000000..85dba7a
--- /dev/null
+++ b/tasks/cron.yml
@@ -0,0 +1,16 @@
+---
+- name: "cron | Setze Umgebungsvariablen"
+  cron:
+    user: "{{ zammad_user }}"
+    name: RAILS_ENV
+    job: production
+    env: true
+
+- name: "cron | Richte cron ein"
+  cron:
+    user: "{{ zammad_user }}"
+    name: "Loesche unbenutzte Zammad-Kunden"
+    minute: "1"
+    hour: "1"
+    day: "1"
+    job: " cd {{ zammad_home }} && chronic rbenv exec rails r {{ local_scripts_dir }}/zammad-delete-customers.rb"
diff --git a/tasks/main.yml b/tasks/main.yml
index f369b14..3c24b54 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -10,6 +10,9 @@
 - import_tasks: zammad.yml
   tags: zammad
 
+- import_tasks: cron.yml
+  tags: cron
+
 - import_tasks: ruby.yml
   tags: ruby
 
diff --git a/tasks/zammad.yml b/tasks/zammad.yml
index 295aedb..414127c 100644
--- a/tasks/zammad.yml
+++ b/tasks/zammad.yml
@@ -41,16 +41,6 @@
     dest: "{{ local_scripts_dir }}/zammad-updater"
     mode: 0755
 
-- name: "zammad | Richte cron ein"
-  cron:
-    cron_file: "{{ cron_file }}"
-    user: "{{ zammad_user }}"
-    name: "Loesche unbenutzte Zammad-Kunden"
-    minute: "1"
-    hour: "1"
-    day: "1"
-    job: " chronic cd {{ zammad_home }} && RAILS_ENV=production rbenv exec rails r {{ local_scripts_dir }}/zammad-delete-customers.rb"
-
 - name: "zammad | Erstelle Alias"
   lineinfile:
     path: /root/.bashrc