Move shop to point at a vhost that redirects to the wiki

diff --git a/data/openstreetmap.com b/data/openstreetmap.com
index 79f0e02e8576db67c34246d331d38e77d7eed35b..bdf39c00a1ef326464e381592a2077ff11e298ef 100644 (file)
--- a/data/openstreetmap.com
+++ b/data/openstreetmap.com
@@ -167,6 +167,7 @@
 +trac.openstreetmap.com:89.16.179.150
 +irc.openstreetmap.com:89.16.179.150
 +help.openstreetmap.com:89.16.179.150
++shop.openstreetmap.com:89.16.179.150
 +shenron.internal.openstreetmap.com:10.0.0.251
 
 3shenron.openstreetmap.com:200141c800100996021d7dfffec3df70
@@ -177,6 +178,7 @@
 3trac.openstreetmap.com:200141c800100996021d7dfffec3df70
 3irc.openstreetmap.com:200141c800100996021d7dfffec3df70
 3help.openstreetmap.com:200141c800100996021d7dfffec3df70
+3shop.openstreetmap.com:200141c800100996021d7dfffec3df70
 
 # Wiki server
 
@@ -202,10 +204,6 @@
 
 +donate.openstreetmap.com:89.145.67.86
 
-# Our shop
-
-Cshop.openstreetmap.com:virtual.fotopic.net
-
 # HOT site
 
 +hot.openstreetmap.com:69.163.129.108

diff --git a/data/openstreetmap.net b/data/openstreetmap.net
index 887a6d041b6f209d94ced463579a2470d9a8d70d..6daa3bf2d1174157e2b88626ba7c006728195987 100644 (file)
--- a/data/openstreetmap.net
+++ b/data/openstreetmap.net
@@ -167,6 +167,7 @@
 +trac.openstreetmap.net:89.16.179.150
 +irc.openstreetmap.net:89.16.179.150
 +help.openstreetmap.net:89.16.179.150
++shop.openstreetmap.net:89.16.179.150
 +shenron.internal.openstreetmap.net:10.0.0.251
 
 3shenron.openstreetmap.net:200141c800100996021d7dfffec3df70
@@ -177,6 +178,7 @@
 3trac.openstreetmap.net:200141c800100996021d7dfffec3df70
 3irc.openstreetmap.net:200141c800100996021d7dfffec3df70
 3help.openstreetmap.net:200141c800100996021d7dfffec3df70
+3shop.openstreetmap.net:200141c800100996021d7dfffec3df70
 
 # Wiki server
 
@@ -202,10 +204,6 @@
 
 +donate.openstreetmap.net:89.145.67.86
 
-# Our shop
-
-Cshop.openstreetmap.net:virtual.fotopic.net
-
 # HOT site
 
 +hot.openstreetmap.net:69.163.129.108

diff --git a/data/openstreetmap.org b/data/openstreetmap.org
index 68af5e864589ac10529708267fbed0125a54dd56..ea5ebfece3561c5d3a4d194e35e954b584495b6a 100644 (file)
--- a/data/openstreetmap.org
+++ b/data/openstreetmap.org
@@ -167,6 +167,7 @@
 +trac.openstreetmap.org:89.16.179.150
 +irc.openstreetmap.org:89.16.179.150
 +help.openstreetmap.org:89.16.179.150
++shop.openstreetmap.org:89.16.179.150
 +shenron.internal.openstreetmap.org:10.0.0.251
 
 3shenron.openstreetmap.org:200141c800100996021d7dfffec3df70
@@ -177,6 +178,7 @@
 3trac.openstreetmap.org:200141c800100996021d7dfffec3df70
 3irc.openstreetmap.org:200141c800100996021d7dfffec3df70
 3help.openstreetmap.org:200141c800100996021d7dfffec3df70
+3shop.openstreetmap.org:200141c800100996021d7dfffec3df70
 
 # Wiki server
 
@@ -202,10 +204,6 @@
 
 +donate.openstreetmap.org:89.145.67.86
 
