Stuff

roles/docker/defaults/main.yml

@@ -177,7 +177,6 @@ services:
     domain: "social.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/mastodon"
     pre_deploy_tasks: true
-    post_deploy_tasks: true
     version: v4.2.8
     postgres_version: 14-alpine
     redis_version: 6-alpine

roles/docker/tasks/block.yml

@@ -21,8 +21,8 @@
   when: deploy_services is defined and deploy_services
   block:
     - name: Deploy Compose stack for service '{{ service.name }}'
-      ansible.builtin.command: docker compose up -d --remove-orphans --pull always
-      args:
+      ansible.builtin.command:
+        cmd: docker compose up -d --remove-orphans
         chdir: "{{ service.vars.volume_folder }}"
 
     - name: Run post-deployment tasks for service '{{ service.name }}'

roles/docker/tasks/main.yml

@@ -11,16 +11,14 @@
   apt_repository:
     repo: deb https://download.docker.com/linux/ubuntu bionic stable
     state: present
-    update_cache: yes
+    update_cache: true
 
 - name: Install Docker
   apt:
-    name: "{{ pkgs }}"
-    state: present
-  vars:
-    pkgs:
+    name:
       - docker-ce
       - docker-compose-plugin
+    state: present
 
 - name: Configure cron job to prune unused Docker data weekly
   cron:

roles/docker/tasks/post_deploy/mastodon.yml

@@ -1,20 +0,0 @@
-# vim: ft=yaml.ansible
-# code: language=ansible
----
-- name: Configure cron job to remove old Mastodon media daily
-  cron:
-    name: Clean Mastodon media data older than a week
-    cron_file: ansible_mastodon_clean_media
-    job: docker exec mastodon-web-1 tootctl media remove --days 7
-    special_time: daily
-    user: root
-    state: present
-
-- name: Configure cron job to remove old Mastodon preview cards daily
-  cron:
-    name: Clean Mastodon preview card data older than two weeks
-    cron_file: ansible_mastodon_clean_preview_cards
-    job: docker exec mastodon-web-1 tootctl preview_cards remove --days 14
-    special_time: daily
-    user: root
-    state: present

roles/docker/tasks/pre_deploy/mastodon.yml

@@ -44,3 +44,21 @@
   copy:
     src: mastodon/postgresql.conf
     dest: "{{ services.mastodon.volume_folder }}/postgres_config/postgresql.conf"
+
+- name: Configure cron job to remove old Mastodon media daily
+  ansible.builtin.cron:
+    name: Clean Mastodon media data older than a week
+    cron_file: ansible_mastodon_clean_media
+    job: docker compose -f {{ services.mastodon.volume_folder }}/docker-compose.yml exec web tootctl media remove --days 7
+    special_time: daily
+    user: root
+    state: present
+
+- name: Configure cron job to remove old Mastodon preview cards daily
+  ansible.builtin.cron:
+    name: Clean Mastodon preview card data older than two weeks
+    cron_file: ansible_mastodon_clean_preview_cards
+    job: docker compose -f {{ services.mastodon.volume_folder }}/docker-compose.yml exec web tootctl preview_cards remove --days 14
+    special_time: daily
+    user: root
+    state: present