Add IPv6 address for shenron and update generated files.

diff --git a/data/openstreetmap.com b/data/openstreetmap.com
index 50dce624ada0e8255688fda8f473adf90285895b..98f25b12cefed15535c908c6e43f3a598ae46fe2 100644 (file)
--- a/data/openstreetmap.com
+++ b/data/openstreetmap.com
@@ -53,9 +53,10 @@
 
 # Gazetteer (nominatim) server
 
 
 # Gazetteer (nominatim) server
 

-+katie.openstreetmap.com:128.40.168.101
-+katie.internal.openstreetmap.com:10.0.0.6
-+nominatim.openstreetmap.com:128.40.168.101
++poldi.openstreetmap.com:128.40.168.106 
++poldi.internal.openstreetmap.com:10.0.0.16
++poldi.ilo.openstreetmap.com:10.0.0.66
++nominatim.openstreetmap.com:128.40.168.106

 
 # Gazetteer (namefinder) server
 
 
 # Gazetteer (namefinder) server
 


@@ -68,6 +69,19 @@
 +xapi.openstreetmap.com:128.40.168.97
 +fafnir.internal.openstreetmap.com:10.0.0.4
 
 +xapi.openstreetmap.com:128.40.168.97
 +fafnir.internal.openstreetmap.com:10.0.0.4
 

+# OWL server
+
++albi.openstreetmap.com:128.40.168.95
++owl.openstreetmap.com:128.40.168.95
++albi.internal.openstreetmap.com:10.0.0.2
++albi.ilo.openstreetmap.com:10.0.0.52
+
+# Spare server
+
++azure.openstreetmap.com:128.40.168.100
++azure.internal.openstreetmap.com:10.0.0.5
++azure.ilo.openstreetmap.com:10.0.0.55
+

 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmap.com:128.40.168.104
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmap.com:128.40.168.104


@@ -131,13 +145,11 @@
 
 +planet.openstreetmap.com:128.40.168.99
 
 
 +planet.openstreetmap.com:128.40.168.99
 

-# Spare servers
-
-+dulcy.internal.openstreetmap.com:10.0.0.2
-

 # APC power switch
 
 +apc1.internal.openstreetmap.com:10.0.0.49
 # APC power switch
 
 +apc1.internal.openstreetmap.com:10.0.0.49

++apc2.internal.openstreetmap.com:10.0.0.50
++apc3.internal.openstreetmap.com:10.0.0.51

 
 # Forum server
 
 
 # Forum server
 


@@ -155,6 +167,15 @@
 +help.openstreetmap.com:89.16.179.150
 +shenron.internal.openstreetmap.com:10.0.0.251
 
 +help.openstreetmap.com:89.16.179.150
 +shenron.internal.openstreetmap.com:10.0.0.251
 

+3shenron.openstreetmap.com:200141c800100996021d7dfffec3df70
+3mail.openstreetmap.com:200141c800100996021d7dfffec3df70
+3lists.openstreetmap.com:200141c800100996021d7dfffec3df70
+3svn.openstreetmap.com:200141c800100996021d7dfffec3df70
+3git.openstreetmap.com:200141c800100996021d7dfffec3df70
+3trac.openstreetmap.com:200141c800100996021d7dfffec3df70
+3irc.openstreetmap.com:200141c800100996021d7dfffec3df70
+3help.openstreetmap.com:200141c800100996021d7dfffec3df70
+

 # Wiki server
 
 +konqi.openstreetmap.com:193.63.75.26
 # Wiki server
 
 +konqi.openstreetmap.com:193.63.75.26

diff --git a/data/openstreetmap.net b/data/openstreetmap.net
index b71a4f707b52fb023109a175624e7e864b3fbe6b..247a3433b7f0fb9d3b6c46821489858703ad3a6e 100644 (file)
--- a/data/openstreetmap.net
+++ b/data/openstreetmap.net
@@ -53,9 +53,10 @@
 
 # Gazetteer (nominatim) server
 
 
 # Gazetteer (nominatim) server
 

-+katie.openstreetmap.net:128.40.168.101
-+katie.internal.openstreetmap.net:10.0.0.6
-+nominatim.openstreetmap.net:128.40.168.101
++poldi.openstreetmap.net:128.40.168.106 
++poldi.internal.openstreetmap.net:10.0.0.16
++poldi.ilo.openstreetmap.net:10.0.0.66
++nominatim.openstreetmap.net:128.40.168.106

 
 # Gazetteer (namefinder) server
 
 
 # Gazetteer (namefinder) server
 


