From 3354ce607df68dbe998599a874c62aab615c8955 Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Sun, 13 Oct 2024 18:30:14 +0200 Subject: [PATCH] Improve stuff a bit --- Makefile | 4 +++- playbooks/serguzim.net.yml | 5 +++-- roles/backup/tasks/hooks.yml | 4 +--- services.auto.tfvars | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 0ac6b33..e40dffd 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ SHELL := /bin/bash +TAGS ?= all + include .env export @@ -49,4 +51,4 @@ all: $(MAKE) tofu $(MAKE) dns @printf "\n=====\n\n" - ansible-playbook ./playbooks/serguzim.net.yml + ansible-playbook ./playbooks/serguzim.net.yml -t $(TAGS) diff --git a/playbooks/serguzim.net.yml b/playbooks/serguzim.net.yml index a568eb0..1ee6917 100644 --- a/playbooks/serguzim.net.yml +++ b/playbooks/serguzim.net.yml @@ -40,5 +40,6 @@ file: tasks/reload-caddy.yml apply: tags: caddy - tags: caddy - when: "'caddy' in ansible_run_tags" + tags: + - caddy + - never diff --git a/roles/backup/tasks/hooks.yml b/roles/backup/tasks/hooks.yml index 277f906..bd8e780 100644 --- a/roles/backup/tasks/hooks.yml +++ b/roles/backup/tasks/hooks.yml @@ -9,11 +9,9 @@ mode: "0755" - name: Copy the hooks ansible.builtin.copy: - src: "{{ item }}" + src: hooks/ dest: "{{ hooks_path }}" mode: "0755" - with_fileglob: - - "hooks/*" - name: Create the from directories ansible.builtin.file: path: "{{ ('/opt/services/_backup', item | basename) | path_join }}" diff --git a/services.auto.tfvars b/services.auto.tfvars index 66a2c46..6938f8b 100644 --- a/services.auto.tfvars +++ b/services.auto.tfvars @@ -17,7 +17,7 @@ services = { "authentik" = { name = "authentik" - host = "node002" + host = "node003" dns = [{ domain = "serguzim.me" target = "auth"