From de735527009515fe553cfef3776fdc44ce3a7e3c Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 25 Oct 2020 10:59:01 +0100 Subject: [PATCH] nodes: add gce.dns02 and gce.dns03, remove AutoDNS nameservers --- data/powerdns/files/bind-zones/kunbox.net | 2 ++ nodes/a.ns14.net.py | 11 --------- nodes/b.ns14.net.py | 11 --------- nodes/c.ns14.net.py | 11 --------- nodes/d.ns14.net.py | 11 --------- nodes/gce/dns02.py | 29 +++++++++++++++++++++++ nodes/gce/dns03.py | 29 +++++++++++++++++++++++ 7 files changed, 60 insertions(+), 44 deletions(-) delete mode 100644 nodes/a.ns14.net.py delete mode 100644 nodes/b.ns14.net.py delete mode 100644 nodes/c.ns14.net.py delete mode 100644 nodes/d.ns14.net.py create mode 100644 nodes/gce/dns02.py create mode 100644 nodes/gce/dns03.py diff --git a/data/powerdns/files/bind-zones/kunbox.net b/data/powerdns/files/bind-zones/kunbox.net index bae3e61..41065c6 100644 --- a/data/powerdns/files/bind-zones/kunbox.net +++ b/data/powerdns/files/bind-zones/kunbox.net @@ -16,6 +16,8 @@ mx0 IN A 94.130.52.224 ; Nameservers ns-1 IN A 34.89.208.78 +ns-2 IN A 35.187.109.249 +ns-3 IN A 35.228.143.71 % for record in sorted(metadata_records): ${record} diff --git a/nodes/a.ns14.net.py b/nodes/a.ns14.net.py deleted file mode 100644 index db4d7c8..0000000 --- a/nodes/a.ns14.net.py +++ /dev/null @@ -1,11 +0,0 @@ -# This node is not actually part of this repository, it's a DNS server -# managed by AutoDNS. It needs a node file, because we're using that to -# auto-generate DNS configs. - -nodes['a.ns14.net'] = { - 'hostname': 'a.ns14.net', - 'dummy': True, - 'groups': { - 'dns', - }, -} diff --git a/nodes/b.ns14.net.py b/nodes/b.ns14.net.py deleted file mode 100644 index c9ea427..0000000 --- a/nodes/b.ns14.net.py +++ /dev/null @@ -1,11 +0,0 @@ -# This node is not actually part of this repository, it's a DNS server -# managed by AutoDNS. It needs a node file, because we're using that to -# auto-generate DNS configs. - -nodes['b.ns14.net'] = { - 'hostname': 'b.ns14.net', - 'dummy': True, - 'groups': { - 'dns', - }, -} diff --git a/nodes/c.ns14.net.py b/nodes/c.ns14.net.py deleted file mode 100644 index 58b36c9..0000000 --- a/nodes/c.ns14.net.py +++ /dev/null @@ -1,11 +0,0 @@ -# This node is not actually part of this repository, it's a DNS server -# managed by AutoDNS. It needs a node file, because we're using that to -# auto-generate DNS configs. - -nodes['c.ns14.net'] = { - 'hostname': 'c.ns14.net', - 'dummy': True, - 'groups': { - 'dns', - }, -} diff --git a/nodes/d.ns14.net.py b/nodes/d.ns14.net.py deleted file mode 100644 index 728c644..0000000 --- a/nodes/d.ns14.net.py +++ /dev/null @@ -1,11 +0,0 @@ -# This node is not actually part of this repository, it's a DNS server -# managed by AutoDNS. It needs a node file, because we're using that to -# auto-generate DNS configs. - -nodes['d.ns14.net'] = { - 'hostname': 'd.ns14.net', - 'dummy': True, - 'groups': { - 'dns', - }, -} diff --git a/nodes/gce/dns02.py b/nodes/gce/dns02.py new file mode 100644 index 0000000..16cdceb --- /dev/null +++ b/nodes/gce/dns02.py @@ -0,0 +1,29 @@ +# ns-2.kunbox.net +# Belgium + +nodes['gce.dns02'] = { + 'bundles': set(), + 'groups': { + 'dns', + }, + 'metadata': { + 'interfaces': { + 'eth0': { + 'ipv4': { + '10.132.0.2', + }, + 'gateway4': '10.132.0.1', + }, + }, + 'external_ipv4': '35.187.109.249', + 'powerdns': { + 'my_hostname': 'ns-2.kunbox.net', + }, + 'vm': { + 'cpu': 1, + 'ram': 1, + }, + }, + 'os': 'debian', + 'os_version': (10,), +} diff --git a/nodes/gce/dns03.py b/nodes/gce/dns03.py new file mode 100644 index 0000000..f581f82 --- /dev/null +++ b/nodes/gce/dns03.py @@ -0,0 +1,29 @@ +# ns-3.kunbox.net +# Finland + +nodes['gce.dns03'] = { + 'bundles': set(), + 'groups': { + 'dns', + }, + 'metadata': { + 'interfaces': { + 'eth0': { + 'ipv4': { + '10.166.0.2', + }, + 'gateway4': '10.166.0.1', + }, + }, + 'external_ipv4': '35.228.143.71', + 'powerdns': { + 'my_hostname': 'ns-3.kunbox.net', + }, + 'vm': { + 'cpu': 1, + 'ram': 1, + }, + }, + 'os': 'debian', + 'os_version': (10,), +}