@@ -68,6 +69,19 @@
 +xapi.openstreetmap.net:128.40.168.97
 +fafnir.internal.openstreetmap.net:10.0.0.4
 
 +xapi.openstreetmap.net:128.40.168.97
 +fafnir.internal.openstreetmap.net:10.0.0.4
 

+# OWL server
+
++albi.openstreetmap.net:128.40.168.95
++owl.openstreetmap.net:128.40.168.95
++albi.internal.openstreetmap.net:10.0.0.2
++albi.ilo.openstreetmap.net:10.0.0.52
+
+# Spare server
+
++azure.openstreetmap.net:128.40.168.100
++azure.internal.openstreetmap.net:10.0.0.5
++azure.ilo.openstreetmap.net:10.0.0.55
+

 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmap.net:128.40.168.104
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmap.net:128.40.168.104


@@ -131,13 +145,11 @@
 
 +planet.openstreetmap.net:128.40.168.99
 
 
 +planet.openstreetmap.net:128.40.168.99
 

-# Spare servers
-
-+dulcy.internal.openstreetmap.net:10.0.0.2
-

 # APC power switch
 
 +apc1.internal.openstreetmap.net:10.0.0.49
 # APC power switch
 
 +apc1.internal.openstreetmap.net:10.0.0.49

++apc2.internal.openstreetmap.net:10.0.0.50
++apc3.internal.openstreetmap.net:10.0.0.51

 
 # Forum server
 
 
 # Forum server
 


@@ -155,6 +167,15 @@
 +help.openstreetmap.net:89.16.179.150
 +shenron.internal.openstreetmap.net:10.0.0.251
 
 +help.openstreetmap.net:89.16.179.150
 +shenron.internal.openstreetmap.net:10.0.0.251
 

+3shenron.openstreetmap.net:200141c800100996021d7dfffec3df70
+3mail.openstreetmap.net:200141c800100996021d7dfffec3df70
+3lists.openstreetmap.net:200141c800100996021d7dfffec3df70
+3svn.openstreetmap.net:200141c800100996021d7dfffec3df70
+3git.openstreetmap.net:200141c800100996021d7dfffec3df70
+3trac.openstreetmap.net:200141c800100996021d7dfffec3df70
+3irc.openstreetmap.net:200141c800100996021d7dfffec3df70
+3help.openstreetmap.net:200141c800100996021d7dfffec3df70
+

 # Wiki server
 
 +konqi.openstreetmap.net:193.63.75.26
 # Wiki server
 
 +konqi.openstreetmap.net:193.63.75.26

diff --git a/data/openstreetmap.org b/data/openstreetmap.org
index a1327a97a4b31fc46307d10ac81e4d38d847ec3b..c5c1e022eaaa5b6ecab01edce6fa984a6607882c 100644 (file)
--- a/data/openstreetmap.org
+++ b/data/openstreetmap.org
@@ -53,9 +53,10 @@
 
 # Gazetteer (nominatim) server
 
 
 # Gazetteer (nominatim) server
 

-+katie.openstreetmap.org:128.40.168.101
-+katie.internal.openstreetmap.org:10.0.0.6
-+nominatim.openstreetmap.org:128.40.168.101
++poldi.openstreetmap.org:128.40.168.106 
++poldi.internal.openstreetmap.org:10.0.0.16
++poldi.ilo.openstreetmap.org:10.0.0.66
++nominatim.openstreetmap.org:128.40.168.106

 
 # Gazetteer (namefinder) server
 
 
 # Gazetteer (namefinder) server
 


@@ -68,6 +69,19 @@
 +xapi.openstreetmap.org:128.40.168.97
 +fafnir.internal.openstreetmap.org:10.0.0.4
 
 +xapi.openstreetmap.org:128.40.168.97
 +fafnir.internal.openstreetmap.org:10.0.0.4
 

+# OWL server
+
++albi.openstreetmap.org:128.40.168.95
++owl.openstreetmap.org:128.40.168.95
++albi.internal.openstreetmap.org:10.0.0.2
++albi.ilo.openstreetmap.org:10.0.0.52
+
+# Spare server
+
++azure.openstreetmap.org:128.40.168.100
++azure.internal.openstreetmap.org:10.0.0.5
++azure.ilo.openstreetmap.org:10.0.0.55
+

 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmap.org:128.40.168.104
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmap.org:128.40.168.104


@@ -131,13 +145,11 @@
 
 +planet.openstreetmap.org:128.40.168.99
 
 
 +planet.openstreetmap.org:128.40.168.99
 

-# Spare servers
-
-+dulcy.internal.openstreetmap.org:10.0.0.2
-

 # APC power switch
 
 +apc1.internal.openstreetmap.org:10.0.0.49
 # APC power switch
 
 +apc1.internal.openstreetmap.org:10.0.0.49

