switch to gh pages config service

contrib/config/README.md

@@ -1,8 +1,8 @@
+## former ebusd.eu config webservice
 
-ebusd.eu config webservice
+This is the code of the former webservice at https://cfg.ebusd.eu/ that allowed ebusd to download the needed CSV configuration
-==========================
-
-This is the code of the webservice at https://cfg.ebusd.eu/ that allows ebusd to download the needed CSV configuration
 files instead of having to install the ebusd-configuration package.
 
-It is enabled by default in ebusd due to the default value of the `--configpath=https://cfg.ebusd.eu/` commandline option.
+Meanwhile the service was moved to using github pages at `https://ebus.github.io/`.
+
+The code here is kept for those who want to serve the old style configuration on their own.

src/ebusd/main.cpp

@@ -40,11 +40,8 @@ namespace ebusd {
 
 using std::cout;
 
-/** the previous config path part to rewrite to the current one. */
+/** the previous config path suffixes to rewrite to the current one. */
-#define PREVIOUS_CONFIG_PATH_SUFFIX "://ebusd.eu/config/"
+#define PREVIOUS_CONFIG_PATH_SUFFIXES {"ebusd.eu/config/", "cfg.ebusd.eu/"}
-
-/** the second previous config path part to rewrite to the current one. */
-#define PREVIOUS_CONFIG_PATH_SUFFIX2 "://cfg.ebusd.eu/"
 
 /** the opened PID file, or nullptr. */
 static FILE* s_pidFile = nullptr;
@@ -255,7 +252,7 @@ int main(int argc, char* argv[], char* envp[]) {
 
   const string lang = MappedFileReader::normalizeLanguage(
     s_opt.preferLanguage == nullptr || !s_opt.preferLanguage[0] ? "" : s_opt.preferLanguage);
-  string configLocalPrefix, configUriPrefix;
+  string configLocalPrefix, configUriPrefix, configLangQuery;
 #ifdef HAVE_SSL
   HttpClient::initialize(s_opt.caFile, s_opt.caPath);
 #else  // HAVE_SSL
@@ -270,14 +267,16 @@ int main(int argc, char* argv[], char* envp[]) {
       logWrite(lf_main, ll_error, "invalid configpath without scanconfig");  // force logging on exit
       return EINVAL;
     }
-    size_t pos = configPath.find(PREVIOUS_CONFIG_PATH_SUFFIX);
+    for (auto prevSuffix : PREVIOUS_CONFIG_PATH_SUFFIXES) {
-    if (pos != string::npos) {
+      size_t pos = configPath.find(prevSuffix);
-      string newPath = configPath.substr(0, pos) + CONFIG_PATH_SUFFIX
+      if (pos == string::npos || (pos >= 3 && configPath.substr(pos-3, 3) != "://")) {
-        + configPath.substr(pos+strlen(PREVIOUS_CONFIG_PATH_SUFFIX));
+        continue;
-      logNotice(lf_main, "replaced old configPath %s with new one: %s", s_opt.configPath, newPath.c_str());
+      }
-      configPath = newPath;
+      configPath = CONFIG_PATH;
+      logNotice(lf_main, "replaced old configPath %s with new one: %s", s_opt.configPath, configPath.c_str());
+      break;
     }
-    uint16_t configPort = 80;
+    uint16_t configPort = 443;
     string proto, configHost;
     if (!HttpClient::parseUrl(configPath, &proto, &configHost, &configPort, &configUriPrefix)) {
 #ifndef HAVE_SSL
@@ -289,6 +288,13 @@ int main(int argc, char* argv[], char* envp[]) {
       logWrite(lf_main, ll_error, "invalid configPath URL");  // force logging on exit
       return EINVAL;
     }
+    if (configHost == CONFIG_HOST) {
+      string suffix = (lang != "en" ? "de" : lang) + "/";
+      configUriPrefix += suffix;
+      configPath += suffix;  // only for informational purposes
+    } else {
+      configLangQuery = lang.empty() ? lang : "?l=" + lang;
+    }
     configHttpClient = new HttpClient();
     if (
       !configHttpClient->connect(configHost, configPort, proto == "https", PACKAGE_NAME "/" PACKAGE_VERSION)
@@ -306,7 +312,7 @@ int main(int argc, char* argv[], char* envp[]) {
 
   s_messageMap = new MessageMap(s_opt.checkConfig, lang);
   s_scanHelper = new ScanHelper(s_messageMap, configPath, configLocalPrefix, configUriPrefix,
-    lang.empty() ? lang : "?l=" + lang, configHttpClient, s_opt.checkConfig);
+    configLangQuery, configHttpClient, s_opt.checkConfig);
   s_messageMap->setResolver(s_scanHelper);
   if (s_opt.checkConfig) {
     logNotice(lf_main, PACKAGE_STRING "." REVISION " performing configuration check...");

src/ebusd/main.h

@@ -32,8 +32,11 @@ namespace ebusd {
  * The main entry method doing all the startup handling.
  */
 
-/** the config path part behind the scheme (scheme without "://"). */
+/** the default host of the configuration files. */
-#define CONFIG_PATH_SUFFIX "://cfg.ebusd.eu/"
+#define CONFIG_HOST "ebus.github.io"
+
+/** the default location of the configuration files (without language suffix). */
+#define CONFIG_PATH "https://" CONFIG_HOST "/"
 
 /** A structure holding all program options. */
 typedef struct options {

src/ebusd/main_args.cpp

@@ -29,13 +29,6 @@
 
 namespace ebusd {
 
-/** the default path of the configuration files. */
-#ifdef HAVE_SSL
-#define CONFIG_PATH "https" CONFIG_PATH_SUFFIX
-#else  // HAVE_SSL
-#define CONFIG_PATH "http" CONFIG_PATH_SUFFIX
-#endif  // HAVE_SSL
-
 /** the default program options. */
 static const options_t s_default_opt = {
   .device = "/dev/ttyUSB0",