diff --git a/config.yaml.example b/config.yaml.example index 55f6a61..7f1a02d 100644 --- a/config.yaml.example +++ b/config.yaml.example @@ -1,3 +1,7 @@ server_name: "valhalla" server_port: 8088 -logging_level: "INFO" +server_loglevel: "INFO" +database_file: "database.db" +server_host: "localhost" +server_password: "sekret_password" +server_access_username: "user" \ No newline at end of file diff --git a/config.yml b/config.yml new file mode 100644 index 0000000..7f1a02d --- /dev/null +++ b/config.yml @@ -0,0 +1,7 @@ +server_name: "valhalla" +server_port: 8088 +server_loglevel: "INFO" +database_file: "database.db" +server_host: "localhost" +server_password: "sekret_password" +server_access_username: "user" \ No newline at end of file diff --git a/fleetcontrol b/fleetcontrol index 70a980a..05192c6 100644 --- a/fleetcontrol +++ b/fleetcontrol @@ -1,5 +1,12 @@ #!/usr/bin/python3 -import flask +from network.communication import Server +from utils.config.config import ServerConfig + +config = ServerConfig() +server = Server(host=config.server_host, port=config.server_port, name=config.server_name, access_password=config.server_password, + access_username=config.server_access_username, version="v0.0.1alpha", database_file_path=config.database_file, logging_level=config.server_loglevel) + +server.run() # vi: ft=python diff --git a/network/__init__.py b/network/__init__.py index e69de29..99927e9 100644 --- a/network/__init__.py +++ b/network/__init__.py @@ -0,0 +1 @@ +from . import communication diff --git a/network/__pycache__/__init__.cpython-310.pyc b/network/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..e2cac36 Binary files /dev/null and b/network/__pycache__/__init__.cpython-310.pyc differ diff --git a/network/__pycache__/communication.cpython-310.pyc b/network/__pycache__/communication.cpython-310.pyc new file mode 100644 index 0000000..8c65223 Binary files /dev/null and b/network/__pycache__/communication.cpython-310.pyc differ diff --git a/network/communication.py b/network/communication.py index 4fa9a24..f6ade2b 100644 --- a/network/communication.py +++ b/network/communication.py @@ -24,11 +24,12 @@ class FlaskAppWrapper(object): class Server(): - def __init__(self, host: str, port: int, name: str, access_password: str, version: str, database_file_path: str, logging_level: str): + def __init__(self, host: str, port: int, name: str, access_password: str, access_username: str, version: str, database_file_path: str, logging_level: str, ): self.host = host self.port = port self.name = name self.access_password = access_password + self.access_username = access_username self.version = version self.database = Database( database_file=database_file_path, logging_level=logging_level) diff --git a/utils/__init__.py b/utils/__init__.py index e69de29..b6e690f 100644 --- a/utils/__init__.py +++ b/utils/__init__.py @@ -0,0 +1 @@ +from . import * diff --git a/utils/__pycache__/__init__.cpython-310.pyc b/utils/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..0b11feb Binary files /dev/null and b/utils/__pycache__/__init__.cpython-310.pyc differ diff --git a/utils/config/__init__.py b/utils/config/__init__.py index 9bf35e2..d63bc18 100644 --- a/utils/config/__init__.py +++ b/utils/config/__init__.py @@ -1 +1 @@ -from utils.config import ServerConfig +from . import config diff --git a/utils/config/__pycache__/__init__.cpython-310.pyc b/utils/config/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..b1984a5 Binary files /dev/null and b/utils/config/__pycache__/__init__.cpython-310.pyc differ diff --git a/utils/config/__pycache__/config.cpython-310.pyc b/utils/config/__pycache__/config.cpython-310.pyc new file mode 100644 index 0000000..1d71752 Binary files /dev/null and b/utils/config/__pycache__/config.cpython-310.pyc differ diff --git a/utils/config/config.py b/utils/config/config.py index 0aff9b4..7a5d0e4 100644 --- a/utils/config/config.py +++ b/utils/config/config.py @@ -1,11 +1,12 @@ import os import yaml -class ServerConfig: + +class ServerConfig: def __init__(self): config_file = {} - with open("~/.config/orchestrator/config.yml", "r") as stream: + with open("config.yml", "r") as stream: try: config_file = yaml.safe_load(stream) except Exception as e: @@ -15,18 +16,38 @@ class ServerConfig: server_name_override = os.environ.get("VALHALLA_SERVER_NAME") server_port_override = os.environ.get("VALHALLA_SERVER_PORT") + server_host_override = os.environ.get("VALHALLA_SERVER_HOST") + server_password_override = os.environ.get("VALHALLA_SERVER_PASSWORD") + server_access_username_override = os.environ.get( + "VALHALLA_SERVER_ACCESS_USERNAME") database_file_override = os.environ.get("VALHALLA_DATABASE_FILE") + server_logging_override = os.environ.get("VALHALLA_LOGLEVEL") if server_name_override: config["server_name"] = server_name_override - + if server_port_override: config["server_port"] = server_port_override - + + if server_host_override: + config["server_host"] = server_host_override + if database_file_override: config["database_file"] = database_file_override + if server_password_override: + config["server_password"] = server_password_override + + if server_access_username_override: + config["server_access_username"] = server_access_username_override + + if server_logging_override: + config["server_loglevel"] = server_logging_override + self.server_name = config["server_name"] self.server_port = config["server_port"] self.database_file = config["database_file"] - \ No newline at end of file + self.server_host = config["server_host"] + self.server_password = config["server_password"] + self.server_access_username = config["server_access_username"] + self.server_loglevel = config["server_loglevel"] diff --git a/utils/database/__init__.py b/utils/database/__init__.py index e69de29..62a5b3c 100644 --- a/utils/database/__init__.py +++ b/utils/database/__init__.py @@ -0,0 +1 @@ +from . import database diff --git a/utils/database/__pycache__/__init__.cpython-310.pyc b/utils/database/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..7ad363e Binary files /dev/null and b/utils/database/__pycache__/__init__.cpython-310.pyc differ diff --git a/utils/database/__pycache__/database.cpython-310.pyc b/utils/database/__pycache__/database.cpython-310.pyc new file mode 100644 index 0000000..772f4a4 Binary files /dev/null and b/utils/database/__pycache__/database.cpython-310.pyc differ diff --git a/utils/exceptions/__init__.py b/utils/exceptions/__init__.py index 4857659..7a97fcd 100644 --- a/utils/exceptions/__init__.py +++ b/utils/exceptions/__init__.py @@ -1 +1 @@ -from DatabaseException import DatabaseException +from . import DatabaseException diff --git a/utils/exceptions/__pycache__/DatabaseException.cpython-310.pyc b/utils/exceptions/__pycache__/DatabaseException.cpython-310.pyc new file mode 100644 index 0000000..0e1edd7 Binary files /dev/null and b/utils/exceptions/__pycache__/DatabaseException.cpython-310.pyc differ diff --git a/utils/exceptions/__pycache__/__init__.cpython-310.pyc b/utils/exceptions/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..8314339 Binary files /dev/null and b/utils/exceptions/__pycache__/__init__.cpython-310.pyc differ diff --git a/utils/models/__init__.py b/utils/models/__init__.py index 9028d94..0650744 100644 --- a/utils/models/__init__.py +++ b/utils/models/__init__.py @@ -1 +1 @@ -from utils.models import Client, VMImage +from . import models diff --git a/utils/models/__pycache__/__init__.cpython-310.pyc b/utils/models/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..1044dea Binary files /dev/null and b/utils/models/__pycache__/__init__.cpython-310.pyc differ diff --git a/utils/models/__pycache__/models.cpython-310.pyc b/utils/models/__pycache__/models.cpython-310.pyc new file mode 100644 index 0000000..62ec91e Binary files /dev/null and b/utils/models/__pycache__/models.cpython-310.pyc differ