From 90336bbbe5652e51e5803e5dc58d4391c79bc5b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Fernandes?= Date: Sun, 7 Sep 2025 00:38:58 +0000 Subject: [PATCH] . --- docker/ssh-server/app/globals.py | 7 +++++-- docker/ssh-server/app/init.py | 2 -- docker/ssh-server/app/sshserver.py | 1 - docker/ssh-server/app/users.py | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docker/ssh-server/app/globals.py b/docker/ssh-server/app/globals.py index c247b06..337dbe6 100644 --- a/docker/ssh-server/app/globals.py +++ b/docker/ssh-server/app/globals.py @@ -7,14 +7,15 @@ file_path="/etc/app/config.yaml" config=None def config_exits(): - global config - return config is not None + return get_config() is not None def sshserver_enabled(): return not is_debugging() or os.getenv("SSH_SERVER_ENABLED") == "true" def get_config(): global config + if config == None: + load_config() return config def load_config(): @@ -22,4 +23,6 @@ def load_config(): if os.path.exists(file_path): with open(file_path, 'r') as f: config = yaml.safe_load(f) + else: + print(f"⚠️ missing " + file_path) diff --git a/docker/ssh-server/app/init.py b/docker/ssh-server/app/init.py index f5af968..1c6b032 100644 --- a/docker/ssh-server/app/init.py +++ b/docker/ssh-server/app/init.py @@ -14,8 +14,6 @@ def main(): else: print("👉 starting setup") - - globals.load_config() setup_container() if globals.is_debugging(): diff --git a/docker/ssh-server/app/sshserver.py b/docker/ssh-server/app/sshserver.py index 46f3bef..045c0fd 100644 --- a/docker/ssh-server/app/sshserver.py +++ b/docker/ssh-server/app/sshserver.py @@ -116,5 +116,4 @@ def start_server(): subprocess.run(["/usr/sbin/sshd", "-D", "-e"]) if __name__ == "__main__": - globals.load_config() load() \ No newline at end of file diff --git a/docker/ssh-server/app/users.py b/docker/ssh-server/app/users.py index 00e5ea2..8650f95 100644 --- a/docker/ssh-server/app/users.py +++ b/docker/ssh-server/app/users.py @@ -86,5 +86,4 @@ def load(): if __name__ == "__main__": - globals.load_config() load()