Use debops.cron role to configure cron jobs

Less dumb file copying, more intelligent configuring
amedee · Sep 23, 2024 · 33fdb10 · 33fdb10
1 parent 0282623
commit 33fdb10
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 25 deletions.
diff --git a/roles/common/files/etc/cron.monthly/hadori b/roles/common/files/etc/cron.monthly/hadori
diff --git a/roles/common/meta/main.yml b/roles/common/meta/main.yml
@@ -3,3 +3,9 @@ dependencies:
   - role: geerlingguy.swap
     swap_file_size_mb: '4096'
   - role: debops.debops.unattended_upgrades
+  - role: debops.debops.cron
+    cron__jobs:
+      hadori:
+        name: 'Hardlink with hadori'
+        special_time: 'monthly'
+        job: '/usr/bin/hadori --verbose /bin /sbin /lib /lib64 /usr /opt'
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
@@ -48,17 +48,18 @@
         mode: u=rw,go=r
       notify: Restart munin-node
 
+    - name: Copy munin plugin config files
+      ansible.builtin.copy:
+        src: etc/munin/plugin-conf.d/
+        dest: /etc/munin/plugin-conf.d/
+        owner: root
+        mode: u=rw,go=r
+        directory_mode: u=rwx,go=rx
+      notify: Restart munin-node
+
     - name: Allow access to port 4949
       community.general.ufw:
         rule: allow
         port: 4949
         src: 142.93.227.16
       notify: Restart munin-node
-
-- name: Copy etc files
-  ansible.builtin.copy:
-    src: etc/
-    dest: /etc/
-    owner: root
-    mode: u=rwx,go=rX
-    directory_mode: u=rwx,go=rx
diff --git a/roles/mailinabox/files/etc/cron.daily/doveadm-expunge b/roles/mailinabox/files/etc/cron.daily/doveadm-expunge
diff --git a/.../etc/cron.daily/extract_image_attachments → ...les/root/bin/extract_image_attachments.sh b/.../etc/cron.daily/extract_image_attachments → ...les/root/bin/extract_image_attachments.sh
diff --git a/roles/mailinabox/meta/main.yml b/roles/mailinabox/meta/main.yml
@@ -8,3 +8,22 @@ dependencies:
         version: '3.0.1'
         priority: '99'
   - role: mailserver
+  - role: debops.debops.cron
+    cron__jobs:
+      doveadm_expunge:
+        jobs:
+          - name: 'Expunge Trash'
+            special_time: 'daily'
+            job: '/usr/bin/expunge -A mailbox Trash before 30d'
+          - name: 'Expunge Spam'
+            special_time: 'daily'
+            job: '/usr/bin/expunge -A mailbox Spam before 60d'
+      extract_image_attachments:
+        name: 'Extract image attachments'
+        special_time: 'daily'
+        job: '/root/bin/extract_image_attachments.sh'
+        custom_files:
+          - src: 'root/bin/extract_image_attachments.sh'
+            dest: '/root/bin/extract_image_attachments.sh'
+            owner: root
+            mode: u=rwx,go=rx
diff --git a/roles/mailinabox/tasks/main.yml b/roles/mailinabox/tasks/main.yml
@@ -14,6 +14,14 @@
     - /home/user-data/backup
     - /home/user-data/dns
 
+- name: Copy /etc/profile.d files
+  ansible.builtin.copy:
+    src: etc/profile.d/
+    dest: /etc/profile.d/
+    owner: root
+    mode: u=rwx,go=rx
+    directory_mode: u=rwx,go=rx
+
 - name: Copy custom DNS settings
   ansible.builtin.copy:
     src: home/user-data/dns/custom.yaml
@@ -32,11 +40,3 @@
 
 - name: Configure Munin
   ansible.builtin.include_tasks: tasks/munin.yml
-
-- name: Copy /etc files
-  ansible.builtin.copy:
-    src: etc/
-    dest: /etc/
-    owner: root
-    mode: u=rwX,go=rX
-    directory_mode: u=rwx,go=rx