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

pull v1.2.8 fixes when applicable

Browse Source
This commit is contained in:
bunkerity
2021-07-22 14:47:37 +02:00
parent 8bb6676f58
commit a1b9010d9e
4 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/Config.py
View File

@@ -58,7 +58,9 @@ class Config :
for filename in glob.iglob("/etc/nginx/**/site.env") :
env = self.__env_to_dict(filename)
services.append(env)
services.append(self.__env_to_dict("/etc/nginx/site.env"))
no_multisite = self.__env_to_dict("/etc/nginx/site.env")
if len(no_multisite) > 0 :
services.append(no_multisite)
return services
def check_variables(self, variables) :

4
ui/templates/services-new.html
View File

@@ -26,7 +26,7 @@
{% if param["type"] != "multiple" and param["context"] == "multisite" %}
<div class="row mb-3" id="form-new-{{ param["id"] }}">
{% set default = {"value": param["default"]} %}
{% if param["env"] in config["CONFIG"].get_config() %}
{% if param["env"] in config["CONFIG"].get_config() and param["env"] != "SERVER_NAME" %}
{% set x = default.update({"value": config["CONFIG"].get_config()[param["env"]]}) %}
{% endif %}
{{ form_service_gen("form-new-" + param["id"], param["label"], param["type"], default["value"], param["env"])|safe }}
@@ -58,4 +58,4 @@
</div>
</div>
</div>
</div>
</div>