From cc28267a3dc54c65cf331ce5aa426332f1c6d2c5 Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 10 Mar 2025 00:11:11 +0100 Subject: [PATCH] lala --- wud copy/.env | 3 -- wud copy/docker-compose.yml | 31 ------------ wud copy/stack.env | 55 --------------------- wud/.secrets/http_basic_password_jaydee.txt | 0 wud/docker-compose.yml | 13 +---- wud/http_basic_password_jaydee.txt | 1 - wud/stack.env | 4 +- 7 files changed, 4 insertions(+), 103 deletions(-) delete mode 100644 wud copy/.env delete mode 100644 wud copy/docker-compose.yml delete mode 100644 wud copy/stack.env delete mode 100644 wud/.secrets/http_basic_password_jaydee.txt delete mode 100644 wud/http_basic_password_jaydee.txt diff --git a/wud copy/.env b/wud copy/.env deleted file mode 100644 index 636c02a..0000000 --- a/wud copy/.env +++ /dev/null @@ -1,3 +0,0 @@ -RESTART=always -DOCKER_REGISTRY=r.sectorq.eu/library/ -APPNAME=wud \ No newline at end of file diff --git a/wud copy/docker-compose.yml b/wud copy/docker-compose.yml deleted file mode 100644 index 516d9f5..0000000 --- a/wud copy/docker-compose.yml +++ /dev/null @@ -1,31 +0,0 @@ -services: - whatsupdocker: - image: ${DOCKER_REGISTRY:-}getwud/wud - container_name: wud - env_file: - - stack.env - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - /share/docker_data/wud/data:/store - - /share/docker_data/wud/certs:/certs - ports: - - 3008:3000 - restart: ${RESTART:-unless-stopped} - logging: - driver: loki - options: - loki-url: "http://192.168.77.101:3100/loki/api/v1/push" - labels: - - com.centurylinklabs.watchtower.enable=true - - homepage.group=Infrastructure - - homepage.name=What's Up Docker - - homepage.weight=1 - - homepage.icon=/images/wud-logo.png - - homepage.href=https://wud.sectorq.eu - - homepage.description=Docker container management - - homepage.server=my-docker - - homepage.container=wud - - homepage.widget.type=whatsupdocker - - homepage.widget.url=https://wud.sectorq.eu - - homepage.widget.username=homepage # optional - - homepage.widget.password=l4c1j4yd33Du5lo # optional \ No newline at end of file diff --git a/wud copy/stack.env b/wud copy/stack.env deleted file mode 100644 index 8729a9c..0000000 --- a/wud copy/stack.env +++ /dev/null @@ -1,55 +0,0 @@ -TZ=Europe/Bratislava -WUD_REGISTRY_HUB_PUBLIC_LOGIN=jaydee77 -WUD_REGISTRY_HUB_PUBLIC_PASSWORD=dckr_pat_WUfjkuEEYYEFDI95myphANR7AUU - -WUD_REGISTRY_CUSTOM_JAYDEE_URL=https://r.sectorq.eu -#WUD_REGISTRY_CUSTOM_JAYDEE_LOGIN=jaydee -#WUD_REGISTRY_CUSTOM_JAYDEE_PASSWORD=l4c1j4yd33Du5lo -#WUD_REGISTRY_CUSTOM_JAYDEE_AUTH="$2y$05$KM.AT7zX5BseO0HnXG4ds.a01XHLPBmrEFYt4ZjD.v6pUZw3xmCkq" - -# AUTHENTIK -WUD_AUTH_OIDC_AUTHENTIK_CLIENTID=p8WUIAWMMx2mRdsnjZdkMl5XXerZQfZFo6ZadAvH -WUD_AUTH_OIDC_AUTHENTIK_CLIENTSECRET=ApAQrTyl2qVIsxhHY1MYJkxCS5tHjQz2gKnmDTOgGALeVCxiN9upQP1h28VqqAaOtc6WEDsczhsk1hKFvit1WUe8mbk0BkGQc2Mnh0Hf2MRybXd1vDcTRWL6pqICywBs -WUD_AUTH_OIDC_AUTHENTIK_DISCOVERY=https://auth.sectorq.eu/application/o/wud/.well-known/openid-configuration -WUD_AUTH_OIDC_AUTHENTIK_REDIRECT=false -WUD_AUTH_OIDC_AUTHENTIK_TIMEOUT=2000 - -# BASIC -WUD_AUTH_BASIC_JAYDEE_USER=homepage -WUD_AUTH_BASIC_JAYDEE_HASH=$$apr1$$pGMz1QxU$$y6XuTscvGcYgas15JWlfg/ -# GOTIFY -WUD_TRIGGER_GOTIFY_EXTERNAL_PRIORITY=0 -WUD_TRIGGER_GOTIFY_EXTERNAL_TOKEN=A2cvNVpDFlRplea -WUD_TRIGGER_GOTIFY_EXTERNAL_URL=https://gotify.sectorq.eu/ -WUD_TRIGGER_GOTIFY_EXTERNAL_MODE=batch - -# NTFY -#WUD_TRIGGER_NTFY_MSERVER_URL=https://ntfy.sectorq.eu -#WUD_TRIGGER_NTFY_MSERVER_TOPIC=wud - - -WUD_TRIGGER_DOCKER_MSERVER_PRUNE=true -# error info debug trace -WUD_LOG_LEVEL=debug -# text json -WUD_LOG_FORMAT=text - -WUD_WATCHER_EXTDOCKER_HOST=193.168.144.164 -WUD_WATCHER_EXTDOCKER_PORT=2376 -WUD_WATCHER_EXTDOCKER_CERTFILE=/certs/ext/cert.pem -WUD_WATCHER_EXTDOCKER_CAFILE=/certs/ext/ca.pem -WUD_WATCHER_EXTDOCKER_KEYFILE=/certs/ext/key.pem -WUD_WATCHER_EXTDOCKER_CRON=0 * * * * -WUD_WATCHER_EXTDOCKER_WATCHALL=true -WUD_WATCHER_EXTDOCKER_WATCHBYDEFAULT=true - -WUD_WATCHER_MSERVER_HOST=192.168.77.101 -WUD_WATCHER_MSERVER_PORT=2376 -WUD_WATCHER_MSERVER_CERTFILE=/certs/m-server/cert.pem -WUD_WATCHER_MSERVER_CAFILE=/certs/m-server/ca.pem -WUD_WATCHER_MSERVER_KEYFILE=/certs/m-server/key.pem -WUD_WATCHER_MSERVER_CRON=0 * * * * -WUD_WATCHER_MSERVER_WATCHALL=true -WUD_WATCHER_MSERVER_WATCHBYDEFAULT=true - -WUD_SERVER_CORS_ENABLED=true \ No newline at end of file diff --git a/wud/.secrets/http_basic_password_jaydee.txt b/wud/.secrets/http_basic_password_jaydee.txt deleted file mode 100644 index e69de29..0000000 diff --git a/wud/docker-compose.yml b/wud/docker-compose.yml index 0277172..516d9f5 100644 --- a/wud/docker-compose.yml +++ b/wud/docker-compose.yml @@ -1,16 +1,9 @@ ---- services: whatsupdocker: image: ${DOCKER_REGISTRY:-}getwud/wud container_name: wud env_file: - stack.env - environment: - # BASIC - WUD_AUTH_BASIC_HOMEPAGE_USER: homepage - WUD_AUTH_BASIC_HOMEPAGE_HASH: /run/secrets/http_basic_password_jaydee - secrets: - - http_basic_password_jaydee volumes: - /var/run/docker.sock:/var/run/docker.sock - /share/docker_data/wud/data:/store @@ -35,8 +28,4 @@ services: - homepage.widget.type=whatsupdocker - homepage.widget.url=https://wud.sectorq.eu - homepage.widget.username=homepage # optional - - homepage.widget.password=l4c1j4yd33Du5lo # optional - -secrets: - http_basic_password_jaydee: - file: http_basic_password_jaydee.txt \ No newline at end of file + - homepage.widget.password=l4c1j4yd33Du5lo # optional \ No newline at end of file diff --git a/wud/http_basic_password_jaydee.txt b/wud/http_basic_password_jaydee.txt deleted file mode 100644 index 04baf0a..0000000 --- a/wud/http_basic_password_jaydee.txt +++ /dev/null @@ -1 +0,0 @@ -$$apr1$$pGMz1QxU$$y6XuTscvGcYgas15JWlfg/ \ No newline at end of file diff --git a/wud/stack.env b/wud/stack.env index d7a7806..8729a9c 100644 --- a/wud/stack.env +++ b/wud/stack.env @@ -14,7 +14,9 @@ WUD_AUTH_OIDC_AUTHENTIK_DISCOVERY=https://auth.sectorq.eu/application/o/wud/.wel WUD_AUTH_OIDC_AUTHENTIK_REDIRECT=false WUD_AUTH_OIDC_AUTHENTIK_TIMEOUT=2000 - +# BASIC +WUD_AUTH_BASIC_JAYDEE_USER=homepage +WUD_AUTH_BASIC_JAYDEE_HASH=$$apr1$$pGMz1QxU$$y6XuTscvGcYgas15JWlfg/ # GOTIFY WUD_TRIGGER_GOTIFY_EXTERNAL_PRIORITY=0 WUD_TRIGGER_GOTIFY_EXTERNAL_TOKEN=A2cvNVpDFlRplea