TeaSpeak/Teaspeak-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed some small certificate issues

Browse Source
This commit is contained in:
WolverinDEV 2019-11-22 21:31:59 +01:00
parent 755183a144
commit 5efe5037c5
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/InstanceHandler.cpp
View File

@ -716,8 +716,7 @@ bool InstanceHandler::reloadConfig(std::vector<std::string>& errors, bool reload
string error; string error;
#ifdef COMPILE_WEB_CLIENT #ifdef COMPILE_WEB_CLIENT
if(config::web::activated) { if(config::web::activated) {
this->sslMgr->unregister_web_contexts(); this->sslMgr->unregister_web_contexts(false);
//TODO: Generate default certificate (con-gate.work)
string error; string error;
for (auto &certificate : config::web::ssl::certificates) { for (auto &certificate : config::web::ssl::certificates) {
@ -862,5 +861,6 @@ void InstanceHandler::loadWebCertificate() {
return; return;
} }
this->sslMgr->rename_context(strobf("web_default_new").string(), strobf("web_default").string());
this->web_cert_revision = revision; this->web_cert_revision = revision;
} }

3
server/src/lincense/LicenseHelper.cpp
View File

@ -3,7 +3,6 @@
#include <misc/hex.h> #include <misc/hex.h>
#include <src/Configuration.h> #include <src/Configuration.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <src/SignalHandler.h>
#include <src/ShutdownHelper.h> #include <src/ShutdownHelper.h>
#include "src/InstanceHandler.h" #include "src/InstanceHandler.h"
#include "LicenseHelper.h" #include "LicenseHelper.h"
@ -14,8 +13,6 @@ using namespace std::chrono;
using namespace ts; using namespace ts;
using namespace ts::server; using namespace ts::server;
#define DO_LOCAL_REQUEST
LicenseHelper::LicenseHelper() { LicenseHelper::LicenseHelper() {
this->scheduled_request = system_clock::now() + seconds(rand() % 30); //Check in one minute this->scheduled_request = system_clock::now() + seconds(rand() % 30); //Check in one minute
} }