diff --git a/ansible/group_vars/DNS b/ansible/group_vars/DNS index 5e0b2e6..ca861d2 100644 --- a/ansible/group_vars/DNS +++ b/ansible/group_vars/DNS @@ -15,7 +15,7 @@ pdns_rec_config: forward-zones: - "{{ consul_domain }}=127.0.0.1:8600" - "ducamps.win=192.168.1.10" - - "ducamps.eu=192.168.1.5:5300" + - "ducamps.eu=192.168.1.5" - "1.168.192.in-addr.arpa=192.168.1.5:5300" local-address: "{{ ansible_default_ipv4.address }}" dnssec: "off" diff --git a/ansible/group_vars/dhcp/dhcp b/ansible/group_vars/dhcp/dhcp index 5c606a5..8b251f2 100644 --- a/ansible/group_vars/dhcp/dhcp +++ b/ansible/group_vars/dhcp/dhcp @@ -7,11 +7,11 @@ dhcpd_nameservers: dhcpd_zones: - zone: "lan.{{ domain.name }}." - primary: "192.168.1.10" - key: "dhcp" + primary: "192.168.1.5" + key: "dhcpdupdate" - zone: "1.168.192.in-addr.arpa." - primary: "192.168.1.10" - key: "dhcp" + primary: "192.168.1.5" + key: "dhcpdupdate" dhcpd_options: | ddns-updates on; diff --git a/ansible/group_vars/dhcp/vault_dhcp b/ansible/group_vars/dhcp/vault_dhcp index 759bbc9..baba1d1 100644 --- a/ansible/group_vars/dhcp/vault_dhcp +++ b/ansible/group_vars/dhcp/vault_dhcp @@ -1,13 +1,14 @@ $ANSIBLE_VAULT;1.1;AES256 -66616338633634336135333064663732313730373234663838623537396533373536623563636661 -6639333231346463346133313664626438383432383864310a326665386463666633333537303139 -62313337666231636664356439343333646166313062616235663463386339393661396537653132 -3162303733376534630a633236613235323835363636323031313132646430346235636533323565 -65633837303666346338333262333430623636393464636662373831393639376262353563616266 -39646539633831613732643337343661653566383962343330393634626639343465353233373234 -61653539626630303634373163383362346132323866623035663962643865363766626235653561 -63616232383761643431343239356566643630376563333236663835666534623535653663303165 -62343331653162336339663764346439306264353961623431313935353530623864643734303038 -64653366653739656161663638653561336433373439643138366331303135323264613162616636 -30353635623437666164353766666233323530393334613165343065663264303835336462643338 -63336132646437336466 +65303666336535386536653939626336646338623431353161636565393532623264316534326539 +6265393839323438376666393030383839326239323261660a333132613538306137383332336538 +38323830353062366133643734303138343939323135333532333666653039326437316361353463 +6665393263376132620a346239386437326462363565636335303766306638393331656664376665 +63373131373039653065633861626263646635323634333538343163346239633937303761366362 +31376438363731613666393531656232653033336332653261313866396434616461303831353336 +38663965636536313932346133363733636636643938366364366435366237316435643062336231 +34343931653963613431336465653036616431323263613731393963656637303561366461663038 +31336131346266393035343135323131636435333865323733386439363763376638383337613530 +34356331356361636665383933633130343564373739343630663835313164326565393439306163 +31386538633033333961386534323234653833323537356565616436346462613333663139623035 +30636265313230383162633466373937353262383965313631326336666133653331366230653961 +6131 diff --git a/ansible/group_vars/production b/ansible/group_vars/production index 54b6f22..ae12151 100644 --- a/ansible/group_vars/production +++ b/ansible/group_vars/production @@ -1,5 +1,5 @@ domain: - name: ducamps.win + name: ducamps.eu consul_bootstrap_expect: 3 consul_domain: "consul" nomad_bootstrap_expect: 3 diff --git a/nomad-job/pdns-auth.nomad b/nomad-job/pdns-auth.nomad index 482c2d8..9c7d3dd 100644 --- a/nomad-job/pdns-auth.nomad +++ b/nomad-job/pdns-auth.nomad @@ -3,7 +3,7 @@ job "pdns-auth" { datacenters = ["homelab"] priority = 100 meta { - force = 3 + force = 2 } type = "service" constraint { @@ -34,10 +34,10 @@ job "pdns-auth" { } config { - image = "powerdns/pdns-auth-48:latest" + image = "powerdns/pdns-auth-master:latest" network_mode = "host" 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 +59,8 @@ job "pdns-auth" { data = <