From f17a946d8155d9396a58c1ad2cbab1d99dc75684 Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Mon, 6 Nov 2023 19:07:04 +0100
Subject: [PATCH] add recursort in front of auth server

---
 nomad-job/pdns-auth.nomad | 26 +++++++++++++++++++++++++-
 nomad-job/pihole.nomad    |  6 ++----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/nomad-job/pdns-auth.nomad b/nomad-job/pdns-auth.nomad
index 9c7d3dd..83d2f07 100644
--- a/nomad-job/pdns-auth.nomad
+++ b/nomad-job/pdns-auth.nomad
@@ -116,6 +116,30 @@ SQLALCHEMY_DATABASE_URI=postgresql://pdns-admin:{{ .Data.data.pdnsadmin }}@activ
       }
 
   }
+  task "pdns-recursor" {
+
+    driver = "docker"
+    config {
+     image = "powerdns/pdns-recursor-master:latest"        
+    network_mode = "host"
+      volumes = [
+        "local/recursor.conf:/etc/powerdns/recursor.conf",
+      ]
+    }
+    template{
+      destination = "local/recursor.conf"
+      data= <<EOH
+config-dir=/etc/powerdns
+dnssec=off
+forward-zones=consul=127.0.0.1:8600,ducamps.eu=192.168.1.5,1.168.192.in-addr.arpa=192.168.1.5
+local-address=192.168.1.6
+      EOH
+    }
+    resources {
+      cpu    = 100
+      memory = 100
+    }
+  }
   task "keepalived" {
     driver = "docker"
       lifecycle {
@@ -126,7 +150,7 @@ SQLALCHEMY_DATABASE_URI=postgresql://pdns-admin:{{ .Data.data.pdnsadmin }}@activ
       env {
         KEEPALIVED_ROUTER_ID     = "52"
         KEEPALIVED_STATE         = "MASTER"
-        KEEPALIVED_VIRTUAL_IPS   = "192.168.1.5"
+        KEEPALIVED_VIRTUAL_IPS   = "#PYTHON2BASH:['192.168.1.5','192.168.1.6']"
       }
       template{
         destination = "local/env.yaml"
diff --git a/nomad-job/pihole.nomad b/nomad-job/pihole.nomad
index ed27785..20c0096 100644
--- a/nomad-job/pihole.nomad
+++ b/nomad-job/pihole.nomad
@@ -67,8 +67,8 @@ job "pihole" {
       }
       env {
         TZ   = "Europe/Paris"
-        DNS1 = "1.1.1.1"
-        DNS2 = "80.67.169.40"
+        DNS1 = "192.168.1.5"
+        DNS2 = "192.168.1.41"
         WEB_PORT      = "${NOMAD_PORT_http}"
 
       }
@@ -84,8 +84,6 @@ job "pihole" {
       }
       template {
         data        = <<EOH
-server=/ducamps.win/192.168.1.10
-server=/ducamps.eu/192.168.1.5
 {{range service "consul"}}server=/consul/{{.Address}}#8600
 {{end}}
 domain=ducamps.eu