dns: pdns-admin in dedicated nomad group

nomad-job/system/pdns-auth.nomad

@@ -15,20 +15,17 @@ job "pdns-auth" {
     operator  = "set_contains"
     value     = "cluster"
   }
+  vault {
+    policies = ["pdns"]
+  }
   group "pdns-auth" {
     network {
       port "dns" {
-        static=5300
+        static = 5300
       }
       port "http" {
         static = 8081
       }
-      port "pdnsadmin"{
-        to = 80
-      }
-    }
-  vault {
-    policies = ["pdns"]
     }
     task "pdns-auth" {
 
@@ -41,8 +38,8 @@ job "pdns-auth" {
       config {
         image        = "docker.service.consul:5000/powerdns/pdns-auth-master:latest"
         network_mode = "host"
-        privileged=true
+        privileged   = true
-        cap_add= ["net_bind_service"]
+        cap_add      = ["net_bind_service"]
         volumes = [
           "/mnt/diskstation/nomad/pdns-auth/var:/var/lib/powerdns/",
           "local/dnsupdate.conf:/etc/powerdns/pdns.d/dnsupdate.conf",
@@ -59,7 +56,7 @@ job "pdns-auth" {
         EOH
         env  = true
       }
-      template{
+      template {
         destination = "local/dnsupdate.conf"
         data        = <<EOH
 dnsupdate=yes
@@ -68,7 +65,7 @@ local-address=192.168.1.5
 local-port=53
         EOH
       }
-      template{
+      template {
         destination = "local/pdns.conf"
         data        = <<EOH
 launch=gpgsql
@@ -88,47 +85,7 @@ include-dir=/etc/powerdns/pdns.d
         memory = 100
       }
     }
-  task "pnds-admin" {
-    service {
-      name = "pdns-admin"
-      tags = [
-        "homer.enable=true",
-        "homer.name=PDNS-ADMIN",
-        "homer.service=Application",
-        "homer.logo=http://${NOMAD_ADDR_pdnsadmin}/static/img/favicon.png",
-        "homer.target=_blank",
-        "homer.url=http://${NOMAD_ADDR_pdnsadmin}",
 
-      ]
-      port = "pdnsadmin"
-    }
-    driver = "docker"
-    config {
-     image = "docker.service.consul:5000/powerdnsadmin/pda-legacy:latest"        
-     ports= ["pdnsadmin"]  
-      volumes = [
-        "/mnt/diskstation/nomad/pdns-admin/:/data/node_module/",
-      ]
-      }
-      template{
-        destination = "secrets/pdns-admin.env"
-        env = true
-        data = <<EOH
-{{ with secret "secrets/data/nomad/pdns"}}
-SECRET_KEY="{{ .Data.data.SECRET_KEY }}"
-GUNICORN_WORKERS=2
-{{ end }}
-{{ with secret "secrets/data/database/pdns"}}
-SQLALCHEMY_DATABASE_URI=postgresql://pdns-admin:{{ .Data.data.pdnsadmin }}@active.db.service.consul/pdns-admin
-{{end}}
-        EOH
-      }
-    resources {
-      cpu    = 50
-      memory = 200
-}
-
-  }
     task "pdns-recursor" {
 
       driver = "docker"
@@ -139,9 +96,9 @@ SQLALCHEMY_DATABASE_URI=postgresql://pdns-admin:{{ .Data.data.pdnsadmin }}@activ
           "local/recursor.conf:/etc/powerdns/recursor.conf",
         ]
       }
-    template{
+      template {
         destination = "local/recursor.conf"
-      data= <<EOH
+        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
@@ -165,10 +122,10 @@ local-address=192.168.1.6
         KEEPALIVED_STATE       = "MASTER"
         KEEPALIVED_VIRTUAL_IPS = "#PYTHON2BASH:['192.168.1.5','192.168.1.6']"
       }
-      template{
+      template {
         destination = "local/env.yaml"
         change_mode = "restart"
-        env= true
+        env         = true
         data        = <<EOH
         KEEPALIVED_INTERFACE= {{ sockaddr "GetPrivateInterfaces | include \"network\" \"192.168.1.0/24\" | attr \"name\"" }}
         EOH
@@ -188,4 +145,53 @@ local-address=192.168.1.6
       }
     }
   }
+  group "pdns-admin" {
+    network {
+      port "pdnsadmin" {
+        to = 80
+      }
+    }
+    task "pnds-admin" {
+      service {
+        name = "pdns-admin"
+        tags = [
+          "homer.enable=true",
+          "homer.name=PDNS-ADMIN",
+          "homer.service=Application",
+          "homer.logo=http://${NOMAD_ADDR_pdnsadmin}/static/img/favicon.png",
+          "homer.target=_blank",
+          "homer.url=http://${NOMAD_ADDR_pdnsadmin}",
+
+        ]
+        port = "pdnsadmin"
+      }
+      driver = "docker"
+      config {
+        image = "docker.service.consul:5000/powerdnsadmin/pda-legacy:latest"
+        ports = ["pdnsadmin"]
+        volumes = [
+          "/mnt/diskstation/nomad/pdns-admin/:/data/node_module/",
+        ]
+      }
+      template {
+        destination = "secrets/pdns-admin.env"
+        env         = true
+        data        = <<EOH
+{{ with secret "secrets/data/nomad/pdns"}}
+SECRET_KEY="{{ .Data.data.SECRET_KEY }}"
+GUNICORN_WORKERS=2
+{{ end }}
+{{ with secret "secrets/data/database/pdns"}}
+SQLALCHEMY_DATABASE_URI=postgresql://pdns-admin:{{ .Data.data.pdnsadmin }}@active.db.service.consul/pdns-admin
+{{end}}
+        EOH
+      }
+      resources {
+        cpu    = 50
+        memory = 200
+      }
+
+    }
+
+  }
 }