diff --git a/bin/launch_webadmin b/bin/launch_webadmin index d3d53d0..627a7da 100755 --- a/bin/launch_webadmin +++ b/bin/launch_webadmin @@ -1,28 +1,11 @@ #!/usr/bin/env python3 -import argparse +from imaginaerraum_door_admin import create_app -from imaginaerraum_door_admin.webapp import create_application -parser = argparse.ArgumentParser() -parser.add_argument("--key_file", default='/root/flask_keys', help="Path to file with Flask SECRET_KEY and SECURITY_PASSWORD_SALT") -parser.add_argument("--token_file", default="/etc/door_tokens", help="path to the file with door tokens and users") -parser.add_argument("--nfc_socket", default="/tmp/nfc.sock", help="socket for handling NFC reader commands") -parser.add_argument("--template_folder", default="templates", help="path to Flask templates folder") -parser.add_argument("--static_folder", default="static", help="path to Flask static folder") -parser.add_argument("--admin_file", default="/etc/admins.conf", help="Path to file for creating super admin users") -parser.add_argument("--log_file", default="/var/log/webinterface.log", help="Path to flask log file") -parser.add_argument("--nfc_log", default="/var/log/nfc.log", help="Path to nfc log file") -parser.add_argument("--ldap_url", default="ldaps://ldap.imaginaerraum.de", - help="URL for LDAP server for alternative user authorization") -parser.add_argument("--mqtt_host", default="10.10.21.2", help="IP address of MQTT broker") -parser.add_argument("--flask_port", default=80, help="Port for running the Flask server") -parser.add_argument("--mail_server", default="smtp.googlemail.com", help="email server for sending security messages") -parser.add_argument("--mail_port", default=465, help="port for security email server") -parser.add_argument("--mail_use_tls", default=False, help="use TLS for security emails") -parser.add_argument("--mail_use_ssl", default=True, help="use SSL for security emails") -parser.add_argument("--mail_username", default="admin@example.com", help="email account for sending security messages") -parser.add_argument("--mail_password", default="password", help="Password for email account") -config = parser.parse_args() +def main(): + app = create_app() + app.run(host='0.0.0.0', port=app.config.get('PORT', 80)) -app = create_application(config) -app.run(host='0.0.0.0', port=config.flask_port) + +if __name__ == "__main__": + main() diff --git a/imaginaerraum_door_admin/default_app_config.py b/imaginaerraum_door_admin/default_app_config.py index 7a13ee2..51283cc 100644 --- a/imaginaerraum_door_admin/default_app_config.py +++ b/imaginaerraum_door_admin/default_app_config.py @@ -10,6 +10,7 @@ def uia_username_mapper(identity): class DefaultConfig(object): DEBUG = False + PORT = 80 SECRET_KEY = 'supersecret' SECURITY_PASSWORD_SALT = 'salty'