Added an option to set wt's resources directory

This commit is contained in:
emeric
2018-04-20 20:11:09 +02:00
parent cdf7863cde
commit 7b5f443b44
4 changed files with 3 additions and 6 deletions
-5
View File
@@ -42,8 +42,3 @@ lms_approot_DATA = \
sysconf_DATA = \ sysconf_DATA = \
$(top_srcdir)/conf/lms.conf $(top_srcdir)/conf/lms.conf
install-data-hook:
ln -s $(datadir)/Wt/resources $(lms_docrootdir)/resources || echo "Skipped symlink creation"
uninstall-local:
cd $(lms_docrootdir) && rm -f -r $(lms_docrootdir)/resources
+1 -1
View File
@@ -55,7 +55,7 @@ lms [config_file]
``` ```
Logs are output in the working directory, in the file 'lms.log' Logs are output in the working directory, in the file 'lms.log'
To connect to LMS, just open your favorite browser and go to http://localhost:5081 To connect to LMS, just open your favorite browser and go to http://localhost:5082
## Credits ## Credits
+1
View File
@@ -16,6 +16,7 @@ tls-key = "/var/lms/privkey.pem";
tls-dh = "/var/lms/dh2048.pem"; tls-dh = "/var/lms/dh2048.pem";
# Path to the resources used by the web interface # Path to the resources used by the web interface
wt-resources="/usr/share/Wt/resources";
docroot = "/usr/share/lms/docroot/;/resources,/css,/images,/js,/favicon.ico"; docroot = "/usr/share/lms/docroot/;/resources,/css,/images,/js,/favicon.ico";
approot = "/usr/share/lms/approot"; approot = "/usr/share/lms/approot";
+1
View File
@@ -44,6 +44,7 @@ std::vector<std::string> generateWtConfig(std::string execPath)
args.push_back("--config=" + wtConfigPath.string()); args.push_back("--config=" + wtConfigPath.string());
args.push_back("--docroot=" + Config::instance().getString("docroot")); args.push_back("--docroot=" + Config::instance().getString("docroot"));
args.push_back("--approot=" + Config::instance().getString("approot")); args.push_back("--approot=" + Config::instance().getString("approot"));
args.push_back("--resources-dir=" + Config::instance().getString("wt-resources"));
if (Config::instance().getBool("tls-enable", false)) if (Config::instance().getBool("tls-enable", false))
{ {