-# Our shop
-
-Cshop.openstreetmap.org:virtual.fotopic.net
-
 # HOT site
 
 +hot.openstreetmap.org:69.163.129.108

diff --git a/data/openstreetmaps.org b/data/openstreetmaps.org
index c936047011eaf43c6b2ba8f7e6ae948ef0633942..4b48bac13674f9499fca225c1c7956c7613436fe 100644 (file)
--- a/data/openstreetmaps.org
+++ b/data/openstreetmaps.org
@@ -167,6 +167,7 @@
 +trac.openstreetmaps.org:89.16.179.150
 +irc.openstreetmaps.org:89.16.179.150
 +help.openstreetmaps.org:89.16.179.150
++shop.openstreetmaps.org:89.16.179.150
 +shenron.internal.openstreetmaps.org:10.0.0.251
 
 3shenron.openstreetmaps.org:200141c800100996021d7dfffec3df70
@@ -177,6 +178,7 @@
 3trac.openstreetmaps.org:200141c800100996021d7dfffec3df70
 3irc.openstreetmaps.org:200141c800100996021d7dfffec3df70
 3help.openstreetmaps.org:200141c800100996021d7dfffec3df70
+3shop.openstreetmaps.org:200141c800100996021d7dfffec3df70
 
 # Wiki server
 
@@ -202,10 +204,6 @@
 
 +donate.openstreetmaps.org:89.145.67.86
 
-# Our shop
-
-Cshop.openstreetmaps.org:virtual.fotopic.net
-
 # HOT site
 
 +hot.openstreetmaps.org:69.163.129.108

diff --git a/data/osm.org b/data/osm.org
index f34d4e1c04f7cd38735c57f09c5003eb568977e9..41b49fbb539faeb223f11b0bb4df7550ee2cb659 100644 (file)
--- a/data/osm.org
+++ b/data/osm.org
@@ -167,6 +167,7 @@
 +trac.osm.org:89.16.179.150
 +irc.osm.org:89.16.179.150
 +help.osm.org:89.16.179.150
++shop.osm.org:89.16.179.150
 +shenron.internal.osm.org:10.0.0.251
 
 3shenron.osm.org:200141c800100996021d7dfffec3df70
@@ -177,6 +178,7 @@
 3trac.osm.org:200141c800100996021d7dfffec3df70
 3irc.osm.org:200141c800100996021d7dfffec3df70
 3help.osm.org:200141c800100996021d7dfffec3df70
+3shop.osm.org:200141c800100996021d7dfffec3df70
 
 # Wiki server
 
@@ -202,10 +204,6 @@
 
 +donate.osm.org:89.145.67.86
 
-# Our shop
-
-Cshop.osm.org:virtual.fotopic.net
-
 # HOT site
 
 +hot.osm.org:69.163.129.108

diff --git a/src/openstreetmap b/src/openstreetmap
index 0316deb206dbe3891f744de82b9955e0e3214365..9bab177e6fa16418cfdea608b7a09def9f034345 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -167,6 +167,7 @@
 +trac.openstreetmap:89.16.179.150
 +irc.openstreetmap:89.16.179.150
 +help.openstreetmap:89.16.179.150
++shop.openstreetmap:89.16.179.150
 +shenron.internal.openstreetmap:10.0.0.251
 
 3shenron.openstreetmap:200141c800100996021d7dfffec3df70
@@ -177,6 +178,7 @@
 3trac.openstreetmap:200141c800100996021d7dfffec3df70
 3irc.openstreetmap:200141c800100996021d7dfffec3df70
 3help.openstreetmap:200141c800100996021d7dfffec3df70
+3shop.openstreetmap:200141c800100996021d7dfffec3df70
 
 # Wiki server
 
@@ -202,10 +204,6 @@
 
 +donate.openstreetmap:89.145.67.86
 
-# Our shop
-
-Cshop.openstreetmap:virtual.fotopic.net
-
 # HOT site
 
 +hot.openstreetmap:69.163.129.108