diff --git a/headscale.py b/headscale.py index 8d0b1cb..c8fdc94 100644 --- a/headscale.py +++ b/headscale.py @@ -1,5 +1,4 @@ import requests, json, os -from os.path import exists from cryptography.fernet import Fernet from datetime import timedelta, date from dateutil import parser @@ -21,7 +20,7 @@ def set_api_key(api_key): return True if key_file.write(encrypted_key) else False # Return true if the file wrote correctly def get_api_key(): - if not exists("/data/key.txt"): return False + if not os.path.exists("/data/key.txt"): return False encryption_key = os.environ['KEY'] # User-set encryption key key_file = open("/data/key.txt", "rb+") # Key file on the filesystem for persistent storage enc_api_key = key_file.read() # The encrypted key read from the file diff --git a/server.py b/server.py index 3284ab7..3a315f8 100644 --- a/server.py +++ b/server.py @@ -26,13 +26,14 @@ AUTH_TYPE = os.environ["AUTH_TYPE"].replace('"', '') # REDIRECT_URI = os.environ.get("FLASK_OIDC_REDIRECT_URI", "/auth") # OVERWRITE_REDIRECT_URI = os.environ.get("FLASK_OIDC_OVERWRITE_REDIRECT_URI", "/") # CONFIG_URL = os.environ.get("FLASK_OIDC_CONFIG_URL", "") - -print("FLASK_OIDC_PROVIDER_NAME: "+os.environ["FLASK_OIDC_PROVIDER_NAME"]) -print("FLASK_OIDC_CLIENT_ID: "+os.environ["FLASK_OIDC_CLIENT_ID"]) -print("FLASK_OIDC_CLIENT_SECRET: "+os.environ["FLASK_OIDC_CLIENT_SECRET"]) -print("FLASK_OIDC_CONFIG_URL: "+os.environ["FLASK_OIDC_CONFIG_URL"]) +print("===================================== Environment: ") +print("FLASK_OIDC_PROVIDER_NAME: "+os.environ["FLASK_OIDC_PROVIDER_NAME"]) +print("FLASK_OIDC_CLIENT_ID: "+os.environ["FLASK_OIDC_CLIENT_ID"]) +print("FLASK_OIDC_CLIENT_SECRET: "+os.environ["FLASK_OIDC_CLIENT_SECRET"]) +print("FLASK_OIDC_CONFIG_URL: "+os.environ["FLASK_OIDC_CONFIG_URL"]) print("FLASK_OIDC_OVERWRITE_REDIRECT_URI: "+os.environ["FLASK_OIDC_OVERWRITE_REDIRECT_URI"]) -print("FLASK_OIDC_REDIRECT_URI: "+os.environ["FLASK_OIDC_REDIRECT_URI"]) +print("FLASK_OIDC_REDIRECT_URI: "+os.environ["FLASK_OIDC_REDIRECT_URI"]) +print("BASE_PATH: "+os.environ["BASE_PATH"]) static_url_path = '/static' if BASE_PATH != '': static_url_path = BASE_PATH + static_url_path