From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 1 Jul 2015 18:47:41 +0000 (+0200)
Subject: Merge pull request #125 from schaal/sslcert
X-Git-Tag: travis-deploy-test~565
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=56d25331d61b4b24a2805f1cf16e68f722fdaf73;hp=-c

Merge pull request #125 from schaal/sslcert

Add core options to specify path to ssl certs.
---

56d25331d61b4b24a2805f1cf16e68f722fdaf73
diff --combined src/common/main.cpp
index 2bbe0cfa,6cbe4383..a9dafccd
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@@ -103,6 -103,13 +103,6 @@@ int main(int argc, char **argv
  # endif
  #endif
  
 -    // Migrate settings from KDE4 to KF5 if appropriate
 -#ifdef HAVE_KF5
 -    Kdelibs4ConfigMigrator migrator(QCoreApplication::applicationName());
 -    migrator.setConfigFiles(QStringList() << "quasselrc" << "quassel.notifyrc");
 -    migrator.migrate();
 -#endif
 -
      AbstractCliParser *cliParser;
  
  #ifdef HAVE_KDE4
@@@ -163,6 -170,8 +163,8 @@@
      cliParser->addOption("oidentd-conffile", 0, "Set path to oidentd configuration file", "file");
  #ifdef HAVE_SSL
      cliParser->addSwitch("require-ssl", 0, "Require SSL for remote (non-loopback) client connections");
+     cliParser->addOption("ssl-cert", 0, "Specify the path to the SSL Certificate", "path", "configdir/quasselCert.pem");
+     cliParser->addOption("ssl-key", 0, "Specify the path to the SSL key", "path", "ssl-cert-path");
  #endif
      cliParser->addSwitch("enable-experimental-dcc", 0, "Enable highly experimental and unfinished support for CTCP DCC (DANGEROUS)");
  #endif
@@@ -191,13 -200,6 +193,13 @@@
      }
  #endif
  
 +// Migrate settings from KDE4 to KF5 if appropriate
 +#ifdef HAVE_KF5
 +    Kdelibs4ConfigMigrator migrator(QCoreApplication::applicationName());
 +    migrator.setConfigFiles(QStringList() << "quasselrc" << "quassel.notifyrc");
 +    migrator.migrate();
 +#endif
 +
  #ifdef HAVE_KF5
      // FIXME: This should be done after loading the translation catalogue, but still in main()
      AboutData aboutData;