FIx ENV Variables

This commit is contained in:
Luca Lutz 2022-11-03 21:21:23 +01:00
parent 0dc851977f
commit 3fe6318bb7
4 changed files with 17 additions and 8 deletions

View File

@ -14,6 +14,7 @@ DB_USERNAME=postgres
DB_PASSWORD=postgres DB_PASSWORD=postgres
DB_DATABASE=fab_access DB_DATABASE=fab_access
MQTT_PORT=1883
MQTT_USERNAME=user MQTT_USERNAME=user
MQTT_PASSWORD=password MQTT_PASSWORD=password
MQTT_BROKER=mqtt MQTT_BROKER=mqtt

View File

@ -1,11 +1,18 @@
import os import os
class Config: class Config:
broker = 'mosquitto' mqtt_broker = os.getenv('MQTT_BROKER')
port = 1883 mqtt_port = os.getenv('MQTT_PORT')
client_id = f'FabMan' mqtt_client_id = os.getenv('MQTT_CLIENT')
mqtt_user_name = os.getenv('MQTT_USERNAME')
mqtt_password = os.getenv('MQTT_PASSWORD')
keycloak_url = 'http://keycloak:8080/auth/' keycloak_url = os.getenv('KEYCLOAK_URL')
keycloak_username = os.getenv('KEYCLOAK_USER_NAME') keycloak_user_name = os.getenv('KEYCLOAK_USER_NAME')
keycloak_password = os.getenv('KEYCLOAK_USER_PW') keycloak_password = os.getenv('KEYCLOAK_USER_PW')
keycloak_realm = os.getenv('KEYCLOAK_REALM') keycloak_realm = os.getenv('KEYCLOAK_REALM')
db_host_name = os.getenv('DB_HOSTNAME')
db_user_name = os.getenv('DB_USERNAME')
db_password = os.getenv('DB_PASSWORD')
db_database = os.getenv('DB_DATABASE')

View File

@ -9,7 +9,7 @@ class KeycloakHandler:
def login(): def login():
KeycloakHandler.admin = KeycloakAdmin( KeycloakHandler.admin = KeycloakAdmin(
server_url=Config.keycloak_url, server_url=Config.keycloak_url,
username=Config.keycloak_username, username=Config.keycloak_user_name,
password=Config.keycloak_password, password=Config.keycloak_password,
realm_name=Config.keycloak_realm, realm_name=Config.keycloak_realm,
verify=True verify=True

View File

@ -16,10 +16,11 @@ class MqttHandler:
else: else:
print('Failed to connect, return code %d\n', rc) print('Failed to connect, return code %d\n', rc)
MqttHandler.client = mqtt_client.Client(Config.client_id) MqttHandler.client = mqtt_client.Client(Config.mqtt_client_id)
MqttHandler.client.username_pw_set('admin', 'user') MqttHandler.client.username_pw_set('admin', 'user')
MqttHandler.client.on_connect = on_connect MqttHandler.client.on_connect = on_connect
MqttHandler.client.connect(Config.broker, Config.port) MqttHandler.client.username_pw_set(Config.mqtt_user_name, Config.mqtt_password)
MqttHandler.client.connect(Config.mqtt_broker, Config.mqtt_port)
@staticmethod @staticmethod
def publish(topic, msg): def publish(topic, msg):