++apc2.internal.openstreetmap.org:10.0.0.50
++apc3.internal.openstreetmap.org:10.0.0.51

 
 # Forum server
 
 
 # Forum server
 


@@ -155,6 +167,15 @@
 +help.openstreetmap.org:89.16.179.150
 +shenron.internal.openstreetmap.org:10.0.0.251
 
 +help.openstreetmap.org:89.16.179.150
 +shenron.internal.openstreetmap.org:10.0.0.251
 

+3shenron.openstreetmap.org:200141c800100996021d7dfffec3df70
+3mail.openstreetmap.org:200141c800100996021d7dfffec3df70
+3lists.openstreetmap.org:200141c800100996021d7dfffec3df70
+3svn.openstreetmap.org:200141c800100996021d7dfffec3df70
+3git.openstreetmap.org:200141c800100996021d7dfffec3df70
+3trac.openstreetmap.org:200141c800100996021d7dfffec3df70
+3irc.openstreetmap.org:200141c800100996021d7dfffec3df70
+3help.openstreetmap.org:200141c800100996021d7dfffec3df70
+

 # Wiki server
 
 +konqi.openstreetmap.org:193.63.75.26
 # Wiki server
 
 +konqi.openstreetmap.org:193.63.75.26

diff --git a/data/openstreetmaps.org b/data/openstreetmaps.org
index a3a7225f84144cd0f084292a3205c39adfcd2858..be8c24796303a6c1c5d8a0762a6dd981e139d1d2 100644 (file)
--- a/data/openstreetmaps.org
+++ b/data/openstreetmaps.org
@@ -53,9 +53,10 @@
 
 # Gazetteer (nominatim) server
 
 
 # Gazetteer (nominatim) server
 

-+katie.openstreetmaps.org:128.40.168.101
-+katie.internal.openstreetmaps.org:10.0.0.6
-+nominatim.openstreetmaps.org:128.40.168.101
++poldi.openstreetmaps.org:128.40.168.106 
++poldi.internal.openstreetmaps.org:10.0.0.16
++poldi.ilo.openstreetmaps.org:10.0.0.66
++nominatim.openstreetmaps.org:128.40.168.106

 
 # Gazetteer (namefinder) server
 
 
 # Gazetteer (namefinder) server
 


@@ -68,6 +69,19 @@
 +xapi.openstreetmaps.org:128.40.168.97
 +fafnir.internal.openstreetmaps.org:10.0.0.4
 
 +xapi.openstreetmaps.org:128.40.168.97
 +fafnir.internal.openstreetmaps.org:10.0.0.4
 

+# OWL server
+
++albi.openstreetmaps.org:128.40.168.95
++owl.openstreetmaps.org:128.40.168.95
++albi.internal.openstreetmaps.org:10.0.0.2
++albi.ilo.openstreetmaps.org:10.0.0.52
+
+# Spare server
+
++azure.openstreetmaps.org:128.40.168.100
++azure.internal.openstreetmaps.org:10.0.0.5
++azure.ilo.openstreetmaps.org:10.0.0.55
+

 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmaps.org:128.40.168.104
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmaps.org:128.40.168.104


@@ -131,13 +145,11 @@
 
 +planet.openstreetmaps.org:128.40.168.99
 
 
 +planet.openstreetmaps.org:128.40.168.99
 

-# Spare servers
-
-+dulcy.internal.openstreetmaps.org:10.0.0.2
-

 # APC power switch
 
 +apc1.internal.openstreetmaps.org:10.0.0.49
 # APC power switch
 
 +apc1.internal.openstreetmaps.org:10.0.0.49

++apc2.internal.openstreetmaps.org:10.0.0.50
++apc3.internal.openstreetmaps.org:10.0.0.51

 
 # Forum server
 
 
 # Forum server
 


@@ -155,6 +167,15 @@
 +help.openstreetmaps.org:89.16.179.150
 +shenron.internal.openstreetmaps.org:10.0.0.251
 
 +help.openstreetmaps.org:89.16.179.150
 +shenron.internal.openstreetmaps.org:10.0.0.251
 

+3shenron.openstreetmaps.org:200141c800100996021d7dfffec3df70
+3mail.openstreetmaps.org:200141c800100996021d7dfffec3df70
+3lists.openstreetmaps.org:200141c800100996021d7dfffec3df70
+3svn.openstreetmaps.org:200141c800100996021d7dfffec3df70
+3git.openstreetmaps.org:200141c800100996021d7dfffec3df70
+3trac.openstreetmaps.org:200141c800100996021d7dfffec3df70
+3irc.openstreetmaps.org:200141c800100996021d7dfffec3df70
+3help.openstreetmaps.org:200141c800100996021d7dfffec3df70
+

 # Wiki server
 
 +konqi.openstreetmaps.org:193.63.75.26
 # Wiki server
 
 +konqi.openstreetmaps.org:193.63.75.26

