From 3a65cfe2a8f3d4d8c711c08b89dbb829863f6981 Mon Sep 17 00:00:00 2001 From: VC Date: Fri, 14 Feb 2025 20:45:58 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB:=20move=20mastodon=20cron=20to=20mast?= =?UTF-8?q?odon=20role?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inventory/group_vars/mastodonservers.yml | 3 --- roles/{webapps/tasks/tootctl.yml => mastodon/tasks/cron.yml} | 0 roles/mastodon/tasks/main.yml | 3 +++ roles/mastodon/vars/main.yml | 2 ++ roles/webapps/tasks/main.yml | 3 --- 5 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 inventory/group_vars/mastodonservers.yml rename roles/{webapps/tasks/tootctl.yml => mastodon/tasks/cron.yml} (100%) diff --git a/inventory/group_vars/mastodonservers.yml b/inventory/group_vars/mastodonservers.yml deleted file mode 100644 index 1ee2aa4..0000000 --- a/inventory/group_vars/mastodonservers.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -mastodon_home: "/srv/mastodon" diff --git a/roles/webapps/tasks/tootctl.yml b/roles/mastodon/tasks/cron.yml similarity index 100% rename from roles/webapps/tasks/tootctl.yml rename to roles/mastodon/tasks/cron.yml diff --git a/roles/mastodon/tasks/main.yml b/roles/mastodon/tasks/main.yml index b045675..6f7a9a3 100644 --- a/roles/mastodon/tasks/main.yml +++ b/roles/mastodon/tasks/main.yml @@ -62,3 +62,6 @@ - name: Install mastodon ansible.builtin.include_tasks: mastodon.yml + +- name: Install tootctl cron + ansible.builtin.include_tasks: cron.yml diff --git a/roles/mastodon/vars/main.yml b/roles/mastodon/vars/main.yml index 31fd7a9..dbdbe21 100644 --- a/roles/mastodon/vars/main.yml +++ b/roles/mastodon/vars/main.yml @@ -9,3 +9,5 @@ mastodon_yarn_key_url: "https://dl.yarnpkg.com/debian/pubkey.gpg" mastodon_yarn_key_path: "/usr/share/keyrings/yarnkey.gpg" mastodon_ruby_version: "3.3.5" + +mastodon_home: "/srv/mastodon" diff --git a/roles/webapps/tasks/main.yml b/roles/webapps/tasks/main.yml index 2626025..c21d187 100644 --- a/roles/webapps/tasks/main.yml +++ b/roles/webapps/tasks/main.yml @@ -9,6 +9,3 @@ - name: Oolatoocs for NintendojoFR ansible.builtin.include_tasks: oolatoocs.yml when: inventory_hostname in groups['mastodonservers'] -- name: Tootctl for mastodon - ansible.builtin.include_tasks: tootctl.yml - when: inventory_hostname in groups['mastodonservers']