diff --git a/Makefile.am b/Makefile.am index 446387c4..5e13197f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,8 +42,3 @@ lms_approot_DATA = \ sysconf_DATA = \ $(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 diff --git a/README.md b/README.md index 510eb624..b8e9dfdd 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ lms [config_file] ``` 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 diff --git a/conf/lms.conf b/conf/lms.conf index 722d25c3..3d9b06f5 100644 --- a/conf/lms.conf +++ b/conf/lms.conf @@ -16,6 +16,7 @@ tls-key = "/var/lms/privkey.pem"; tls-dh = "/var/lms/dh2048.pem"; # 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"; approot = "/usr/share/lms/approot"; diff --git a/src/main/main.cpp b/src/main/main.cpp index 4f6aa932..9a3820f4 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -44,6 +44,7 @@ std::vector generateWtConfig(std::string execPath) args.push_back("--config=" + wtConfigPath.string()); args.push_back("--docroot=" + Config::instance().getString("docroot")); 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)) {