X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/07871395ef7dfb7cce79c1b97457db4c68c59b7d..108f25e0b01a8e7b43c931a197fb892da298f3d6:/src/openstreetmap-za.js

diff --git a/src/openstreetmap-za.js b/src/openstreetmap-za.js
index 78061ef..1167f28 100644
--- a/src/openstreetmap-za.js
+++ b/src/openstreetmap-za.js
@@ -4,7 +4,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   CAA_BUILDER({
     label: "@",
-    ttl: "1h",
     iodef: "mailto:hostmaster@openstreetmap.org",
     issue: [
       "letsencrypt.org",
@@ -22,7 +21,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   SPF_BUILDER({
     label: "@",
-    ttl: "1h",
     parts: [
       "v=spf1",
       "include:openstreetmap.org",      // main openstreetmap.org spf record
@@ -40,40 +38,26 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   CNAME("www", "www.openstreetmap.org."),
   CNAME("api", "api.openstreetmap.org."),
 
-  // Aerial imagery sites on draco
-
-  A("aerial", DRACO_IPV4, TTL("10m")),
-  A("a.aerial", DRACO_IPV4, TTL("10m")),
-  A("b.aerial", DRACO_IPV4, TTL("10m")),
-  A("c.aerial", DRACO_IPV4, TTL("10m")),
-
-  // Aerial imagery sites on kessie
-
-  A("coct.aerial", KESSIE_IPV4, TTL("30m")),
-  AAAA("coct.aerial", KESSIE_IPV6, TTL("30m")),
-  A("a.coct.aerial", KESSIE_IPV4, TTL("30m")),
-  AAAA("a.coct.aerial", KESSIE_IPV6, TTL("30m")),
-  A("b.coct.aerial", KESSIE_IPV4, TTL("30m")),
-  AAAA("b.coct.aerial", KESSIE_IPV6, TTL("30m")),
-  A("c.coct.aerial", KESSIE_IPV4, TTL("30m")),
-  AAAA("c.coct.aerial", KESSIE_IPV6, TTL("30m")),
-
-  A("topo", KESSIE_IPV4, TTL("30m")),
-  AAAA("topo", KESSIE_IPV6, TTL("30m")),
-  A("a.topo", KESSIE_IPV4, TTL("30m")),
-  AAAA("a.topo", KESSIE_IPV6, TTL("30m")),
-  A("b.topo", KESSIE_IPV4, TTL("30m")),
-  AAAA("b.topo", KESSIE_IPV6, TTL("30m")),
-  A("c.topo", KESSIE_IPV4, TTL("30m")),
-  AAAA("c.topo", KESSIE_IPV6, TTL("30m")),
-
-  A("namibia-topo", KESSIE_IPV4, TTL("30m")),
-  AAAA("namibia-topo", KESSIE_IPV6, TTL("30m")),
-  A("a.namibia-topo", KESSIE_IPV4, TTL("30m")),
-  AAAA("a.namibia-topo", KESSIE_IPV6, TTL("30m")),
-  A("b.namibia-topo", KESSIE_IPV4, TTL("30m")),
-  AAAA("b.namibia-topo", KESSIE_IPV6, TTL("30m")),
-  A("c.namibia-topo", KESSIE_IPV4, TTL("30m")),
-  AAAA("c.namibia-topo", KESSIE_IPV6, TTL("30m"))
+  // Aerial imagery sites
+
+  osm_web_service("aerial", "lockheed"),
+  osm_web_service("a.aerial", "lockheed"),
+  osm_web_service("b.aerial", "lockheed"),
+  osm_web_service("c.aerial", "lockheed"),
+
+  osm_web_service("coct.aerial", "lockheed"),
+  osm_web_service("a.coct.aerial", "lockheed"),
+  osm_web_service("b.coct.aerial", "lockheed"),
+  osm_web_service("c.coct.aerial", "lockheed"),
+
+  osm_web_service("topo", "lockheed"),
+  osm_web_service("a.topo", "lockheed"),
+  osm_web_service("b.topo", "lockheed"),
+  osm_web_service("c.topo", "lockheed"),
+
+  osm_web_service("namibia-topo", "lockheed"),
+  osm_web_service("a.namibia-topo", "lockheed"),
+  osm_web_service("b.namibia-topo", "lockheed"),
+  osm_web_service("c.namibia-topo", "lockheed")
 
 );