diff --git a/data/osm.org b/data/osm.org
index bd2bd3625898c155babf364966d744cd51072bba..6fde49b2eed7efe96be3078befa7871d52461de8 100644 (file)
--- a/data/osm.org
+++ b/data/osm.org
@@ -53,9 +53,10 @@
 
 # Gazetteer (nominatim) server
 
 
 # Gazetteer (nominatim) server
 

-+katie.osm.org:128.40.168.101
-+katie.internal.osm.org:10.0.0.6
-+nominatim.osm.org:128.40.168.101
++poldi.osm.org:128.40.168.106 
++poldi.internal.osm.org:10.0.0.16
++poldi.ilo.osm.org:10.0.0.66
++nominatim.osm.org:128.40.168.106

 
 # Gazetteer (namefinder) server
 
 
 # Gazetteer (namefinder) server
 


@@ -68,6 +69,19 @@
 +xapi.osm.org:128.40.168.97
 +fafnir.internal.osm.org:10.0.0.4
 
 +xapi.osm.org:128.40.168.97
 +fafnir.internal.osm.org:10.0.0.4
 

+# OWL server
+
++albi.osm.org:128.40.168.95
++owl.osm.org:128.40.168.95
++albi.internal.osm.org:10.0.0.2
++albi.ilo.osm.org:10.0.0.52
+
+# Spare server
+
++azure.osm.org:128.40.168.100
++azure.internal.osm.org:10.0.0.5
++azure.ilo.osm.org:10.0.0.55
+

 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.osm.org:128.40.168.104
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.osm.org:128.40.168.104


@@ -131,13 +145,11 @@
 
 +planet.osm.org:128.40.168.99
 
 
 +planet.osm.org:128.40.168.99
 

-# Spare servers
-
-+dulcy.internal.osm.org:10.0.0.2
-

 # APC power switch
 
 +apc1.internal.osm.org:10.0.0.49
 # APC power switch
 
 +apc1.internal.osm.org:10.0.0.49

++apc2.internal.osm.org:10.0.0.50
++apc3.internal.osm.org:10.0.0.51

 
 # Forum server
 
 
 # Forum server
 


@@ -155,6 +167,15 @@
 +help.osm.org:89.16.179.150
 +shenron.internal.osm.org:10.0.0.251
 
 +help.osm.org:89.16.179.150
 +shenron.internal.osm.org:10.0.0.251
 

+3shenron.osm.org:200141c800100996021d7dfffec3df70
+3mail.osm.org:200141c800100996021d7dfffec3df70
+3lists.osm.org:200141c800100996021d7dfffec3df70
+3svn.osm.org:200141c800100996021d7dfffec3df70
+3git.osm.org:200141c800100996021d7dfffec3df70
+3trac.osm.org:200141c800100996021d7dfffec3df70
+3irc.osm.org:200141c800100996021d7dfffec3df70
+3help.osm.org:200141c800100996021d7dfffec3df70
+

 # Wiki server
 
 +konqi.osm.org:193.63.75.26
 # Wiki server
 
 +konqi.osm.org:193.63.75.26

diff --git a/src/openstreetmap b/src/openstreetmap
index 07f31c224702ad59407e2fd835426e9aa369870f..34fcd8b74692eae21d4e9ff3d4bee6cf54b0569d 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -167,6 +167,15 @@
 +help.openstreetmap:89.16.179.150
 +shenron.internal.openstreetmap:10.0.0.251
 
 +help.openstreetmap:89.16.179.150
 +shenron.internal.openstreetmap:10.0.0.251
 

+3shenron.openstreetmap:200141c800100996021d7dfffec3df70
+3mail.openstreetmap:200141c800100996021d7dfffec3df70
+3lists.openstreetmap:200141c800100996021d7dfffec3df70
+3svn.openstreetmap:200141c800100996021d7dfffec3df70
+3git.openstreetmap:200141c800100996021d7dfffec3df70
+3trac.openstreetmap:200141c800100996021d7dfffec3df70
+3irc.openstreetmap:200141c800100996021d7dfffec3df70
+3help.openstreetmap:200141c800100996021d7dfffec3df70
+

 # Wiki server
 
 +konqi.openstreetmap:193.63.75.26
 # Wiki server
 
 +konqi.openstreetmap:193.63.75.26