From 8593bf2e7ad7ed28bcf10e479d2b9eb3c17ede26 Mon Sep 17 00:00:00 2001 From: Waffles Date: Mon, 26 Dec 2022 22:59:02 -0800 Subject: [PATCH] Move swap management out of mastodon role and into yttrx role --- group_vars/all | 1 - roles/mastodon/tasks/main.yml | 2 -- roles/yttrx/tasks/main.yml | 2 ++ roles/{mastodon => yttrx}/tasks/swap.yml | 0 roles/yttrx/vars/main.yml | 2 ++ 5 files changed, 4 insertions(+), 3 deletions(-) rename roles/{mastodon => yttrx}/tasks/swap.yml (100%) create mode 100644 roles/yttrx/vars/main.yml diff --git a/group_vars/all b/group_vars/all index 3745187..2f74ec7 100644 --- a/group_vars/all +++ b/group_vars/all @@ -1,4 +1,3 @@ MASTODON_VERSION: v4.0.2 REAL_DB_HOST: tusky.masto.yttrx.com DB_POOL: 25 -swap_space: 1G diff --git a/roles/mastodon/tasks/main.yml b/roles/mastodon/tasks/main.yml index 28679ac..4492c12 100644 --- a/roles/mastodon/tasks/main.yml +++ b/roles/mastodon/tasks/main.yml @@ -10,8 +10,6 @@ stat: path=/home/mastodon/live register: p -- import_tasks: swap.yml - - import_tasks: repo.yml when: not p.stat.exists diff --git a/roles/yttrx/tasks/main.yml b/roles/yttrx/tasks/main.yml index 385049b..cc1b4e4 100644 --- a/roles/yttrx/tasks/main.yml +++ b/roles/yttrx/tasks/main.yml @@ -1,4 +1,6 @@ --- +- import_tasks: swap.yml + - name: Install prometheus node exporter package: name: prometheus-node-exporter diff --git a/roles/mastodon/tasks/swap.yml b/roles/yttrx/tasks/swap.yml similarity index 100% rename from roles/mastodon/tasks/swap.yml rename to roles/yttrx/tasks/swap.yml diff --git a/roles/yttrx/vars/main.yml b/roles/yttrx/vars/main.yml new file mode 100644 index 0000000..715e749 --- /dev/null +++ b/roles/yttrx/vars/main.yml @@ -0,0 +1,2 @@ +--- +swap_space: 1G