config: Make 'templatepath' optional, use embedded resources by default

Cette révision appartient à :
2025-12-22 10:09:41 +01:00
Parent 0eafdcc8c1
révision 0e21d96bd4
2 fichiers modifiés avec 10 ajouts et 3 suppressions

Voir le fichier

@@ -75,10 +75,10 @@ Config::Config(const std::map<std::string, std::string> &map)
this->handlersConfig.anon_username = optional("anon_username", "anonymouse");
this->handlersConfig.wikiname = required("wikiname");
this->logfile = required("logfile");
this->templatepath = required("templatepath");
this->templatepath = optional("templatepath", "");
this->urls.linkallcats = required("linkallcats");
this->urls.linkallpages = required("linkallpages");
this->urls.linkallpagesrendertype = required ("linkallpagesrendertype");
this->urls.linkallpagesrendertype = required("linkallpagesrendertype");
this->urls.linkcategory = required("linkcategory");
this->urls.linkcategoryrendertype = required("linkcategoryrendertype");
this->urls.linkdelete = required("linkdelete");

Voir le fichier

@@ -43,6 +43,7 @@ SOFTWARE.
#include "cliconsole.h"
#include "cliserver.h"
#include "version.h"
#include "embedded.h"
void sigterm_handler([[maybe_unused]] int arg)
{
@@ -189,6 +190,8 @@ int main(int argc, char **argv)
exit(EXIT_FAILURE);
}
utils::embedded_init_text_resources();
start_background_worker(*database.get(), config);
CLIServer cliServer{cliHandler};
@@ -214,8 +217,12 @@ int main(int argc, char **argv)
User::setAnon(anon.value());
MapCache<TemplatePage> mapCache;
Template siteTemplate{config.templateprefix, config.templatepath, config.urls, config.configVarResolver,
Template siteTemplate{config.templateprefix, config.urls, config.configVarResolver,
mapCache};
if(!config.templatepath.empty())
{
siteTemplate.setPath(config.templatepath);
}
UrlProvider urlProvider{config.urls};
auto cache = createCache(config.configVarResolver);