From a00b878bdabb510c17eafe5e6c06b119052e7deb Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Sun, 29 Oct 2023 14:59:22 +0100 Subject: [PATCH 01/14] added host_items method --- authentik/docker-compose.yml | 86 ++++++ dvag-ios.txt | 405 +++++++++++++++++++++++++++++ home-assistant/docker-compose.yaml | 2 +- 3 files changed, 492 insertions(+), 1 deletion(-) create mode 100644 authentik/docker-compose.yml create mode 100644 dvag-ios.txt diff --git a/authentik/docker-compose.yml b/authentik/docker-compose.yml new file mode 100644 index 0000000..a5a1d6b --- /dev/null +++ b/authentik/docker-compose.yml @@ -0,0 +1,86 @@ +--- +version: "3.4" + +services: + postgresql: + image: docker.io/library/postgres:12-alpine + restart: unless-stopped + healthcheck: + test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"] + start_period: 20s + interval: 30s + retries: 5 + timeout: 5s + volumes: + - /share/docker_data/authentik/database:/var/lib/postgresql/data + environment: + POSTGRES_PASSWORD: ${PG_PASS:?database password required} + POSTGRES_USER: ${PG_USER:-authentik} + POSTGRES_DB: ${PG_DB:-authentik} + env_file: + - .env + redis: + image: docker.io/library/redis:alpine + command: --save 60 1 --loglevel warning + restart: unless-stopped + healthcheck: + test: ["CMD-SHELL", "redis-cli ping | grep PONG"] + start_period: 20s + interval: 30s + retries: 5 + timeout: 3s + volumes: + - redis:/data + server: + image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.10.1} + restart: unless-stopped + command: server + environment: + AUTHENTIK_REDIS__HOST: redis + AUTHENTIK_POSTGRESQL__HOST: postgresql + AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik} + AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik} + AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS} + volumes: + - /share/docker_data/authentik/media:/media + - /share/docker_data/authentik/custom-templates:/templates + env_file: + - .env + ports: + - "${COMPOSE_PORT_HTTP:-9003}:9000" + - "${COMPOSE_PORT_HTTPS:-9453}:9443" + depends_on: + - postgresql + - redis + worker: + image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.10.1} + restart: unless-stopped + command: worker + environment: + AUTHENTIK_REDIS__HOST: redis + AUTHENTIK_POSTGRESQL__HOST: postgresql + AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik} + AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik} + AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS} + # `user: root` and the docker socket volume are optional. + # See more for the docker socket integration here: + # https://goauthentik.io/docs/outposts/integrations/docker + # Removing `user: root` also prevents the worker from fixing the permissions + # on the mounted folders, so when removing this make sure the folders have the correct UID/GID + # (1000:1000 by default) + user: root + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /share/docker_data/authentik/media:/media + - /share/docker_data/authentik/certs:/certs + - /share/docker_data/authentik/custom-templates:/templates + + depends_on: + - postgresql + - redis + +volumes: + database: + driver: local + redis: + driver: local diff --git a/dvag-ios.txt b/dvag-ios.txt new file mode 100644 index 0000000..5eee45c --- /dev/null +++ b/dvag-ios.txt @@ -0,0 +1,405 @@ +sw-bbz-ham-1-pv +sw-bbz-ham-2-pv +sw-bbz-ham-1 +sw-bbz-ham-empfang +sw-bbz-ham-sr1 +sw-bbz-ham-sr3 +sw-bbz-ham-sr4 +sw-bbz-ham-er +sw-bbz-ham-br +sw-bbz-ham-direktion +rt-f-wm-dc-01-pv +rt-f-wm-dc-02-pv +rt-f-ebl-dc-01-pv +rt-f-ebl-dc-02-pv +rt-f-wm-vv-dc-1 +rt-f-wm-dc-gre-1 +rt-f-ebl-dc-gre-1 +sw-f-wm-dc-ib-1 +sw-f-ebl-dc-ib-1 +sw-f-uma-ug-1c +sw-f-uma-1og-1 +sw-f-uma-5og-caverion +rt-f-wm-dc-exr-1 +rt-f-ebl-dc-exr-1 +sw-f-wm-dc-d-1/2 +sw-f-wm-dc-d-5/6 +sw-f-wm-dc-rack-a04b-1 +sw-f-wl-ua-1 +sw-f-wl-0a-1 +sw-f-wl-0b-bistro-1 +sw-f-wl-0a-mt-1 +sw-f-wl-1a-1 +sw-f-wl-2a-1 +sw-f-wl-3a-1 +sw-f-wl-4a-1 +sw-f-wl-5a-1 +sw-f-wl-6a-1 +sw-f-wl-ub-1 +sw-f-wl-2b-1 +sw-f-wl-3b-1 +sw-f-wl-4b-1 +sw-f-wl-5b-1 +sw-f-wl-6b-1 +sw-f-wl-6b-rb69-1 +sw-f-wl-7b-1 +sw-f-wl-auf-2 +sw-f-wl-0c-1 +sw-f-wl-0c-mt-1 +sw-f-wl-0c-mt-2 +sw-f-wl-0c-2 +sw-f-wl-0c-atrium-1 +sw-f-wl-2c-1 +sw-f-wl-vv-2c-r2058-1 +sw-f-wl-2c-2 +sw-f-wl-3c-1 +sw-f-wl-4c-1 +sw-f-wl-5c-1 +sw-f-wl-6c-1 +sw-f-wl-7c-1 +sw-f-wl-auf-3 +sw-f-wl-auf-4 +sw-f-wl-0d-1 +sw-f-wl-0d-mt-1 +sw-f-wl-1d-1 +sw-f-wl-1d-2 +sw-f-wl-2d-1 +sw-f-wl-3d-1 +sw-f-wl-0h-altbau-1 +sw-f-wl-4d-1 +sw-f-wl-5d-1 +sw-f-wl-6d-1 +sw-f-wl-7d-1 +sw-f-wl-0h-1 +sw-f-wl-1h-1 +sw-f-wl-2h-1 +sw-f-wl-3h-1 +sw-f-wl-4h-1 +sw-f-wl-5h-1 +sw-f-wl-6h-1 +sw-f-wl-auf-1 +sw-f-wm-dc-d-3/4 +sw-f-wl-ug-test-1 +sw-f-wl-1b-1 +sw-f-wl-1b-2 +sw-f-wl-1c-1 +sw-f-wl-0c-empfang-1 +sw-f-wl-1c-r1030-1 +sw-f-wl-1c-r1030-2 +sw-f-wl-1c-r1030-lab +sw-f-wl-1c-r1030-evt +sw-f-wl-1c-r1030-tpa +sw-f-wl-1c-r1030-11 +sw-f-wl-1d-mt-d14 +sw-f-wl-2a-mt-a21 +sw-f-wl-3b-mt-b16 +sw-f-wl-4a-mt-a21 +sw-f-wl-5a-mt-a21 +sw-f-wl-6b-mt-b69 +sw-f-wl-1d-mt-d42 +sw-f-wl-2b-mt-b16 +sw-f-wl-3b-mt-b45 +sw-f-wl-4b-mt-b16 +sw-f-wl-5c-mt-c68 +sw-f-wl-6c-mt-c23 +sw-f-wl-1h-mt-h03 +sw-f-wl-2c-mt-c07 +sw-f-wl-3c-mt-c14 +sw-f-wl-4c-mt-c16 +sw-f-wl-5d-mt-d14 +sw-f-wl-2c-mt-c14 +sw-f-wl-3d-mt-d14 +sw-f-wl-4d-mt-d14 +sw-f-wl-2h-mt-h16 +sw-f-wl-3h-mt-h16 +sw-f-wl-4d-mt-d16 +sw-f-wl-4d-mt-d36 +sw-hof-eve-gevent-1-pv +sw-hof-eve-event-d-1 +sw-hof-eve-event-1 +sw-hof-eve-event-2 +sw-hof-eve-uellner-1 +sw-hof-eve-schlaf-1-pv +sw-hof-eve-schlaf-d-1 +sw-hof-eve-schlaf-1 +sw-hof-eve-schlaf-2 +sw-hof-eve-schlaf-3 +sw-hof-eve-kultur-eg-1 +sw-hof-eve-kultur-eg-2 +sw-hof-eve-walds-d-1 +sw-hof-eve-walds-3 +sw-hof-eve-walds-og-1 +sw-hof-eve-walds-1 +sw-hof-eve-walds-2 +sw-hof-eve-walds-og-2 +sw-hof-eve-ghofladen-1 +sw-hof-eve-ghofladen-2 +sw-hof-eve-khofladen-3 +sw-hof-eve-berge-1 +sw-hof-eve-berge-2 +SW-BBZ-DUE-1-PV +SW-BBZ-DUE-2-PV +SW-BBZ-DUE-1 +SW-BBZ-DUE-ERSATZ-1 +SW-BBZ-DUE-5 (offline) +SW-BBZ-DUE-EMPFANG +SW-BBZ-DUE-SR1 +SW-BBZ-DUE-SR2 +SW-BBZ-DUE-SR3 +SW-BBZ-DUE-SR4 +SW-BBZ-DUE-SR5 +SW-BBZ-DUE-SR6 +SW-BBZ-DUE-GR +SW-BBZ-DUE-CASINO +SW-BBZ-ERF-1-PV +SW-BBZ-ERF-2-PV +SW-BBZ-ERF-1 +SW-BBZ-ERF-4 +SW-BBZ-ERF-SR1 +SW-BBZ-ERF-SR2 +SW-BBZ-ERF-SR3 +SW-BBZ-ERF-SR4 +SW-BBZ-ERF-SR5 +SW-BBZ-ERF-ER +SW-BBZ-ERF-CR +SW-BBZ-ERF-CASINO +sw-bbz-che-1-pv +sw-bbz-che-2-pv +sw-bbz-che-1 +SW-BBZ-CHE-4 +SW-BBZ-CHE-SR1 +SW-BBZ-CHE-SR2 +SW-BBZ-CHE-SR3 +SW-BBZ-CHE-SR4 +SW-BBZ-CHE-CR +SW-BBZ-CHE-ER +SW-BBZ-VIE-1-PV +SW-BBZ-VIE-2-PV +SW-BBZ-VIE-1 +SW-BBZ-VIE-4 +SW-BBZ-VIE-SR1 +SW-BBZ-VIE-SR2 +SW-BBZ-VIE-SR3 +SW-BBZ-VIE-SR4 +SW-BBZ-VIE-ER +SW-BBZ-VIE-CR +SW-BBZ-NUE-1-PV +SW-BBZ-NUE-2-PV +SW-BBZ-NUE-1 +SW-BBZ-NUE-4 +SW-BBZ-NUE-SR1 +SW-BBZ-NUE-SR2 +SW-BBZ-NUE-SR3 +SW-BBZ-NUE-SR4 +SW-BBZ-NUE-ER +SW-BBZ-NUE-CR +SW-BBZ-STU-1-PV +SW-BBZ-STU-2-PV +SW-BBZ-STU-1 +SW-BBZ-STU-4 +SW-BBZ-STU-CASINO +SW-BBZ-STU-SR1 +SW-BBZ-STU-SR2 +SW-BBZ-STU-SR3 +SW-BBZ-STU-SR4 +SW-BBZ-STU-ER +SW-BBZ-STU-CR +SW-BBZ-MUE-1-PV +SW-BBZ-MUE-2-PV +SW-BBZ-MUE-1 +SW-BBZ-MUE-4 +SW-BBZ-MUE-5 +SW-BBZ-MUE-SR1 +SW-BBZ-MUE-SR2 +SW-BBZ-MUE-SR3 +SW-BBZ-MUE-SR4 +SW-BBZ-MUE-ER +SW-BBZ-MUE-CR +sw-hof-reit-1og-1 +sw-hof-reit-1og-2 +sw-hof-reit-2 +sw-hof-reit-4 +sw-hof-reit-5 +sw-hof-reit-6 +sw-hof-reit-1og-3 +sw-hof-reit-1 +sw-hof-reit-3 +sw-hof-reit-1og-4 +sw-hof-reit-1og-5 +sw-gi-lz-1-pv +sw-gi-lz-2-pv +sw-gi-lz-1 +sw-gi-lz-fwh-1 +sw-fb-lm-1 +SW-HG-DMS-1 +sw-mr-aff-1 +sw-mr-lg-1 +sw-mr-fhdw-wdh-ug-1-pv +sw-mr-fhdw-wdh-ug-2-pv +sw-mr-fhdw-wdh-ug-1 +sw-mr-fhdw-wdh-eg-1 +sw-mr-fhdw-swh-ug-1 +sw-mr-fhdw-swh-eg-1 +sw-mr-fhdw-swh-eg-2 +sw-mr-rh5-ug-1-pv +sw-mr-rh5-ug-2-pv +sw-mr-rh5-ug-3 +sw-mr-rh5-ug-4 +sw-mr-rh6-ug-2 +sw-mr-rh5-eg-2 +sw-mr-rh5-ug-5 +sw-mr-rh7-ug-2 +sw-mr-rh5-4og-2 +sw-mr-rh5-5og-2 +sw-mr-rh5-5og-5 +sw-mr-rh1-ug-1-pv +sw-mr-rh1-ug-2 +sw-mr-rh1-ug-1 +sw-mr-rh4-ug-1-pv +sw-mr-rh4-ug-1 +sw-mr-rh4-ug-evt2-1 +sw-mr-rh4-ug-2 +sw-mr-rh4-4og-1 +sw-mr-rh4-4og-2 +sw-mr-rh4-ug-3 +sw-mr-rh4-ug-4 +sw-mr-rh2-ug-spa-1 +sw-mr-rh2-ug-1 +sw-mr-rh2-ug-vivaldi +sw-mr-rh2-eg-1 +sw-mr-rh2-eg-2 (offline) +sw-mr-rh2-eg-mondial +sw-mr-rh2-2og-1 +sw-mr-rh2-3og-1 +sw-mr-rh2-3og-2 +sw-mr-rh2-4og-1 +sw-mr-rh3-ug-1 +sw-mr-rh5-ug-2 +sw-mr-rh5-eg-1 +sw-mr-rh5-4og-1 +sw-mr-rh5-3og-2 +sw-mr-rh5-1og-8 +sw-mr-rh5-ug-1 +sw-mr-rh5-1og-1 +sw-mr-rh5-1og-5 +sw-mr-rh5-1og-7 +sw-mr-rh5-2og-1 +sw-mr-rh5-3og-1 +sw-mr-rh5-5og-1 +sw-mr-rh5-5og-3 +sw-mr-rh5-5og-4 +sw-mr-rh6-ug-4 +sw-mr-rh6-ug-evt3-1 +sw-mr-rh7-ug-1 +sw-mr-rhc-eg-1 (offline) +sw-ka-wgan-1 +SW-VV-DKL-1-PV +sw-vv-dkl-2-pv +sw-vv-dkl-3 +sw-vv-dkl-1 +sw-vv-dkl-4 +sw-vv-dkl-ersatz +sw-vv-dkl-11 +sw-vv-dkl-18 +sw-vv-dkl-6 +sw-vv-dkl-16 +sw-vv-dkl-19 +sw-vv-dkl-17 +sw-vv-dkl-7 +sw-vv-dkl-12 +sw-mr-zlr-1 +sw-mr-bueck-1 +sw-mr-bueck-2 +sw-mr-bueck-3 +sw-mr-vita-1 +sw-mr-vita-2 +sw-bbz-zwe-1-pv +sw-bbz-zwe-2-pv +sw-bbz-zwe-11 +sw-bbz-zwe-1 +sw-bbz-zwe-2 +sw-bbz-zwe-14 +sw-bbz-zwe-4 +sw-bbz-zwe-5 +sw-bbz-zwe-c1000 +sw-mr-hol-ug-1-pv +sw-mr-hol-ug-d-1 +sw-mr-hol-ug-2 +sw-mr-hol-1og-1 +sw-mr-hol-ug-1 +sw-mr-hol-eg-aromatruck +sw-mr-hol-4og-1 +sw-mr-hol-3og-2 +sw-mr-hol-3og-1 +sw-mr-hol-2og-1 +sw-mr-hol-1og-2 +sw-mr-hol-eg-aroma +sw-mr-zvb-ug-1-pv +sw-mr-zvb-ug-d-1 +sw-mr-zvb-ug-d-2 +sw-mr-zvb-ug-1 +sw-mr-zvb-ug-3 +sw-mr-zvb-ug-2c +sw-mr-zvb-2og-3 +sw-mr-zvb-2og-2 +sw-mr-zvb-1og-4 +sw-mr-zvb-1og-1 +sw-mr-zvb-1og-2 +sw-mr-zvb-1og-5 +sw-mr-zvb-1og-15 +sw-mr-zvb-2og-1 +sw-mr-zvb-ug-4 +sw-mr-zvb-2og-4 +sw-mr-zvb-sbar-1 +sw-mr-zvb-1og-3 +sw-mr-zvb-eg-1 +sw-mr-zvb-eg-2 +sw-mr-zvb-eg-3 +sw-mr-zvb-eg-4 +sw-mr-zvb-eg-5 +sw-mr-zvb-eg-6 +sw-mr-zvb-eg-7 +sw-mr-zvb-eg-8 +sw-mr-zvb-eg-9 +sw-mr-zvb-eg-10 +sw-mr-zvb-eg-11 +sw-mr-zvb-eg-12 +sw-mr-zvb-eg-13 +sw-mr-zvb-eg-14 +SW-AT-WIEN-1-PV +SW-AT-WIEN-2-PV +SW-AT-WIEN-1 +SW-AT-WIEN-2 +SW-AT-WIEN-3 +SW-AT-WIEN-4 +SW-AT-WIEN-5 +SW-AT-WIEN-10 +SW-AT-WIEN-11 +SW-AT-WIEN-12 +SW-AT-WIEN-13 +SW-AT-WIEN-14 +SW-AT-WIEN-15 +SW-AT-WIEN-16 +SW-AT-WIEN-17 +SW-AT-WIEN-18 +SW-AT-WIEN-19 +sw-bbz-ber-1-pv +sw-bbz-ber-2-pv +sw-bbz-ber-1 +sw-bbz-ber-5 +sw-bbz-ber-empfang +SW-BBZ-BER-SR1 +SW-BBZ-BER-SR2 +SW-BBZ-BER-SR3 +SW-BBZ-BER-SR4 +SW-BBZ-BER-SR5 +sw-bbz-ber-sr6 +sw-bbz-ber-casino +sw-f-gkk-1 +sw-f-khg-1-pv +sw-f-khg-2-pv +sw-f-khg-1 +sw-f-khg-4 +sw-f-khg-2 +sw-f-khg-3 +sw-f-khg-2og-1 diff --git a/home-assistant/docker-compose.yaml b/home-assistant/docker-compose.yaml index 932d862..ba7f1f7 100644 --- a/home-assistant/docker-compose.yaml +++ b/home-assistant/docker-compose.yaml @@ -1,7 +1,7 @@ version: '3' services: homeassistant: - container_name: HomeAssistant1 + container_name: HomeAssistant network_mode: host image: "ghcr.io/home-assistant/home-assistant:latest" volumes: From 2d840e3e720c366abea2354453682238f77431ab Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Sun, 29 Oct 2023 15:00:51 +0100 Subject: [PATCH 02/14] added host_items method --- authentik/docker-compose.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/authentik/docker-compose.yml b/authentik/docker-compose.yml index a5a1d6b..fbc287c 100644 --- a/authentik/docker-compose.yml +++ b/authentik/docker-compose.yml @@ -17,8 +17,6 @@ services: POSTGRES_PASSWORD: ${PG_PASS:?database password required} POSTGRES_USER: ${PG_USER:-authentik} POSTGRES_DB: ${PG_DB:-authentik} - env_file: - - .env redis: image: docker.io/library/redis:alpine command: --save 60 1 --loglevel warning @@ -44,8 +42,6 @@ services: volumes: - /share/docker_data/authentik/media:/media - /share/docker_data/authentik/custom-templates:/templates - env_file: - - .env ports: - "${COMPOSE_PORT_HTTP:-9003}:9000" - "${COMPOSE_PORT_HTTPS:-9453}:9443" From 1f2ab746f55f202887c97ce1fb8ac5c63173ce83 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Sun, 29 Oct 2023 15:13:24 +0100 Subject: [PATCH 03/14] added host_items method --- authentik/docker-compose.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/authentik/docker-compose.yml b/authentik/docker-compose.yml index fbc287c..a7dcc3f 100644 --- a/authentik/docker-compose.yml +++ b/authentik/docker-compose.yml @@ -14,9 +14,9 @@ services: volumes: - /share/docker_data/authentik/database:/var/lib/postgresql/data environment: - POSTGRES_PASSWORD: ${PG_PASS:?database password required} - POSTGRES_USER: ${PG_USER:-authentik} - POSTGRES_DB: ${PG_DB:-authentik} + POSTGRES_PASSWORD: authentik + POSTGRES_USER: authentik + POSTGRES_DB: authentik redis: image: docker.io/library/redis:alpine command: --save 60 1 --loglevel warning @@ -36,9 +36,9 @@ services: environment: AUTHENTIK_REDIS__HOST: redis AUTHENTIK_POSTGRESQL__HOST: postgresql - AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik} - AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik} - AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS} + AUTHENTIK_POSTGRESQL__USER: authentik + AUTHENTIK_POSTGRESQL__NAME: authentik + AUTHENTIK_POSTGRESQL__PASSWORD: authentik volumes: - /share/docker_data/authentik/media:/media - /share/docker_data/authentik/custom-templates:/templates @@ -55,9 +55,9 @@ services: environment: AUTHENTIK_REDIS__HOST: redis AUTHENTIK_POSTGRESQL__HOST: postgresql - AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik} - AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik} - AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS} + AUTHENTIK_POSTGRESQL__USER: authentik + AUTHENTIK_POSTGRESQL__NAME: authentik + AUTHENTIK_POSTGRESQL__PASSWORD: authentik # `user: root` and the docker socket volume are optional. # See more for the docker socket integration here: # https://goauthentik.io/docs/outposts/integrations/docker @@ -76,7 +76,5 @@ services: - redis volumes: - database: - driver: local redis: driver: local From f0b460569a0f37193a0adf73e6a41d915f66c1f1 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Sun, 29 Oct 2023 15:16:13 +0100 Subject: [PATCH 04/14] added host_items method --- authentik/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/authentik/docker-compose.yml b/authentik/docker-compose.yml index a7dcc3f..f8bdfc3 100644 --- a/authentik/docker-compose.yml +++ b/authentik/docker-compose.yml @@ -39,6 +39,7 @@ services: AUTHENTIK_POSTGRESQL__USER: authentik AUTHENTIK_POSTGRESQL__NAME: authentik AUTHENTIK_POSTGRESQL__PASSWORD: authentik + AUTHENTIK_SECRET_KEY: ZKkVCxj8kKj5ZklvzxKG2IgYQOftDoLPRjc57yomr1qzbKEQVZ volumes: - /share/docker_data/authentik/media:/media - /share/docker_data/authentik/custom-templates:/templates From 983cbb25a2801f678d8f8be480f45cad2e0939d5 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Sun, 29 Oct 2023 15:18:50 +0100 Subject: [PATCH 05/14] added host_items method --- authentik/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/authentik/docker-compose.yml b/authentik/docker-compose.yml index f8bdfc3..22c9376 100644 --- a/authentik/docker-compose.yml +++ b/authentik/docker-compose.yml @@ -14,7 +14,7 @@ services: volumes: - /share/docker_data/authentik/database:/var/lib/postgresql/data environment: - POSTGRES_PASSWORD: authentik + POSTGRES_PASSWORD: 499NU6Ze5HcJK4IwSShO8oDbj3j0i0CalyEzfgEp POSTGRES_USER: authentik POSTGRES_DB: authentik redis: @@ -38,7 +38,7 @@ services: AUTHENTIK_POSTGRESQL__HOST: postgresql AUTHENTIK_POSTGRESQL__USER: authentik AUTHENTIK_POSTGRESQL__NAME: authentik - AUTHENTIK_POSTGRESQL__PASSWORD: authentik + AUTHENTIK_POSTGRESQL__PASSWORD: 499NU6Ze5HcJK4IwSShO8oDbj3j0i0CalyEzfgEp AUTHENTIK_SECRET_KEY: ZKkVCxj8kKj5ZklvzxKG2IgYQOftDoLPRjc57yomr1qzbKEQVZ volumes: - /share/docker_data/authentik/media:/media @@ -58,7 +58,7 @@ services: AUTHENTIK_POSTGRESQL__HOST: postgresql AUTHENTIK_POSTGRESQL__USER: authentik AUTHENTIK_POSTGRESQL__NAME: authentik - AUTHENTIK_POSTGRESQL__PASSWORD: authentik + AUTHENTIK_POSTGRESQL__PASSWORD: 499NU6Ze5HcJK4IwSShO8oDbj3j0i0CalyEzfgEp # `user: root` and the docker socket volume are optional. # See more for the docker socket integration here: # https://goauthentik.io/docs/outposts/integrations/docker From 85ab0307beab4c2ad0ee2fcca29e044888a03835 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Sun, 29 Oct 2023 15:45:08 +0100 Subject: [PATCH 06/14] added host_items method --- authentik/docker-compose2.yml | 87 +++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 authentik/docker-compose2.yml diff --git a/authentik/docker-compose2.yml b/authentik/docker-compose2.yml new file mode 100644 index 0000000..4bd8bea --- /dev/null +++ b/authentik/docker-compose2.yml @@ -0,0 +1,87 @@ +--- +version: "3.4" + +services: + postgresql: + image: docker.io/library/postgres:12-alpine + restart: unless-stopped + healthcheck: + test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"] + start_period: 20s + interval: 30s + retries: 5 + timeout: 5s + volumes: + - database:/var/lib/postgresql/data + environment: + POSTGRES_PASSWORD: ${PG_PASS:?database password required} + POSTGRES_USER: ${PG_USER:-authentik} + POSTGRES_DB: ${PG_DB:-authentik} + env_file: + - .env + redis: + image: docker.io/library/redis:alpine + command: --save 60 1 --loglevel warning + restart: unless-stopped + healthcheck: + test: ["CMD-SHELL", "redis-cli ping | grep PONG"] + start_period: 20s + interval: 30s + retries: 5 + timeout: 3s + volumes: + - redis:/data + server: + image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.10.1} + restart: unless-stopped + command: server + environment: + AUTHENTIK_REDIS__HOST: redis + AUTHENTIK_POSTGRESQL__HOST: postgresql + AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik} + AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik} + AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS} + volumes: + - /share/docker_data/authentik/media:/media + - /share/docker_data/authentik/custom-templates:/templates + env_file: + - .env + ports: + - "${COMPOSE_PORT_HTTP:-9003}:9000" + - "${COMPOSE_PORT_HTTPS:-9453}:9443" + depends_on: + - postgresql + - redis + worker: + image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.10.1} + restart: unless-stopped + command: worker + environment: + AUTHENTIK_REDIS__HOST: redis + AUTHENTIK_POSTGRESQL__HOST: postgresql + AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik} + AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik} + AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS} + # `user: root` and the docker socket volume are optional. + # See more for the docker socket integration here: + # https://goauthentik.io/docs/outposts/integrations/docker + # Removing `user: root` also prevents the worker from fixing the permissions + # on the mounted folders, so when removing this make sure the folders have the correct UID/GID + # (1000:1000 by default) + user: root + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /share/docker_data/authentik/media:/media + - /share/docker_data/authentik/certs:/certs + - /share/docker_data/authentik/custom-templates:/templates + env_file: + - .env + depends_on: + - postgresql + - redis + +volumes: + database: + driver: local + redis: + driver: local From c114df6abf10d84a592a1f6be00ab6b5228a6335 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Sun, 29 Oct 2023 15:51:56 +0100 Subject: [PATCH 07/14] added host_items method --- authentik/docker-compose2.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/authentik/docker-compose2.yml b/authentik/docker-compose2.yml index 4bd8bea..2606b14 100644 --- a/authentik/docker-compose2.yml +++ b/authentik/docker-compose2.yml @@ -18,7 +18,7 @@ services: POSTGRES_USER: ${PG_USER:-authentik} POSTGRES_DB: ${PG_DB:-authentik} env_file: - - .env + - /data/.env redis: image: docker.io/library/redis:alpine command: --save 60 1 --loglevel warning @@ -45,7 +45,7 @@ services: - /share/docker_data/authentik/media:/media - /share/docker_data/authentik/custom-templates:/templates env_file: - - .env + - /data/.env ports: - "${COMPOSE_PORT_HTTP:-9003}:9000" - "${COMPOSE_PORT_HTTPS:-9453}:9443" @@ -75,7 +75,7 @@ services: - /share/docker_data/authentik/certs:/certs - /share/docker_data/authentik/custom-templates:/templates env_file: - - .env + - /data/.env depends_on: - postgresql - redis From 482cf3c6be8aba52b1d34cb927e432b7707df592 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Sun, 29 Oct 2023 16:02:04 +0100 Subject: [PATCH 08/14] added host_items method --- authentik/docker-compose.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/authentik/docker-compose.yml b/authentik/docker-compose.yml index 22c9376..e372234 100644 --- a/authentik/docker-compose.yml +++ b/authentik/docker-compose.yml @@ -17,6 +17,8 @@ services: POSTGRES_PASSWORD: 499NU6Ze5HcJK4IwSShO8oDbj3j0i0CalyEzfgEp POSTGRES_USER: authentik POSTGRES_DB: authentik + AUTHENTIK_SECRET_KEY: ZKkVCxj8kKj5ZklvzxKG2IgYQOftDoLPRjc57yomr1qzbKEQVZ + AUTHENTIK_ERROR_REPORTING__ENABLED: true redis: image: docker.io/library/redis:alpine command: --save 60 1 --loglevel warning @@ -40,6 +42,7 @@ services: AUTHENTIK_POSTGRESQL__NAME: authentik AUTHENTIK_POSTGRESQL__PASSWORD: 499NU6Ze5HcJK4IwSShO8oDbj3j0i0CalyEzfgEp AUTHENTIK_SECRET_KEY: ZKkVCxj8kKj5ZklvzxKG2IgYQOftDoLPRjc57yomr1qzbKEQVZ + AUTHENTIK_ERROR_REPORTING__ENABLED: true volumes: - /share/docker_data/authentik/media:/media - /share/docker_data/authentik/custom-templates:/templates @@ -59,6 +62,8 @@ services: AUTHENTIK_POSTGRESQL__USER: authentik AUTHENTIK_POSTGRESQL__NAME: authentik AUTHENTIK_POSTGRESQL__PASSWORD: 499NU6Ze5HcJK4IwSShO8oDbj3j0i0CalyEzfgEp + AUTHENTIK_SECRET_KEY: ZKkVCxj8kKj5ZklvzxKG2IgYQOftDoLPRjc57yomr1qzbKEQVZ + AUTHENTIK_ERROR_REPORTING__ENABLED: true # `user: root` and the docker socket volume are optional. # See more for the docker socket integration here: # https://goauthentik.io/docs/outposts/integrations/docker From 73dca4164c7b4eb5a8cfa11b918fcae187266d1d Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Sun, 29 Oct 2023 16:23:00 +0100 Subject: [PATCH 09/14] added host_items method --- authentik/docker-compose2.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/authentik/docker-compose2.yml b/authentik/docker-compose2.yml index 2606b14..5cc0b5f 100644 --- a/authentik/docker-compose2.yml +++ b/authentik/docker-compose2.yml @@ -18,7 +18,7 @@ services: POSTGRES_USER: ${PG_USER:-authentik} POSTGRES_DB: ${PG_DB:-authentik} env_file: - - /data/.env + - stack.env redis: image: docker.io/library/redis:alpine command: --save 60 1 --loglevel warning @@ -45,7 +45,7 @@ services: - /share/docker_data/authentik/media:/media - /share/docker_data/authentik/custom-templates:/templates env_file: - - /data/.env + - stack.env ports: - "${COMPOSE_PORT_HTTP:-9003}:9000" - "${COMPOSE_PORT_HTTPS:-9453}:9443" @@ -75,7 +75,7 @@ services: - /share/docker_data/authentik/certs:/certs - /share/docker_data/authentik/custom-templates:/templates env_file: - - /data/.env + - stack.env depends_on: - postgresql - redis From ace635b9b3ce9f55bcea80232978785b29ff5e8b Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Sun, 29 Oct 2023 16:23:12 +0100 Subject: [PATCH 10/14] added host_items method --- authentik/docker-compose.yml | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/authentik/docker-compose.yml b/authentik/docker-compose.yml index e372234..5cc0b5f 100644 --- a/authentik/docker-compose.yml +++ b/authentik/docker-compose.yml @@ -12,13 +12,13 @@ services: retries: 5 timeout: 5s volumes: - - /share/docker_data/authentik/database:/var/lib/postgresql/data + - database:/var/lib/postgresql/data environment: - POSTGRES_PASSWORD: 499NU6Ze5HcJK4IwSShO8oDbj3j0i0CalyEzfgEp - POSTGRES_USER: authentik - POSTGRES_DB: authentik - AUTHENTIK_SECRET_KEY: ZKkVCxj8kKj5ZklvzxKG2IgYQOftDoLPRjc57yomr1qzbKEQVZ - AUTHENTIK_ERROR_REPORTING__ENABLED: true + POSTGRES_PASSWORD: ${PG_PASS:?database password required} + POSTGRES_USER: ${PG_USER:-authentik} + POSTGRES_DB: ${PG_DB:-authentik} + env_file: + - stack.env redis: image: docker.io/library/redis:alpine command: --save 60 1 --loglevel warning @@ -38,14 +38,14 @@ services: environment: AUTHENTIK_REDIS__HOST: redis AUTHENTIK_POSTGRESQL__HOST: postgresql - AUTHENTIK_POSTGRESQL__USER: authentik - AUTHENTIK_POSTGRESQL__NAME: authentik - AUTHENTIK_POSTGRESQL__PASSWORD: 499NU6Ze5HcJK4IwSShO8oDbj3j0i0CalyEzfgEp - AUTHENTIK_SECRET_KEY: ZKkVCxj8kKj5ZklvzxKG2IgYQOftDoLPRjc57yomr1qzbKEQVZ - AUTHENTIK_ERROR_REPORTING__ENABLED: true + AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik} + AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik} + AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS} volumes: - /share/docker_data/authentik/media:/media - /share/docker_data/authentik/custom-templates:/templates + env_file: + - stack.env ports: - "${COMPOSE_PORT_HTTP:-9003}:9000" - "${COMPOSE_PORT_HTTPS:-9453}:9443" @@ -59,11 +59,9 @@ services: environment: AUTHENTIK_REDIS__HOST: redis AUTHENTIK_POSTGRESQL__HOST: postgresql - AUTHENTIK_POSTGRESQL__USER: authentik - AUTHENTIK_POSTGRESQL__NAME: authentik - AUTHENTIK_POSTGRESQL__PASSWORD: 499NU6Ze5HcJK4IwSShO8oDbj3j0i0CalyEzfgEp - AUTHENTIK_SECRET_KEY: ZKkVCxj8kKj5ZklvzxKG2IgYQOftDoLPRjc57yomr1qzbKEQVZ - AUTHENTIK_ERROR_REPORTING__ENABLED: true + AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik} + AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik} + AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS} # `user: root` and the docker socket volume are optional. # See more for the docker socket integration here: # https://goauthentik.io/docs/outposts/integrations/docker @@ -76,11 +74,14 @@ services: - /share/docker_data/authentik/media:/media - /share/docker_data/authentik/certs:/certs - /share/docker_data/authentik/custom-templates:/templates - + env_file: + - stack.env depends_on: - postgresql - redis volumes: + database: + driver: local redis: driver: local From 2afb0d1515f5283649ae53305f90d4805ef6c658 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Sun, 29 Oct 2023 16:24:47 +0100 Subject: [PATCH 11/14] added host_items method --- authentik/docker-compose.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/authentik/docker-compose.yml b/authentik/docker-compose.yml index 5cc0b5f..fe3d799 100644 --- a/authentik/docker-compose.yml +++ b/authentik/docker-compose.yml @@ -17,8 +17,7 @@ services: POSTGRES_PASSWORD: ${PG_PASS:?database password required} POSTGRES_USER: ${PG_USER:-authentik} POSTGRES_DB: ${PG_DB:-authentik} - env_file: - - stack.env + redis: image: docker.io/library/redis:alpine command: --save 60 1 --loglevel warning @@ -44,8 +43,7 @@ services: volumes: - /share/docker_data/authentik/media:/media - /share/docker_data/authentik/custom-templates:/templates - env_file: - - stack.env + ports: - "${COMPOSE_PORT_HTTP:-9003}:9000" - "${COMPOSE_PORT_HTTPS:-9453}:9443" @@ -74,8 +72,7 @@ services: - /share/docker_data/authentik/media:/media - /share/docker_data/authentik/certs:/certs - /share/docker_data/authentik/custom-templates:/templates - env_file: - - stack.env + depends_on: - postgresql - redis From c6fd16e0d45e1c74ad0730fc491700d36b2c7825 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Sun, 29 Oct 2023 16:26:30 +0100 Subject: [PATCH 12/14] added host_items method --- authentik/docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/authentik/docker-compose.yml b/authentik/docker-compose.yml index fe3d799..758cd43 100644 --- a/authentik/docker-compose.yml +++ b/authentik/docker-compose.yml @@ -17,6 +17,7 @@ services: POSTGRES_PASSWORD: ${PG_PASS:?database password required} POSTGRES_USER: ${PG_USER:-authentik} POSTGRES_DB: ${PG_DB:-authentik} + AUTHENTIK_SECRET_KEY: $AUTHENTIK_SECRET_KEY redis: image: docker.io/library/redis:alpine @@ -40,6 +41,7 @@ services: AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik} AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik} AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS} + AUTHENTIK_SECRET_KEY: $AUTHENTIK_SECRET_KEY volumes: - /share/docker_data/authentik/media:/media - /share/docker_data/authentik/custom-templates:/templates @@ -60,6 +62,7 @@ services: AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik} AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik} AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS} + AUTHENTIK_SECRET_KEY: $AUTHENTIK_SECRET_KEY # `user: root` and the docker socket volume are optional. # See more for the docker socket integration here: # https://goauthentik.io/docs/outposts/integrations/docker From 4e9917acfeb33e389c38991075d2381ffcd3c45f Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Sun, 29 Oct 2023 16:31:04 +0100 Subject: [PATCH 13/14] added host_items method --- authentik/docker-compose.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/authentik/docker-compose.yml b/authentik/docker-compose.yml index 758cd43..d471713 100644 --- a/authentik/docker-compose.yml +++ b/authentik/docker-compose.yml @@ -12,7 +12,7 @@ services: retries: 5 timeout: 5s volumes: - - database:/var/lib/postgresql/data + - /share/docker_data/authentik/database:/var/lib/postgresql/data environment: POSTGRES_PASSWORD: ${PG_PASS:?database password required} POSTGRES_USER: ${PG_USER:-authentik} @@ -81,7 +81,5 @@ services: - redis volumes: - database: - driver: local redis: driver: local From 2af1eea9b20ee8b6722cf1b6962267fb464ef0fb Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Sun, 29 Oct 2023 16:32:38 +0100 Subject: [PATCH 14/14] added host_items method --- authentik/docker-compose.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/authentik/docker-compose.yml b/authentik/docker-compose.yml index d471713..758cd43 100644 --- a/authentik/docker-compose.yml +++ b/authentik/docker-compose.yml @@ -12,7 +12,7 @@ services: retries: 5 timeout: 5s volumes: - - /share/docker_data/authentik/database:/var/lib/postgresql/data + - database:/var/lib/postgresql/data environment: POSTGRES_PASSWORD: ${PG_PASS:?database password required} POSTGRES_USER: ${PG_USER:-authentik} @@ -81,5 +81,7 @@ services: - redis volumes: + database: + driver: local redis: driver: local