Skip to content

Commit 72e94ca

Browse files
authored
Merge pull request #33 from iFargle/logging-update
Logging update
2 parents 326aa1c + 12f9444 commit 72e94ca

File tree

9 files changed

+177
-123
lines changed

9 files changed

+177
-123
lines changed

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ ENV KEY=""
3838
ENV SCRIPT_NAME=/
3939
ENV DOMAIN_NAME=http://localhost
4040
ENV AUTH_TYPE=""
41+
ENV LOG_LEVEL="Info"
4142

4243
# BasicAuth variables
4344
ENV BASIC_AUTH_USER=""

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pipeline {
55
label 'linux-x64'
66
}
77
environment {
8-
APP_VERSION = 'v0.5.0'
8+
APP_VERSION = 'v0.5.1'
99
HS_VERSION = "v0.20.0" // Version of Headscale this is compatible with
1010
BUILD_DATE = ''
1111
}

SETUP.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* `SCRIPT_NAME` is your "Base Path" for hosting. For example, if you want to host on http://localhost/admin, set this to `/admin`
2121
* `KEY` is your encryption key. Set this to a random value generated from `openssl rand -base64 32`
2222
* `AUTH_TYPE` can be set to `Basic` or `OIDC`. See the [Authentication](#Authentication) section below for more information.
23+
* `LOG_LEVEL` can be one of `Debug`, `Info`, `Warning`, `Error`, or `Critical` for decreasing verbosity. Default is `Info` if removed from your Environment.
2324
---
2425
# Reverse Proxies
2526
*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.*

docker-compose.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ services:
1111
- SCRIPT_NAME=/admin # This is your applications base path (wsgi requires the name "SCRIPT_NAME")
1212
- KEY="YourKeyBetweenQuotes" # Generate with "openssl rand -base64 32" - used to encrypt your key on disk.
1313
- AUTH_TYPE=oidc # AUTH_TYPE is either Basic or OIDC. Empty for no authentication
14+
- LOG_LEVEL=info # Log level. "DEBUG", "ERROR", "WARNING", or "INFO". Default "INFO"
1415
# ENV for Basic Auth (Used only if AUTH_TYPE is "Basic"). Can be omitted if you aren't using Basic Auth
15-
- BASIC_AUTH_USER=user # Used for basic auth
16-
- BASIC_AUTH_PASS=pass # Used for basic auth
16+
- BASIC_AUTH_USER=user # Used for basic auth
17+
- BASIC_AUTH_PASS=pass # Used for basic auth
1718
# ENV for OIDC (Used only if AUTH_TYPE is "OIDC"). Can be omitted if you aren't using OIDC
1819
- OIDC_AUTH_URL=https://auth.$DOMAIN/.well-known/openid-configuration # URL for your OIDC issuer's well-known endpoint
19-
- OIDC_CLIENT_ID=headscale-webui # Your OIDC Issuer's Client ID for Headscale-WebUI
20-
- OIDC_CLIENT_SECRET=YourSecretHere # Your OIDC Issuer's Secret Key for Headscale-WebUI
20+
- OIDC_CLIENT_ID=headscale-webui # Your OIDC Issuer's Client ID for Headscale-WebUI
21+
- OIDC_CLIENT_SECRET=YourSecretHere # Your OIDC Issuer's Secret Key for Headscale-WebUI
2122
volumes:
2223
- ./volume:/data # Headscale-WebUI's storage. Make sure ./volume is readable by UID 1000 (chown 1000:1000 ./volume)
2324
- ./headscale/config/:/etc/headscale/:ro # Headscale's config storage location. Used to read your Headscale config.

0 commit comments

Comments
 (0)