From df449aad0e87914d3bd76939956987b26aa5b934 Mon Sep 17 00:00:00 2001
From: Paul Maruhn <paulmaruhn@posteo.de>
Date: Fri, 17 Dec 2021 00:46:24 +0100
Subject: [PATCH] use global variable for dns repo url
---
roles/ffhl_nameserver/tasks/powerdns.yml | 10 +++++-----
.../{files/scripts => templates}/update-dns.sh | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
rename roles/ffhl_nameserver/{files/scripts => templates}/update-dns.sh (65%)
diff --git a/roles/ffhl_nameserver/tasks/powerdns.yml b/roles/ffhl_nameserver/tasks/powerdns.yml
index 4c5d635..021b501 100644
--- a/roles/ffhl_nameserver/tasks/powerdns.yml
+++ b/roles/ffhl_nameserver/tasks/powerdns.yml
@@ -1,7 +1,4 @@
---
-
-
-
- name: copy dnsdist configs
copy:
src: dnsdist
@@ -26,11 +23,14 @@
# add update script
- name: copy update script
- copy:
- src: scripts/update-dns.sh
+ template:
+ src: update-dns.sh
dest: /usr/local/lib/ffhl/
mode: 775
+- name: run dns-update script
+ shell:
+ cmd: /usr/local/lib/ffhl/update-dns.sh
- name: copy systemd services and timers
copy:
diff --git a/roles/ffhl_nameserver/files/scripts/update-dns.sh b/roles/ffhl_nameserver/templates/update-dns.sh
similarity index 65%
rename from roles/ffhl_nameserver/files/scripts/update-dns.sh
rename to roles/ffhl_nameserver/templates/update-dns.sh
index e921451..8e1dab9 100644
--- a/roles/ffhl_nameserver/files/scripts/update-dns.sh
+++ b/roles/ffhl_nameserver/templates/update-dns.sh
@@ -2,8 +2,8 @@
set -e
DIR=$(mktemp -d)
-DEST=/var/local/ffhl-dns
-REPO=https://git.luebeck.freifunk.net/FreifunkLuebeck/ffhl-dns.git
+DEST="/var/local/ffhl-dns"
+REPO="{{ dns_repo_url }}"
mkdir -p "$DEST"
git clone "$REPO" "$DIR"
--
GitLab