Merge pull request #33 from iFargle/logging-update

Logging update
iFargle · Feb 28, 2023 · 72e94ca · 72e94ca
2 parents 326aa1c + 12f9444
commit 72e94ca
Show file tree

Hide file tree

Showing 9 changed files with 177 additions and 123 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -38,6 +38,7 @@ ENV KEY=""
 ENV SCRIPT_NAME=/
 ENV DOMAIN_NAME=http://localhost
 ENV AUTH_TYPE=""
+ENV LOG_LEVEL="Info"
 
 # BasicAuth variables
 ENV BASIC_AUTH_USER=""

diff --git 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/SETUP.md b/SETUP.md
@@ -20,6 +20,7 @@
   * `SCRIPT_NAME` is your "Base Path" for hosting.  For example, if you want to host on http://localhost/admin, set this to `/admin`
   * `KEY` is your encryption key.  Set this to a random value generated from `openssl rand -base64 32`
   * `AUTH_TYPE` can be set to `Basic` or `OIDC`.  See the [Authentication](#Authentication) section below for more information.
+  * `LOG_LEVEL` can be one of `Debug`, `Info`, `Warning`, `Error`, or `Critical` for decreasing verbosity.  Default is `Info` if removed from your Environment.
 ---
 # Reverse Proxies
 *If your reverse proxy isn't listed or doesn't work, please open up a [new issue](https://github.com/iFargle/headscale-webui/issues/new) and it will be worked on.*

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,13 +11,14 @@ services:
       - SCRIPT_NAME=/admin                     # This is your applications base path (wsgi requires the name "SCRIPT_NAME")
       - KEY="YourKeyBetweenQuotes"             # Generate with "openssl rand -base64 32" - used to encrypt your key on disk.
       - AUTH_TYPE=oidc                         # AUTH_TYPE is either Basic or OIDC.  Empty for no authentication
+      - LOG_LEVEL=info                         # Log level.  "DEBUG", "ERROR", "WARNING", or "INFO".  Default "INFO"
       # ENV for Basic Auth (Used only if AUTH_TYPE is "Basic").  Can be omitted if you aren't using Basic Auth
-      - BASIC_AUTH_USER=user                 # Used for basic auth
-      - BASIC_AUTH_PASS=pass                 # Used for basic auth
+      - BASIC_AUTH_USER=user                   # Used for basic auth
+      - BASIC_AUTH_PASS=pass                   # Used for basic auth
       # ENV for OIDC (Used only if AUTH_TYPE is "OIDC").  Can be omitted if you aren't using OIDC
       - OIDC_AUTH_URL=https://auth.$DOMAIN/.well-known/openid-configuration # URL for your OIDC issuer's well-known endpoint
-      - OIDC_CLIENT_ID=headscale-webui     # Your OIDC Issuer's Client ID for Headscale-WebUI
-      - OIDC_CLIENT_SECRET=YourSecretHere  # Your OIDC Issuer's Secret Key for Headscale-WebUI
+      - OIDC_CLIENT_ID=headscale-webui         # Your OIDC Issuer's Client ID for Headscale-WebUI
+      - OIDC_CLIENT_SECRET=YourSecretHere      # Your OIDC Issuer's Secret Key for Headscale-WebUI
     volumes:
       - ./volume:/data                         # Headscale-WebUI's storage.  Make sure ./volume is readable by UID 1000 (chown 1000:1000 ./volume)
       - ./headscale/config/:/etc/headscale/:ro # Headscale's config storage location.  Used to read your Headscale config.