From 87b77339c54d07f104a2d55e1a57d7eef94e03e9 Mon Sep 17 00:00:00 2001 From: "Bet@" Date: Wed, 11 Sep 2024 17:35:16 -0300 Subject: [PATCH] rol proxy incluye al rol knsupdate antes de certbot es en el proxy! que se ejecuta knsupdate, q de hecho es una forma de actualizar el DNS de sutty como desde este api --- abyayala.yml | 3 +-- roles/knsupdate/tasks/loop.yml | 3 +-- roles/knsupdate/tasks/main.yml | 2 ++ roles/knsupdate/tasks/update.yml | 2 -- roles/proxy/tasks/main.yml | 4 ++++ tasks/knot.yml | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/abyayala.yml b/abyayala.yml index 4a1c466..3611254 100644 --- a/abyayala.yml +++ b/abyayala.yml @@ -32,7 +32,6 @@ matrix: nodo: ka.comun ssl: yes - - +#### AQI SUS NODES #END NODES diff --git a/roles/knsupdate/tasks/loop.yml b/roles/knsupdate/tasks/loop.yml index 5579e45..df20061 100644 --- a/roles/knsupdate/tasks/loop.yml +++ b/roles/knsupdate/tasks/loop.yml @@ -18,6 +18,5 @@ with_items: "{{ matrix_loop }}" loop_control: loop_var: vhost - - tags: knsupdate + tags: knot diff --git a/roles/knsupdate/tasks/main.yml b/roles/knsupdate/tasks/main.yml index 34036ea..7e3b166 100644 --- a/roles/knsupdate/tasks/main.yml +++ b/roles/knsupdate/tasks/main.yml @@ -2,3 +2,5 @@ apt: name: "knot-dnsutils" state: "present" + + - include_tasks: loop.yml diff --git a/roles/knsupdate/tasks/update.yml b/roles/knsupdate/tasks/update.yml index be0da84..b3783f3 100644 --- a/roles/knsupdate/tasks/update.yml +++ b/roles/knsupdate/tasks/update.yml @@ -1,5 +1,3 @@ - - include_vars: dir="../vars" files_matching="main.yml" - - set_fact: vho: "{{ vhost.domains[0] | regex_replace('([a-z0-9]+)\\.abyaya\\.la', '\\1')}}" diff --git a/roles/proxy/tasks/main.yml b/roles/proxy/tasks/main.yml index 793eb6c..30878c3 100644 --- a/roles/proxy/tasks/main.yml +++ b/roles/proxy/tasks/main.yml @@ -2,6 +2,10 @@ include_role: name=dnsmasq tags: dns + - name: knsupdate + include_role: name=knsupdate + tags: knot + - name: certbot role include_role: name=certbot tags: certbot diff --git a/tasks/knot.yml b/tasks/knot.yml index 5591c72..8326ed0 100644 --- a/tasks/knot.yml +++ b/tasks/knot.yml @@ -1,5 +1,5 @@ # Instalacion de KNOT - por ahora se ejecuta contra sutty, con variable host (local) e inventario especificado -# ansible-playbook --become tasks/knot.yml -e "host=localhost" -i hosts.local +# ansible-playbook --become tasks/knot.yml -e "host=localhost alt=abyayala" -i hosts.local --- - hosts: "{{ host }}" tasks: