From 4f419565656b09d0c0deefb7f5ca9b0618167a15 Mon Sep 17 00:00:00 2001
From: Simon Marsh <simon@burble.com>
Date: Wed, 22 Dec 2021 14:25:52 +0000
Subject: [PATCH] Update burble.dn42 servers and drone pipeline

---
 .drone.yml | 37 ++++++++++++++++++++++++++++---------
 dns.go     |  6 ------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 2ee92d1..affc41c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,21 +1,40 @@
 ---
 kind: pipeline
-type: exec
+type: docker
 name: default
 
 steps:
  - name: build
+   image: golang
    environment:
      CGO_ENABLED: 0
    commands:
     - go build
 
- - name: stage
-   commands:
-    - stage_artifact.sh dn42promsrv dn42promsrv
+ - name: upload
+   image: plugins/s3
+   settings:
+     bucket: artifacts
+     access_key:
+       from_secret: MINIO_ACCESS_KEY
+     secret_key:
+       from_secret: MINIO_SECRET_KEY
+     endpoint: https://minio.burble.dn42
+     region: uk-lon3
+     path_style: true
+     source: dn42promsrv
+     target: /dn42promsrv/${DRONE_BRANCH}
 
- - name: promote
-   commands:
-    - promote_artifact.sh dn42promsrv
-   when:
-    branch: master
+---
+kind: secret
+name: MINIO_ACCESS_KEY
+get:
+  path: burble.dn42/kv/data/drone/minio
+  name: ACCESS_KEY
+
+---
+kind: secret
+name: MINIO_SECRET_KEY
+get:
+  path: burble.dn42/kv/data/drone/minio
+  name: SECRET_KEY
diff --git a/dns.go b/dns.go
index aeef481..4462bff 100644
--- a/dns.go
+++ b/dns.go
@@ -114,14 +114,8 @@ var dns_servers = []*DNSServer{
 
 	&DNSServer{"burble.dn42", "burble", "de-fra1", 6,
 		"[fd42:4242:2601:3102:a25e:b7ff:feea:64ed]:53", 0},
-	&DNSServer{"burble.dn42", "burble", "us-dal3", 6,
-		"[fd42:4242:2601:2a02:a25e:b7ff:feea:64ed]:53", 0},
-	&DNSServer{"burble.dn42", "burble", "sg-sin2", 6,
-		"[fd42:4242:2601:3702:a25e:b7ff:feea:64ed]:53", 0},
 	&DNSServer{"burble.dn42", "burble", "ca-bhs2", 6,
 		"[fd42:4242:2601:2d02:a25e:b7ff:feea:64ed]:53", 0},
-	&DNSServer{"burble.dn42", "burble", "us-lax1", 6,
-		"[fd42:4242:2601:3a02:a25e:b7ff:feea:64ed]:53", 0},
 
 	// jrb0001