diff --git a/.gitignore b/.gitignore index 1b7ef99..7b5fe5d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ users/ backup/ Archiv/ Docker/ +docker-work/ \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 1bb6566..9695725 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,6 @@ services: - 8090:8090 volumes: #- /home/alexander/Dokumente/Python/Zeiterfassung:/app - - /home/alexander/Dokumente/Python/Zeiterfassung/users-docker:/users - - /home/alexander/Dokumente/Python/Zeiterfassung/backup:/backup - - /home/alexander/Dokumente/Python/Zeiterfassung/settings:/settings \ No newline at end of file + - /home/alexander/Dokumente/Python/Zeiterfassung/docker-work/users:/users + - /home/alexander/Dokumente/Python/Zeiterfassung/docker-work/backup:/backup + - /home/alexander/Dokumente/Python/Zeiterfassung/docker-work/settings:/settings \ No newline at end of file diff --git a/lib/definitions.py b/lib/definitions.py index 318d9c0..130b709 100644 --- a/lib/definitions.py +++ b/lib/definitions.py @@ -3,7 +3,6 @@ import os from pathlib import Path -from lib.web_ui import is_docker import hashlib app_title = "Zeiterfassung" @@ -11,6 +10,10 @@ app_version = "0.0.0" # Standardpfade +def is_docker(): + cgroup = Path('/proc/self/cgroup') + return Path('/.dockerenv').is_file() or (cgroup.is_file() and 'docker' in cgroup.read_text()) + if is_docker(): scriptpath = "/settings" backupfolder = "/backup" diff --git a/lib/users.py b/lib/users.py index d6acfd0..16381cf 100644 --- a/lib/users.py +++ b/lib/users.py @@ -14,9 +14,7 @@ import shutil import re from lib.definitions import userfolder, scriptpath, usersettingsfilename, photofilename, status_in, status_out, \ - standard_adminsettings, standard_usersettings, va_file - -from web_ui import is_docker + standard_adminsettings, standard_usersettings, va_file, is_docker # Benutzerklasse diff --git a/lib/web_ui.py b/lib/web_ui.py index 1050cc4..f7f6ace 100644 --- a/lib/web_ui.py +++ b/lib/web_ui.py @@ -118,8 +118,4 @@ def login_is_valid(user = -1): else: return False except: - return False - -def is_docker(): - cgroup = Path('/proc/self/cgroup') - return Path('/.dockerenv').is_file() or (cgroup.is_file() and 'docker' in cgroup.read_text()) \ No newline at end of file + return False \ No newline at end of file diff --git a/main.py b/main.py index c37808d..89c263a 100644 --- a/main.py +++ b/main.py @@ -15,7 +15,7 @@ import argparse from lib.web_ui import hash_password -class Commandline_Header: +def commandline_header(): message_string = f"{app_title} {app_version}" underline = "" for i in range(len(message_string)): @@ -36,8 +36,7 @@ def main(): def startup_message(): - Commandline_Header() - + commandline_header() url_string = "" for i in list(app.urls): url_string += f"{i}, " @@ -65,7 +64,7 @@ if __name__ in ("__main__", "__mp_main__"): backupfolder = "/backup" if args.admin_access: - Commandline_Header() + commandline_header() print("Lade Administrationseinstellungen") admin_settings = load_adminsettings() print("Geben Sie den neuen Benutzernamen für den Administrationsbenutzer an:")