diff --git a/domains/030-burble.dn42.js b/domains/030-burble.dn42.js index a002f91..c79301d 100644 --- a/domains/030-burble.dn42.js +++ b/domains/030-burble.dn42.js @@ -40,9 +40,9 @@ service('shell.ca-bhs2', 'fd42:4242:2601:100d:216:3eff:fed7:2ceb', '172.20.1 service('rpki', 'fd42:4242:2601:ac10::1'); service('dns64', 'fd42:4242:2601:ac53::64'); //service('wiki.service', 'fd42:4242:2601:ac00::10:1'); -service('dn42regsrv', 'fd42:4242:2601:ac00::20: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('vault.service', 'fd42:4242:2601:acf0::20:1'); service('ldap', 'fd42:4242:2601:acf0::60:1'); service('traefik-tier2', 'fd42:4242:2601:acf0::70:1'); service('traefik-eu-tier2', 'fd42:4242:2601:acf0::75:1'); @@ -51,7 +51,7 @@ service('traefik-na-tier2', 'fd42:4242:2601:acf0::76:1'); // proxied services proxied('glass'); proxied('lg'); -proxied('grafana'); +//proxied('grafana'); proxied('tasks'); proxied('ldap-admin'); proxied('svc'); @@ -61,27 +61,26 @@ proxied('s3'); proxied('anycast'); // envoy services -D_EXTEND( - domain, +//D_EXTEND( +// domain, // CNAME('ci', 'envoy.burble.dn42.'), - CNAME('send', 'envoy.burble.dn42.') +// CNAME('send', 'envoy.burble.dn42.') // CNAME('explorer', 'envoy.burble.dn42.'), // CNAME('vault', 'envoy.burble.dn42.'), // CNAME('wdev', 'envoy.burble.dn42.') -); +//); // docker services D_EXTEND( domain, // 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('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.') ); // nomad container services @@ -94,6 +93,7 @@ D_EXTEND( // eu services CNAME('invidious', 'traefik-eu.burble.dn42.'), + CNAME('grafana' , 'traefik-eu.burble.dn42.'), CNAME('lounge', 'traefik-eu.burble.dn42.'), CNAME('paste', 'traefik-eu.burble.dn42.'), CNAME('wiki-sync-uk-lon1', 'traefik-eu.burble.dn42.'), @@ -106,6 +106,8 @@ D_EXTEND( // internal services CNAME('ci', 'traefik-tier2.burble.dn42.'), CNAME('nomad', 'traefik-tier2.burble.dn42.'), + CNAME('prometheus', 'traefik-tier2.burble.dn42.'), + CNAME('prometheus-ingest', 'traefik-tier2.burble.dn42.'), CNAME('vault', 'traefik-tier2.burble.dn42.'), CNAME('wdev', 'traefik-tier2.burble.dn42.') );