From 65950e45181e09ea843f6669ca000d45673137b3 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 19 Oct 2016 22:50:15 +0200
Subject: [PATCH] refs #758, updated bootstrap file and removed old URLs *
 replaced some hardcoded URLs * removed swiftTeamDefaultServers() *
 bootstrap.json

---
 .../share/shared/bootstrap/bootstrap.json     | 54 ++++++++-----------
 src/blackconfig/buildconfig.cpp               | 10 ----
 src/blackconfig/buildconfig.h                 |  3 --
 src/blackcore/data/globalsetup.cpp            |  4 +-
 4 files changed, 24 insertions(+), 47 deletions(-)

diff --git a/resources/share/shared/bootstrap/bootstrap.json b/resources/share/shared/bootstrap/bootstrap.json
index b75e72fc4..b6c71bd59 100644
--- a/resources/share/shared/bootstrap/bootstrap.json
+++ b/resources/share/shared/bootstrap/bootstrap.json
@@ -1,7 +1,8 @@
 {
-	"crashreportServerUrl": {
+    "crashreportServerUrl": {
         "url": "http://crashreports.swift-project.org/crash_upload"
     },
+    "dbDebugFlag": false,
     "dbHttpPort": 5080,
     "dbHttpsPort": 50443,
     "dbRootDirectoryUrl": {
@@ -9,50 +10,39 @@
     },
     "development": false,
     "fsdTestServers": {
-        "containerbase": [
-        ]
+        "containerbase": []
     },
     "newsUrls": {
-        "containerbase": [
-            {
-                "url": "http://swift-project.org/"
-            }
-        ]
+        "containerbase": [{
+            "url": "http://swift-project.org/"
+        }]
     },
     "sharedUrls": {
-        "containerbase": [
-            {
-                "url": "https://datastore.swift-project.org/shared"
-            },
-            {
-                "url": "http://ubuntu12/public/bootstrap/shared"
-            }
-        ]
+        "containerbase": [{
+            "url": "https://datastore.swift-project.org/shared"
+        },
+        {
+            "url": "https://vatsim-germany.org:50443/datastore/shared"
+        }]
     },
-    "timestampMSecsSinceEpoch": 1457055734000,
+    "timestampMSecsSinceEpoch": 1476907647000,
     "vatsimBookingsUrl": {
         "url": "http://vatbook.euroutepro.com/xml2.php"
     },
     "vatsimDataFileUrls": {
-        "containerbase": [
-            {
-                "url": "http://info.vroute.net/vatsim-data.txt"
-            }
-        ]
+        "containerbase": [{
+            "url": "http://info.vroute.net/vatsim-data.txt"
+        }]
     },
     "vatsimMetarsUrls": {
-        "containerbase": [
-            {
-                "url": "http://metar.vatsim.net/metar.php"
-            }
-        ]
+        "containerbase": [{
+            "url": "http://metar.vatsim.net/metar.php"
+        }]
     },
     "vatsimStatusFileUrls": {
-        "containerbase": [
-            {
-                "url": "https://status.vatsim.net"
-            }
-        ]
+        "containerbase": [{
+            "url": "https://status.vatsim.net"
+        }]
     },
     "wasLoaded": true
 }
diff --git a/src/blackconfig/buildconfig.cpp b/src/blackconfig/buildconfig.cpp
index dc1c8f0f7..6b293ebcb 100644
--- a/src/blackconfig/buildconfig.cpp
+++ b/src/blackconfig/buildconfig.cpp
@@ -117,16 +117,6 @@ namespace BlackConfig
 #endif
     }
 
-    const QStringList &CBuildConfig::swiftTeamDefaultServers()
-    {
-        static const QStringList s(
-        {
-            "https://datastore.swift-project.org/shared",
-            "http://ubuntu12/public/bootstrap/shared"
-        });
-        return s;
-    }
-
     bool CBuildConfig::isLifetimeExpired()
     {
         if (getEol().isValid())
diff --git a/src/blackconfig/buildconfig.h b/src/blackconfig/buildconfig.h
index 383f15edd..dcf97d852 100644
--- a/src/blackconfig/buildconfig.h
+++ b/src/blackconfig/buildconfig.h
@@ -121,9 +121,6 @@ namespace BlackConfig
         //! Executable name for swift data, no(!) appendix
         static const QString &swiftDataExecutableName();
 
-        //! swift team default servers for DB, bootstrap etc.
-        static const QStringList &swiftTeamDefaultServers();
-
         //! End of lifetime
         static const QDateTime &getEol();
 
diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp
index 46e01277b..e0a034ef5 100644
--- a/src/blackcore/data/globalsetup.cpp
+++ b/src/blackcore/data/globalsetup.cpp
@@ -28,8 +28,8 @@ namespace BlackCore
     {
         CGlobalSetup::CGlobalSetup() :
             ITimestampBased(0),
-            m_dbRootDirectoryUrl("http://ubuntu12/swiftdatastore/public"), m_vatsimBookingsUrl("http://vatbook.euroutepro.com/xml2.php"),
-            m_vatsimMetarsUrls( {"http://metar.vatsim.net/metar.php"}), m_vatsimStatusFileUrls({ "https://status.vatsim.net" }), m_vatsimDataFileUrls({ "http://info.vroute.net/vatsim-data.txt" }), m_sharedUrls(CBuildConfig::swiftTeamDefaultServers()), m_newsUrls(QStringList({ "http://swift-project.org/" }))
+            m_dbRootDirectoryUrl("https://datastore.swift-project.org/"), m_vatsimBookingsUrl("http://vatbook.euroutepro.com/xml2.php"),
+            m_vatsimMetarsUrls( {"http://metar.vatsim.net/metar.php"}), m_vatsimStatusFileUrls({ "https://status.vatsim.net" }), m_vatsimDataFileUrls({ "http://info.vroute.net/vatsim-data.txt" }), m_sharedUrls({"https://datastore.swift-project.org/shared", "https://vatsim-germany.org:50443/datastore/shared"}), m_newsUrls(QStringList({ "http://swift-project.org/" }))
         { }
 
         CUrl CGlobalSetup::getDbIcaoReaderUrl() const