diff --git a/CHANGELOG.md b/CHANGELOG.md index 601a61d..3bd8d22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,11 @@ - Use API instead of a shared folder for Swarm and Kubernetes integrations - Beta integration of distributed bad IPs database through a remote API +- Improvement of the request limiting feature : hour/day rate and multiple URL support - Various bug fixes related to antibot feature +- Init support of Arch Linux - Fix Moodle example +- Fix ROOT_FOLDER bug in serve-files.conf when using the UI ## v1.3.1 - 2021/09/02 diff --git a/examples/web-ui/docker-compose.yml b/examples/web-ui/docker-compose.yml index 7fd3be1..ff2e48d 100644 --- a/examples/web-ui/docker-compose.yml +++ b/examples/web-ui/docker-compose.yml @@ -28,7 +28,7 @@ services: - admin.example.com_SERVE_FILES=no - admin.example.com_USE_REVERSE_PROXY=yes - admin.example.com_REVERSE_PROXY_URL=/admin/ # change it to something hard to guess - - admin.example.com_REVERSE_PROXY_HOST=http://myui:5000/ + - admin.example.com_REVERSE_PROXY_HOST=http://myui:5000 - admin.example.com_REVERSE_PROXY_HEADERS=X-Script-Name /admin # must match REVERSE_PROXY_URL - admin.example.com_USE_MODSECURITY=no labels: diff --git a/gen/Templator.py b/gen/Templator.py index 6005a08..0923701 100644 --- a/gen/Templator.py +++ b/gen/Templator.py @@ -45,7 +45,8 @@ class Templator : real_config["NGINX_PREFIX"] = self.__target_path if self.__config_global["MULTISITE"] == "yes" and type == "site" : real_config["NGINX_PREFIX"] += first_server + "/" - real_config["ROOT_FOLDER"] += "/" + first_server + if not real_config["ROOT_FOLDER"].endswith("/" + first_server) : + real_config["ROOT_FOLDER"] += "/" + first_server if real_config["ROOT_SITE_SUBFOLDER"] != "" : real_config["ROOT_FOLDER"] += "/" + real_config["ROOT_SITE_SUBFOLDER"] return real_config