From 3109e6961cafd8384ee46dae0ff544ffc8eeeb95 Mon Sep 17 00:00:00 2001
From: Paul Walko <paul.walko@ozmo.com>
Date: Thu, 7 Sep 2023 14:19:08 -0600
Subject: [PATCH] lech ansible

---
 ansible/files/lech/smb.conf | 16 +++-------------
 ansible/main.yml            | 32 ++++++++++++++++++++++++--------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/ansible/files/lech/smb.conf b/ansible/files/lech/smb.conf
index e20cd90..5286842 100644
--- a/ansible/files/lech/smb.conf
+++ b/ansible/files/lech/smb.conf
@@ -169,26 +169,16 @@ interfaces = 64.112.38.10/30 eno1
 
 #======================= Share Definitions =======================
 
-[pew-organized-photos]
-   comment = pew's organized photos
+[pew-photos]
+   comment = pew's photos
    browseable = yes
-   path = /mammoth/tmp/pew-organized-photos
+   path = /mammoth/tmp/pew-photos
    guest ok = no
    read only = yes
    create mask = 0644
    directory mask = 0755
    valid users = paul
 
-[pew-unorganized-photos]
-   comment = pew's unorganized photos
-   browseable = yes
-   path = /mammoth/tmp/pew-unorganized-photos
-   guest ok = no
-   read only = no
-   create mask = 0644
-   directory mask = 0755
-   valid users = paul
-
 # Un-comment the following and create the netlogon directory for Domain Logons
 # (you need to configure Samba to act as a domain controller too.)
 ;[netlogon]
diff --git a/ansible/main.yml b/ansible/main.yml
index 8eb303b..56f8d67 100644
--- a/ansible/main.yml
+++ b/ansible/main.yml
@@ -189,15 +189,12 @@
         force_apt_get: yes
         update_cache: yes
 
-    - name: Create samba dirs
+    - name: Create samba dir
       file:
-        path: "/mammoth/tmp/{{ item }}"
+        path: /mammoth/tmp/pew-photos
         state: directory
         owner: paul
         group: paul
-      loop:
-        - pew-unorganized-photos
-        - pew-organized-photos
       notify: Restart smbd
 
     - name: Configure samba
@@ -218,10 +215,14 @@
         mode: '0644'
       notify: Restart zfs-zed
 
-    - name: Install weekly ZFS cron job
+    - name: ZFS cronjob - Sunday
       cron:
         name: 'Weekly zfs pool status check'
-        special_time: weekly
+        minute: '0'
+        hour: '0'
+        day: '*'
+        month: '*'
+        weekday: '0'
         job: '/usr/sbin/zpool status | mail -s "ZFS STATUS" paul@bigcavemaps.com'
         user: paul
 
@@ -247,5 +248,20 @@
         day: '*'
         month: '*'
         weekday: '1'
-        user: paul
         job: "/home/paul/scripts-private/{{ hostname_short }}/backup.sh"
+        user: paul
+
+    - name: Mastodon cronjobs - Sunday
+      cron:
+        name: "mastodon {{ item }} remove"
+        minute: '0'
+        hour: '0'
+        day: '*'
+        month: '*'
+        weekday: '0'
+        job: "/usr/bin/docker exec mastodon-web tootctl {{ item }} remove"
+        user: paul
+      loop:
+        - media
+        - preview_cards
+