From 43186667f07863dec0ec95d2842e12d2e3dce390 Mon Sep 17 00:00:00 2001
From: Simon Marsh <simon@burble.com>
Date: Sat, 17 Jun 2023 22:37:15 +0100
Subject: [PATCH] tidy and clusterise envoy

---
 domains/030-burble.dn42.js | 14 +++++---------
 dynamic/virtual.js         |  5 ++++-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/domains/030-burble.dn42.js b/domains/030-burble.dn42.js
index b26739d..84c42c5 100644
--- a/domains/030-burble.dn42.js
+++ b/domains/030-burble.dn42.js
@@ -40,7 +40,6 @@ service('wiki.service',   'fd42:4242:2601:ac00::10:1');
 service('dn42regsrv',     'fd42:4242:2601:ac00::20:1');
 service('dns-slave',      'fd42:4242:2601:ac00::53:1');
 service('vault.service',  'fd42:4242:2601:acf0::20:1');
-service('acme',           'fd42:4242:2601:acf0::30:1');
 service('ldap',           'fd42:4242:2601:acf0::60:1');
 
 // proxied services
@@ -50,13 +49,10 @@ proxied('lg');
 proxied('wiki');
 proxied('lounge');
 proxied('grafana');
-proxied('vault');
 proxied('tasks');
-//proxied('wdev');
 proxied('ldap-admin');
 proxied('svc');
 proxied('clicker');
-//proxied('send');
 proxied('minio');
 proxied('s3');
 proxied('anycast');
@@ -64,22 +60,22 @@ proxied('anycast');
 // envoy services
 D_EXTEND(
     domain,
-    CNAME('ci',   'envoy.de-fra1.burble.dn42.'),    
-    CNAME('send', 'envoy.de-fra1.burble.dn42.'),
-    CNAME('wdev', 'envoy.de-fra1.burble.dn42.')    
+    CNAME('ci',    'envoy.burble.dn42.'),
+    CNAME('send',  'envoy.burble.dn42.'),
+    CNAME('vault', 'envoy.burble.dn42.'),
+    CNAME('wdev',  'envoy.burble.dn42.')
 );    
 
-
 // docker services
 D_EXTEND(
     domain,
-//    CNAME('ci',                       'docker.tier2.fr-par1.burble.dn42.'),
     CNAME('sshwifty',                 'docker.tier1.de-fra1.burble.dn42.'),
     CNAME('paste',                    'docker.tier1.de-fra1.burble.dn42.'),    
     CNAME('uptime',                   'docker.tier1.ch-zur1.burble.dn42.'),
     CNAME('prometheus.tier2.ch-zur1', 'docker.tier2.ch-zur1.burble.dn42.'),
     CNAME('prometheus.tier2.de-fra1', 'docker.tier2.de-fra1.burble.dn42.'),
     CNAME('grafana.tier2.de-fra1',    'docker.tier2.de-fra1.burble.dn42.'),
+    CNAME('drone.tier2.fr-par1',      'docker.tier2.fr-par1.burble.dn42.'),
     CNAME('wiki-sync-de-fra1',        'docker.tier1.de-fra1.burble.dn42.'),
     CNAME('wiki-sync-us-lax1',        'docker.tier1.us-lax1.burble.dn42.'),
     CNAME('wiki-sync-us-nyc1',        'docker.tier1.us-nyc1.burble.dn42.')
diff --git a/dynamic/virtual.js b/dynamic/virtual.js
index 55063cc..d69f7c2 100644
--- a/dynamic/virtual.js
+++ b/dynamic/virtual.js
@@ -2,7 +2,10 @@ var virtual = [
     // insert here
     [ 'envoy.de-fra1', 'fd42:4242:2601:31:c203:beff:fe96:81a2' ],
     [ 'envoy.us-nyc1', 'fd42:4242:2601:29:c203:beff:fe96:81a2' ],
-    [ 'envoy.us-lax1', 'fd42:4242:2601:2a:c203:beff:fe96:81a2' ],    
+    [ 'envoy.us-lax1', 'fd42:4242:2601:2a:c203:beff:fe96:81a2' ],
+    [ 'envoy.tier2.de-fra1', 'fd42:4242:2601:3102:c203:beff:fe96:81a2' ],
+    [ 'envoy.tier2.us-nyc1', 'fd42:4242:2601:2902:c203:beff:fe96:81a2' ],
+    [ 'envoy.tier2.us-lax1', 'fd42:4242:2601:2a02:c203:beff:fe96:81a2' ],
     [ 'docker.tier1.us-nyc1', 'fd42:4242:2601:29:216:3eff:febc:32dd' ],
     [ 'docker.tier1.us-lax1', 'fd42:4242:2601:2a:216:3eff:fef5:662b' ],
     [ 'docker.tier2.us-nyc1', 'fd42:4242:2601:2902:926f:e2ff:fe66:b75e' ],