config: Make 'templatepath' optional, use embedded resources by default
This commit is contained in:
@@ -75,10 +75,10 @@ Config::Config(const std::map<std::string, std::string> &map)
|
|||||||
this->handlersConfig.anon_username = optional("anon_username", "anonymouse");
|
this->handlersConfig.anon_username = optional("anon_username", "anonymouse");
|
||||||
this->handlersConfig.wikiname = required("wikiname");
|
this->handlersConfig.wikiname = required("wikiname");
|
||||||
this->logfile = required("logfile");
|
this->logfile = required("logfile");
|
||||||
this->templatepath = required("templatepath");
|
this->templatepath = optional("templatepath", "");
|
||||||
this->urls.linkallcats = required("linkallcats");
|
this->urls.linkallcats = required("linkallcats");
|
||||||
this->urls.linkallpages = required("linkallpages");
|
this->urls.linkallpages = required("linkallpages");
|
||||||
this->urls.linkallpagesrendertype = required ("linkallpagesrendertype");
|
this->urls.linkallpagesrendertype = required("linkallpagesrendertype");
|
||||||
this->urls.linkcategory = required("linkcategory");
|
this->urls.linkcategory = required("linkcategory");
|
||||||
this->urls.linkcategoryrendertype = required("linkcategoryrendertype");
|
this->urls.linkcategoryrendertype = required("linkcategoryrendertype");
|
||||||
this->urls.linkdelete = required("linkdelete");
|
this->urls.linkdelete = required("linkdelete");
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ SOFTWARE.
|
|||||||
#include "cliconsole.h"
|
#include "cliconsole.h"
|
||||||
#include "cliserver.h"
|
#include "cliserver.h"
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
|
#include "embedded.h"
|
||||||
|
|
||||||
void sigterm_handler([[maybe_unused]] int arg)
|
void sigterm_handler([[maybe_unused]] int arg)
|
||||||
{
|
{
|
||||||
@@ -189,6 +190,8 @@ int main(int argc, char **argv)
|
|||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
utils::embedded_init_text_resources();
|
||||||
|
|
||||||
start_background_worker(*database.get(), config);
|
start_background_worker(*database.get(), config);
|
||||||
|
|
||||||
CLIServer cliServer{cliHandler};
|
CLIServer cliServer{cliHandler};
|
||||||
@@ -214,8 +217,12 @@ int main(int argc, char **argv)
|
|||||||
User::setAnon(anon.value());
|
User::setAnon(anon.value());
|
||||||
|
|
||||||
MapCache<TemplatePage> mapCache;
|
MapCache<TemplatePage> mapCache;
|
||||||
Template siteTemplate{config.templateprefix, config.templatepath, config.urls, config.configVarResolver,
|
Template siteTemplate{config.templateprefix, config.urls, config.configVarResolver,
|
||||||
mapCache};
|
mapCache};
|
||||||
|
if(!config.templatepath.empty())
|
||||||
|
{
|
||||||
|
siteTemplate.setPath(config.templatepath);
|
||||||
|
}
|
||||||
UrlProvider urlProvider{config.urls};
|
UrlProvider urlProvider{config.urls};
|
||||||
|
|
||||||
auto cache = createCache(config.configVarResolver);
|
auto cache = createCache(config.configVarResolver);
|
||||||
|
|||||||
Reference in New Issue
Block a user