diff --git a/Jenkinsfile b/Jenkinsfile index b92e03e..16f81f1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ pipeline { label 'linux-x64' } environment { - APP_VERSION = 'v0.5.0' + APP_VERSION = 'v0.5.1' HS_VERSION = "v0.20.0" // Version of Headscale this is compatible with BUILD_DATE = '' } diff --git a/helper.py b/helper.py index d1c1129..55b5a38 100644 --- a/helper.py +++ b/helper.py @@ -151,20 +151,20 @@ def access_checks(): server_reachable = True else: checks_passed = False - app.logger.error("Headscale URL: Response 200: FAILED") + app.logger.critical("Headscale URL: Response 200: FAILED") # Check: /data is rwx for 1000:1000: if os.access('/data/', os.R_OK): data_readable = True else: - app.logger.error("/data READ: FAILED") + app.logger.critical("/data READ: FAILED") checks_passed = False if os.access('/data/', os.W_OK): data_writable = True else: - app.logger.error("/data WRITE: FAILED") + app.logger.critical("/data WRITE: FAILED") checks_passed = False if os.access('/data/', os.X_OK): data_executable = True else: - app.logger.error("/data EXEC: FAILED") + app.logger.critical("/data EXEC: FAILED") checks_passed = False # Check: /data/key.txt exists and is rw: @@ -172,11 +172,11 @@ def access_checks(): file_exists = True if os.access('/data/key.txt', os.R_OK): file_readable = True else: - app.logger.error("/data/key.txt READ: FAILED") + app.logger.critical("/data/key.txt READ: FAILED") checks_passed = False if os.access('/data/key.txt', os.W_OK): file_writable = True else: - app.logger.error("/data/key.txt WRITE: FAILED") + app.logger.critical("/data/key.txt WRITE: FAILED") checks_passed = False else: app.logger.error("/data/key.txt EXIST: FAILED - NO ERROR") @@ -188,13 +188,13 @@ def access_checks(): checks_passed = False if checks_passed: - app.logger.error("All startup checks passed.") + app.logger.info("All startup checks passed.") return "Pass" message_html = "" # Generate the message: if not server_reachable: - app.logger.error("Server is unreachable") + app.logger.critical("Server is unreachable") message = """
Your headscale server is either unreachable or not properly configured. Please ensure your configuration is correct (Check for 200 status on @@ -204,7 +204,7 @@ def access_checks(): message_html += format_message("Error", "Headscale unreachable", message) if not config_readable: - app.logger.error("Headscale configuration is not readable") + app.logger.critical("Headscale configuration is not readable") message = """
/etc/headscale/config.yaml not readable. Please ensure your headscale configuration file resides in /etc/headscale and @@ -214,7 +214,7 @@ def access_checks(): message_html += format_message("Error", "/etc/headscale/config.yaml not readable", message) if not data_writable: - app.logger.error("/data folder is not writable") + app.logger.critical("/data folder is not writable") message = """
/data is not writable. Please ensure your permissions are correct. /data mount should be writable @@ -224,7 +224,7 @@ def access_checks(): message_html += format_message("Error", "/data not writable", message) if not data_readable: - app.logger.error("/data folder is not readable") + app.logger.critical("/data folder is not readable") message = """
/data is not readable. Please ensure your permissions are correct. /data mount should be readable @@ -234,7 +234,7 @@ def access_checks(): message_html += format_message("Error", "/data not readable", message) if not data_executable: - app.logger.error("/data folder is not readable") + app.logger.critical("/data folder is not readable") message = """
/data is not executable. Please ensure your permissions are correct. /data mount should be readable @@ -248,7 +248,7 @@ def access_checks(): # If it doesn't exist, we assume the user hasn't created it yet. # Just redirect to the settings page to enter an API Key if not file_writable: - app.logger.error("/data/key.txt is not writable") + app.logger.critical("/data/key.txt is not writable") message = """
/data/key.txt is not writable. Please ensure your permissions are correct. /data mount should be writable @@ -258,7 +258,7 @@ def access_checks(): message_html += format_message("Error", "/data/key.txt not writable", message) if not file_readable: - app.logger.error("/data/key.txt is not readable") + app.logger.critical("/data/key.txt is not readable") message = """
/data/key.txt is not readable. Please ensure your
permissions are correct. /data mount should be readable
diff --git a/pyproject.toml b/pyproject.toml
index a5e92c6..0ec1c01 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "headscale-webui"
-version = "v0.5.0"
+version = "v0.5.1"
description = "A simple web UI for small-scale Headscale deployments."
authors = ["Albert Copeland