Makussu/bunkerweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui - fix ROOT_FOLDER bug in serve-files.conf

Browse Source
This commit is contained in:
bunkerity 2021-10-21 11:30:49 +02:00
parent 9f7097de0d
commit ab00381746
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -4,8 +4,11 @@
- Use API instead of a shared folder for Swarm and Kubernetes integrations - Use API instead of a shared folder for Swarm and Kubernetes integrations
- Beta integration of distributed bad IPs database through a remote API - 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 - Various bug fixes related to antibot feature
- Init support of Arch Linux
- Fix Moodle example - Fix Moodle example
- Fix ROOT_FOLDER bug in serve-files.conf when using the UI
## v1.3.1 - 2021/09/02 ## v1.3.1 - 2021/09/02

2
examples/web-ui/docker-compose.yml
View File

@ -28,7 +28,7 @@ services:
- admin.example.com_SERVE_FILES=no - admin.example.com_SERVE_FILES=no
- admin.example.com_USE_REVERSE_PROXY=yes - 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_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_REVERSE_PROXY_HEADERS=X-Script-Name /admin # must match REVERSE_PROXY_URL
- admin.example.com_USE_MODSECURITY=no - admin.example.com_USE_MODSECURITY=no
labels: labels:

1
gen/Templator.py
View File

@ -45,6 +45,7 @@ class Templator :
real_config["NGINX_PREFIX"] = self.__target_path real_config["NGINX_PREFIX"] = self.__target_path
if self.__config_global["MULTISITE"] == "yes" and type == "site" : if self.__config_global["MULTISITE"] == "yes" and type == "site" :
real_config["NGINX_PREFIX"] += first_server + "/" real_config["NGINX_PREFIX"] += first_server + "/"
if not real_config["ROOT_FOLDER"].endswith("/" + first_server) :
real_config["ROOT_FOLDER"] += "/" + first_server real_config["ROOT_FOLDER"] += "/" + first_server
if real_config["ROOT_SITE_SUBFOLDER"] != "" : if real_config["ROOT_SITE_SUBFOLDER"] != "" :
real_config["ROOT_FOLDER"] += "/" + real_config["ROOT_SITE_SUBFOLDER"] real_config["ROOT_FOLDER"] += "/" + real_config["ROOT_SITE_SUBFOLDER"]