Feat(sa-merge-all): Use `sa-merge-all.py` to merge dumps; use `chdir`

[ansible.git] / playbooks / debian / sa-merge-all.yml

diff --git a/playbooks/debian/sa-merge-all.yml b/playbooks/debian/sa-merge-all.yml
index 3157f30ee40212d4c7d9925cbfa48c1643562424..dbf9b4c1b00b093a40d96053f74e7a4c222d0d47 100644 (file)
--- a/playbooks/debian/sa-merge-all.yml
+++ b/playbooks/debian/sa-merge-all.yml
@@ -24,7 +24,9 @@
       when: inventory_hostname != 'localhost'
 
     - name: Combine SpamAssassin DB backups
-      shell: "cd ~/tmp && exec cat sa-learn.backup@* >sa-learn.backup"
+      shell: "exec {{ playbook_dir }}/sa-merge-all.py -o sa-learn.backup sa-learn.backup@*"
+      args:
+        chdir: "~/tmp"
       when: inventory_hostname == 'localhost'
 
     - block:
@@ -33,7 +35,9 @@
           src: "~/tmp/sa-learn.backup"
           dest: "~/tmp/sa-learn.backup"
       - name: Restore combined SpamAssassin DB
-        shell: "cd tmp && sa-learn --clear && sa-learn --restore sa-learn.backup && exec sa-learn --sync"
+        shell: "sa-learn --clear && sa-learn --restore sa-learn.backup && exec sa-learn --sync"
+        args:
+          chdir: "~/tmp"
 
       - name: Start SpamAssassin
         become: true
@@ -48,4 +52,6 @@
       when: inventory_hostname != 'localhost'
 
     - name: Cleanup
-      shell: "cd ~/tmp && exec rm sa-learn.backup*"
+      shell: "exec rm sa-learn.backup*"
+      args:
+        chdir: "~/tmp"