diff --git a/ui/Config.py b/ui/Config.py index dcdb0ab..e24d417 100644 --- a/ui/Config.py +++ b/ui/Config.py @@ -5,7 +5,7 @@ class Config : def __init__(self) : with open("/opt/settings.json", "r") as f : self.__settings = json.loads(f.read()) - + def __env_to_dict(self, filename) : with open(filename, "r") as f : env = f.read() @@ -36,6 +36,13 @@ class Config : if stderr != "" or proc.returncode != 0 : raise Exception("Error from generator (return code = " + str(proc.returncode) + ") : " + stderr) + def get_config(self) : + config = self.__env_to_dict("/etc/nginx/global.env") + for service in self.get_services() : + for k, v in service.items() : + config[service["FIRST_SERVER"] + "_" + k] = v + return config + def get_settings(self) : return self.__settings @@ -60,7 +67,7 @@ class Config : check = True if not check : raise Exception("Variable " + k + " is not valid.") - + def new_service(self, variables) : global_env = self.__env_to_dict("/etc/nginx/global.env") services = self.get_services() @@ -88,4 +95,4 @@ class Config : if not found : raise Exception("Can't delete missing " + server_name + " configuration.") self.__gen_conf(global_env, new_services) - \ No newline at end of file + diff --git a/ui/Dockerfile b/ui/Dockerfile index c473f26..9b8caf7 100644 --- a/ui/Dockerfile +++ b/ui/Dockerfile @@ -16,8 +16,8 @@ COPY settings.json /opt COPY ui/prepare.sh /tmp RUN chmod +x /tmp/prepare.sh && \ - /tmp/prepare.sh && \ - rm -f /tmp/prepare.sh + /tmp/prepare.sh && \ + rm -f /tmp/prepare.sh EXPOSE 5000 diff --git a/ui/Dockerfile-amd64 b/ui/Dockerfile-amd64 index 22b1060..d266435 100644 --- a/ui/Dockerfile-amd64 +++ b/ui/Dockerfile-amd64 @@ -15,9 +15,9 @@ COPY ui/ /opt/entrypoint COPY settings.json /opt COPY ui/prepare.sh /tmp -RUN chmod +x /tmp/prepare && \ - /tmp/prepare.sh && \ - rm -f /tmp/prepare.sh +RUN chmod +x /tmp/prepare.sh && \ + /tmp/prepare.sh && \ + rm -f /tmp/prepare.sh EXPOSE 5000 diff --git a/ui/Dockerfile-arm32v7 b/ui/Dockerfile-arm32v7 index 1b7119b..c172e95 100644 --- a/ui/Dockerfile-arm32v7 +++ b/ui/Dockerfile-arm32v7 @@ -21,9 +21,9 @@ COPY ui/ /opt/entrypoint COPY settings.json /opt COPY ui/prepare.sh /tmp -RUN chmod +x /tmp/prepare && \ - /tmp/prepare.sh && \ - rm -f /tmp/prepare.sh +RUN chmod +x /tmp/prepare.sh && \ + /tmp/prepare.sh && \ + rm -f /tmp/prepare.sh EXPOSE 5000 diff --git a/ui/Dockerfile-arm64v8 b/ui/Dockerfile-arm64v8 index 24cf1b8..755d965 100644 --- a/ui/Dockerfile-arm64v8 +++ b/ui/Dockerfile-arm64v8 @@ -21,9 +21,9 @@ COPY ui/ /opt/entrypoint COPY settings.json /opt COPY ui/prepare.sh /tmp -RUN chmod +x /tmp/prepare && \ - /tmp/prepare.sh && \ - rm -f /tmp/prepare.sh +RUN chmod +x /tmp/prepare.sh && \ + /tmp/prepare.sh && \ + rm -f /tmp/prepare.sh EXPOSE 5000 diff --git a/ui/Dockerfile-i386 b/ui/Dockerfile-i386 index b8768be..a61c1c2 100644 --- a/ui/Dockerfile-i386 +++ b/ui/Dockerfile-i386 @@ -15,9 +15,9 @@ COPY ui/ /opt/entrypoint COPY settings.json /opt COPY ui/prepare.sh /tmp -RUN chmod +x /tmp/prepare && \ - /tmp/prepare.sh && \ - rm -f /tmp/prepare.sh +RUN chmod +x /tmp/prepare.sh && \ + /tmp/prepare.sh && \ + rm -f /tmp/prepare.sh EXPOSE 5000