From d264bba053041486bb1e19b4b5f39223253da7ce Mon Sep 17 00:00:00 2001 From: Roland Reichwein Date: Fri, 15 May 2020 11:38:46 +0200 Subject: Fix missing serve_site list config (was not parsed) --- config.cpp | 7 +++++++ webserver.conf | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/config.cpp b/config.cpp index bc09af9..2ece1ef 100644 --- a/config.cpp +++ b/config.cpp @@ -138,6 +138,13 @@ void Config::readConfigfile(std::string filename) socket_struct.protocol = SocketProtocol::HTTPS; else throw std::runtime_error("Unknown protocol: "s + x.second.data()); + } else if (x.first == "site"s) { + std::string site {x.second.data()}; + if (std::find(socket_struct.serve_sites.begin(), socket_struct.serve_sites.end(), site) == socket_struct.serve_sites.end()) { + socket_struct.serve_sites.push_back(site); + } else { + throw std::runtime_error("Site "s + site + " already defined for "s + socket_struct.address + " port " + socket_struct.port); + } } else throw std::runtime_error("Unknown element: "s + x.first); } diff --git a/webserver.conf b/webserver.conf index 4901578..7aba1a7 100644 --- a/webserver.conf +++ b/webserver.conf @@ -116,10 +116,10 @@
127.0.0.1
8080 http - + marx +
::1
-- cgit v1.2.3