From 2ba5b81a2a21cd763d8011b9863d832685dca9c9 Mon Sep 17 00:00:00 2001 From: Roman Buryan Date: Tue, 10 Nov 2026 16:23:39 +0300 Subject: [PATCH] =?UTF-8?q?[SSO]=2032=20oauth2-proxy=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=D1=8B=20=D0=BF=D0=BE=D0=B4?= =?UTF-8?q?=20compose:=20=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B0=D1=82=D0=BE?= =?UTF-8?q?=D1=80=20oauth2-compose.py=20=D0=B2=D1=8B=D0=B3=D1=80=D1=83?= =?UTF-8?q?=D0=B7=D0=B8=D0=BB=2011=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=B8=D0=B7=20=D0=B6=D0=B8=D0=B2=D0=BE=D0=B3=D0=BE=20=D1=81?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D1=8F,=20=D1=81?= =?UTF-8?q?=D0=B5=D0=BA=D1=80=D0=B5=D1=82=D1=8B=20=E2=80=94=20=D0=B2=20/ro?= =?UTF-8?q?ot/.env-out=20(600),=20=D0=B2=20Git=20=D1=82=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=BA=D0=BE=20${VAR}.=20=D0=92=D1=81=D0=B5=2032=20=D1=81=D0=BB?= =?UTF-8?q?=D1=83=D0=B6=D0=B1=D1=8B=20=D0=BF=D0=BE=D0=B4=D0=BD=D1=8F=D1=82?= =?UTF-8?q?=D1=8B=20=D0=B8=20=D0=BE=D1=82=D0=B2=D0=B5=D1=87=D0=B0=D1=8E?= =?UTF-8?q?=D1=82,=20=D0=B2=D0=BD=D0=B5=20compose=20=E2=80=94=200.=20check?= =?UTF-8?q?=5Fsso=5Fproviders=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?= =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D0=B8=D1=82=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5?= =?UTF-8?q?=D0=B9=D0=BD=D0=B5=D1=80=D1=8B=20=D0=B2=D0=BD=D0=B5=20compose?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 + deploy/ct102/oauth2-env.example | 3 + deploy/ct102/oauth2-proxy.compose.yml | 50 ++- deploy/ct106/oauth2-env.example | 3 + deploy/ct106/oauth2-proxy.compose.yml | 56 +-- deploy/ct107/oauth2-env.example | 3 + deploy/ct107/oauth2-proxy.compose.yml | 50 ++- deploy/ct108/oauth2-env.example | 6 + deploy/ct108/oauth2-proxy.compose.yml | 97 +++-- deploy/ct109/oauth2-env.example | 3 + deploy/ct109/oauth2-proxy.compose.yml | 28 ++ deploy/ct110/oauth2-env.example | 47 ++ deploy/ct110/oauth2-proxy.compose.yml | 595 ++++++++++++++++++-------- deploy/ct115/oauth2-env.example | 3 + deploy/ct115/oauth2-proxy.compose.yml | 52 ++- deploy/ct117/oauth2-env.example | 3 + deploy/ct117/oauth2-proxy.compose.yml | 50 ++- deploy/ct118/oauth2-env.example | 3 + deploy/ct118/oauth2-proxy.compose.yml | 50 ++- deploy/ct119/oauth2-env.example | 3 + deploy/ct119/oauth2-proxy.compose.yml | 50 ++- deploy/ct155/oauth2-env.example | 3 + deploy/ct155/oauth2-proxy.compose.yml | 52 ++- ops/scripts/check_sso_providers.py | 33 +- ops/scripts/oauth2-compose.py | 76 ++++ ops/sso/OAUTH2-COMPOSE.md | 74 ++++ 26 files changed, 991 insertions(+), 406 deletions(-) create mode 100644 deploy/ct102/oauth2-env.example create mode 100644 deploy/ct106/oauth2-env.example create mode 100644 deploy/ct107/oauth2-env.example create mode 100644 deploy/ct108/oauth2-env.example create mode 100644 deploy/ct109/oauth2-env.example create mode 100644 deploy/ct109/oauth2-proxy.compose.yml create mode 100644 deploy/ct110/oauth2-env.example create mode 100644 deploy/ct115/oauth2-env.example create mode 100644 deploy/ct117/oauth2-env.example create mode 100644 deploy/ct118/oauth2-env.example create mode 100644 deploy/ct119/oauth2-env.example create mode 100644 deploy/ct155/oauth2-env.example create mode 100755 ops/scripts/oauth2-compose.py create mode 100644 ops/sso/OAUTH2-COMPOSE.md diff --git a/.gitignore b/.gitignore index d06d688..a155859 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,7 @@ ops/vpn/build/ *.glb *.blend1 ops/home/plans/*.blend + +# резервные копии при генерации +*.bak-20* +*.before-20* diff --git a/deploy/ct102/oauth2-env.example b/deploy/ct102/oauth2-env.example new file mode 100644 index 0000000..5af2d06 --- /dev/null +++ b/deploy/ct102/oauth2-env.example @@ -0,0 +1,3 @@ +# Значения положить в .env на CT102 (chmod 600) +OAUTH2_PROXY_DASHY_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_DASHY_OAUTH2_PROXY_COOKIE_SECRET= diff --git a/deploy/ct102/oauth2-proxy.compose.yml b/deploy/ct102/oauth2-proxy.compose.yml index 8bc7440..39c4674 100644 --- a/deploy/ct102/oauth2-proxy.compose.yml +++ b/deploy/ct102/oauth2-proxy.compose.yml @@ -1,31 +1,35 @@ -# oauth2-proxy для CT102 — сгенерировано из живого состояния -# НЕ содержит секретов: они подставляются из .env на CT +# Сгенерировано oauth2-compose.py по живому состоянию (10.11.2026). +# Секреты — в .env на CT (права 600), в Git не попадают. +# Проверка: docker compose -f oauth2-proxy.compose.yml config + services: oauth2-proxy-dashy: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" container_name: "oauth2-proxy-dashy" restart: "unless-stopped" + networks: + - "ct102_default" ports: - "9983:9983" environment: - OAUTH2_PROXY_UPSTREAMS: "${OAUTH2_PROXY_UPSTREAMS}" - OAUTH2_PROXY_REDIRECT_URL: "${OAUTH2_PROXY_REDIRECT_URL}" - OAUTH2_PROXY_PASS_USER_HEADERS: "${OAUTH2_PROXY_PASS_USER_HEADERS}" - OAUTH2_PROXY_OIDC_ISSUER_URL: "${OAUTH2_PROXY_OIDC_ISSUER_URL}" - OAUTH2_PROXY_HTTP_ADDRESS: "${OAUTH2_PROXY_HTTP_ADDRESS}" - OAUTH2_PROXY_PROVIDER: "${OAUTH2_PROXY_PROVIDER}" - OAUTH2_PROXY_REVERSE_PROXY: "${OAUTH2_PROXY_REVERSE_PROXY}" - OAUTH2_PROXY_COOKIE_SECURE: "${OAUTH2_PROXY_COOKIE_SECURE}" - OAUTH2_PROXY_EMAIL_DOMAINS: "${OAUTH2_PROXY_EMAIL_DOMAINS}" - PATH: "${PATH}" - OAUTH2_PROXY_TRUSTED_PROXY_IPS: "${OAUTH2_PROXY_TRUSTED_PROXY_IPS}" - SSL_CERT_FILE: "${SSL_CERT_FILE}" - OAUTH2_PROXY_SET_XAUTHREQUEST: "${OAUTH2_PROXY_SET_XAUTHREQUEST}" - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "${OAUTH2_PROXY_SKIP_PROVIDER_BUTTON}" - OAUTH2_PROXY_COOKIE_SECRET: "${OAUTH2_PROXY_COOKIE_SECRET}" # секрет из .env - OAUTH2_PROXY_CLIENT_SECRET: "${OAUTH2_PROXY_CLIENT_SECRET}" # секрет из .env - healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:9983/ping"] - interval: 30s - retries: 3 - + OAUTH2_PROXY_CLIENT_ID: "dashy-proxy" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_DASHY_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_DASHY_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:9983" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/dashy/" + OAUTH2_PROXY_PASS_USER_HEADERS: "true" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://hub.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_SET_XAUTHREQUEST: "true" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_TRUSTED_PROXY_IPS: "192.168.1.0/24,10.88.0.0/24,127.0.0.1/32" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.102:8080" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" +networks: + ct102_default: + external: true diff --git a/deploy/ct106/oauth2-env.example b/deploy/ct106/oauth2-env.example new file mode 100644 index 0000000..e2e8569 --- /dev/null +++ b/deploy/ct106/oauth2-env.example @@ -0,0 +1,3 @@ +# Значения положить в .env на CT106 (chmod 600) +OAUTH2_PROXY_HOME_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_HOME_OAUTH2_PROXY_COOKIE_SECRET= diff --git a/deploy/ct106/oauth2-proxy.compose.yml b/deploy/ct106/oauth2-proxy.compose.yml index 99904e0..08ee309 100644 --- a/deploy/ct106/oauth2-proxy.compose.yml +++ b/deploy/ct106/oauth2-proxy.compose.yml @@ -1,34 +1,38 @@ -# oauth2-proxy для CT106 — сгенерировано из живого состояния -# НЕ содержит секретов: они подставляются из .env на CT +# Сгенерировано oauth2-compose.py по живому состоянию (10.11.2026). +# Секреты — в .env на CT (права 600), в Git не попадают. +# Проверка: docker compose -f oauth2-proxy.compose.yml config + services: oauth2-proxy-home: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" container_name: "oauth2-proxy-home" restart: "unless-stopped" + networks: + - "ha-sso" ports: - "9130:9130" environment: - OAUTH2_PROXY_EMAIL_DOMAINS: "${OAUTH2_PROXY_EMAIL_DOMAINS}" - SSL_CERT_FILE: "${SSL_CERT_FILE}" - OAUTH2_PROXY_SET_XAUTHREQUEST: "${OAUTH2_PROXY_SET_XAUTHREQUEST}" - OAUTH2_PROXY_REDIRECT_URL: "${OAUTH2_PROXY_REDIRECT_URL}" - OAUTH2_PROXY_COOKIE_SECURE: "${OAUTH2_PROXY_COOKIE_SECURE}" - OAUTH2_PROXY_APPROVAL_PROMPT: "${OAUTH2_PROXY_APPROVAL_PROMPT}" - PATH: "${PATH}" - OAUTH2_PROXY_COOKIE_SAMESITE: "${OAUTH2_PROXY_COOKIE_SAMESITE}" - OAUTH2_PROXY_UPSTREAMS: "${OAUTH2_PROXY_UPSTREAMS}" - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "${OAUTH2_PROXY_SKIP_PROVIDER_BUTTON}" - OAUTH2_PROXY_COOKIE_NAME: "${OAUTH2_PROXY_COOKIE_NAME}" - OAUTH2_PROXY_PROVIDER: "${OAUTH2_PROXY_PROVIDER}" - OAUTH2_PROXY_TRUSTED_PROXY_IPS: "${OAUTH2_PROXY_TRUSTED_PROXY_IPS}" - OAUTH2_PROXY_HTTP_ADDRESS: "${OAUTH2_PROXY_HTTP_ADDRESS}" - OAUTH2_PROXY_SESSION_COOKIE_MINIMAL: "${OAUTH2_PROXY_SESSION_COOKIE_MINIMAL}" - OAUTH2_PROXY_REVERSE_PROXY: "${OAUTH2_PROXY_REVERSE_PROXY}" - OAUTH2_PROXY_OIDC_ISSUER_URL: "${OAUTH2_PROXY_OIDC_ISSUER_URL}" - OAUTH2_PROXY_COOKIE_SECRET: "${OAUTH2_PROXY_COOKIE_SECRET}" # секрет из .env - OAUTH2_PROXY_CLIENT_SECRET: "${OAUTH2_PROXY_CLIENT_SECRET}" # секрет из .env - healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:9130/ping"] - interval: 30s - retries: 3 - + OAUTH2_PROXY_APPROVAL_PROMPT: "auto" + OAUTH2_PROXY_CLIENT_ID: "home-assistant-proxy" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_HOME_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_NAME: "_oauth2_proxy_ha" + OAUTH2_PROXY_COOKIE_SAMESITE: "lax" + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_HOME_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:9130" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/home-assistant/" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://home.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_SESSION_COOKIE_MINIMAL: "true" + OAUTH2_PROXY_SET_XAUTHREQUEST: "true" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_TRUSTED_PROXY_IPS: "192.168.1.0/24,10.88.0.0/24,127.0.0.1/32" + OAUTH2_PROXY_UPSTREAMS: "static://202" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" +networks: + ha-sso: + external: true diff --git a/deploy/ct107/oauth2-env.example b/deploy/ct107/oauth2-env.example new file mode 100644 index 0000000..83f1427 --- /dev/null +++ b/deploy/ct107/oauth2-env.example @@ -0,0 +1,3 @@ +# Значения положить в .env на CT107 (chmod 600) +OAUTH2_PROXY_STATUS_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_STATUS_OAUTH2_PROXY_COOKIE_SECRET= diff --git a/deploy/ct107/oauth2-proxy.compose.yml b/deploy/ct107/oauth2-proxy.compose.yml index 466739a..bd01326 100644 --- a/deploy/ct107/oauth2-proxy.compose.yml +++ b/deploy/ct107/oauth2-proxy.compose.yml @@ -1,31 +1,35 @@ -# oauth2-proxy для CT107 — сгенерировано из живого состояния -# НЕ содержит секретов: они подставляются из .env на CT +# Сгенерировано oauth2-compose.py по живому состоянию (10.11.2026). +# Секреты — в .env на CT (права 600), в Git не попадают. +# Проверка: docker compose -f oauth2-proxy.compose.yml config + services: oauth2-proxy-status: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" container_name: "oauth2-proxy-status" restart: "unless-stopped" + networks: + - "ct107_default" ports: - "9109:9109" environment: - OAUTH2_PROXY_TRUSTED_PROXY_IPS: "${OAUTH2_PROXY_TRUSTED_PROXY_IPS}" - OAUTH2_PROXY_SET_XAUTHREQUEST: "${OAUTH2_PROXY_SET_XAUTHREQUEST}" - OAUTH2_PROXY_REDIRECT_URL: "${OAUTH2_PROXY_REDIRECT_URL}" - OAUTH2_PROXY_HTTP_ADDRESS: "${OAUTH2_PROXY_HTTP_ADDRESS}" - OAUTH2_PROXY_UPSTREAMS: "${OAUTH2_PROXY_UPSTREAMS}" - OAUTH2_PROXY_REVERSE_PROXY: "${OAUTH2_PROXY_REVERSE_PROXY}" - OAUTH2_PROXY_OIDC_ISSUER_URL: "${OAUTH2_PROXY_OIDC_ISSUER_URL}" - OAUTH2_PROXY_PROVIDER: "${OAUTH2_PROXY_PROVIDER}" - SSL_CERT_FILE: "${SSL_CERT_FILE}" - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "${OAUTH2_PROXY_SKIP_PROVIDER_BUTTON}" - OAUTH2_PROXY_EMAIL_DOMAINS: "${OAUTH2_PROXY_EMAIL_DOMAINS}" - OAUTH2_PROXY_COOKIE_SECURE: "${OAUTH2_PROXY_COOKIE_SECURE}" - OAUTH2_PROXY_PASS_USER_HEADERS: "${OAUTH2_PROXY_PASS_USER_HEADERS}" - PATH: "${PATH}" - OAUTH2_PROXY_COOKIE_SECRET: "${OAUTH2_PROXY_COOKIE_SECRET}" # секрет из .env - OAUTH2_PROXY_CLIENT_SECRET: "${OAUTH2_PROXY_CLIENT_SECRET}" # секрет из .env - healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:9109/ping"] - interval: 30s - retries: 3 - + OAUTH2_PROXY_CLIENT_ID: "status-proxy" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_STATUS_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_STATUS_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:9109" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/status/" + OAUTH2_PROXY_PASS_USER_HEADERS: "true" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://status.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_SET_XAUTHREQUEST: "true" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_TRUSTED_PROXY_IPS: "192.168.1.0/24,10.88.0.0/24,127.0.0.1/32" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.107:3001" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" +networks: + ct107_default: + external: true diff --git a/deploy/ct108/oauth2-env.example b/deploy/ct108/oauth2-env.example new file mode 100644 index 0000000..194fb14 --- /dev/null +++ b/deploy/ct108/oauth2-env.example @@ -0,0 +1,6 @@ +# Значения положить в .env на CT108 (chmod 600) +N8N_N8N_BASIC_AUTH_PASSWORD= +OAUTH2_PROXY_N8N_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_N8N_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_NODERED_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_NODERED_OAUTH2_PROXY_COOKIE_SECRET= diff --git a/deploy/ct108/oauth2-proxy.compose.yml b/deploy/ct108/oauth2-proxy.compose.yml index 95f5712..2bf9788 100644 --- a/deploy/ct108/oauth2-proxy.compose.yml +++ b/deploy/ct108/oauth2-proxy.compose.yml @@ -1,61 +1,66 @@ -# oauth2-proxy для CT108 — сгенерировано из живого состояния -# НЕ содержит секретов: они подставляются из .env на CT +# Сгенерировано oauth2-compose.py по живому состоянию (10.11.2026). +# Секреты — в .env на CT (права 600), в Git не попадают. +# Проверка: docker compose -f oauth2-proxy.compose.yml config + services: oauth2-proxy-n8n: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" container_name: "oauth2-proxy-n8n" restart: "unless-stopped" + networks: + - "ct108_default" ports: - "9105:9105" environment: - OAUTH2_PROXY_REDIRECT_URL: "${OAUTH2_PROXY_REDIRECT_URL}" - OAUTH2_PROXY_HTTP_ADDRESS: "${OAUTH2_PROXY_HTTP_ADDRESS}" - OAUTH2_PROXY_COOKIE_SECURE: "${OAUTH2_PROXY_COOKIE_SECURE}" - PATH: "${PATH}" - OAUTH2_PROXY_TRUSTED_PROXY_IPS: "${OAUTH2_PROXY_TRUSTED_PROXY_IPS}" - OAUTH2_PROXY_OIDC_ISSUER_URL: "${OAUTH2_PROXY_OIDC_ISSUER_URL}" - OAUTH2_PROXY_EMAIL_DOMAINS: "${OAUTH2_PROXY_EMAIL_DOMAINS}" - OAUTH2_PROXY_UPSTREAMS: "${OAUTH2_PROXY_UPSTREAMS}" - OAUTH2_PROXY_REVERSE_PROXY: "${OAUTH2_PROXY_REVERSE_PROXY}" - OAUTH2_PROXY_PROVIDER: "${OAUTH2_PROXY_PROVIDER}" - SSL_CERT_FILE: "${SSL_CERT_FILE}" - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "${OAUTH2_PROXY_SKIP_PROVIDER_BUTTON}" - OAUTH2_PROXY_PASS_USER_HEADERS: "${OAUTH2_PROXY_PASS_USER_HEADERS}" - OAUTH2_PROXY_SET_XAUTHREQUEST: "${OAUTH2_PROXY_SET_XAUTHREQUEST}" - OAUTH2_PROXY_CLIENT_SECRET: "${OAUTH2_PROXY_CLIENT_SECRET}" # секрет из .env - OAUTH2_PROXY_COOKIE_SECRET: "${OAUTH2_PROXY_COOKIE_SECRET}" # секрет из .env - healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:9105/ping"] - interval: 30s - retries: 3 - + OAUTH2_PROXY_CLIENT_ID: "n8n-proxy" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_N8N_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_N8N_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:9105" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/n8n-proxy/" + OAUTH2_PROXY_PASS_USER_HEADERS: "true" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://n8n.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_SET_XAUTHREQUEST: "true" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_TRUSTED_PROXY_IPS: "192.168.1.0/24,10.88.0.0/24,127.0.0.1/32" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.108:5680" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" oauth2-proxy-nodered: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" container_name: "oauth2-proxy-nodered" restart: "unless-stopped" + networks: + - "ct108_default" ports: - "1881:1881" environment: - OAUTH2_PROXY_INSECURE_SKIP_VERIFY: "${OAUTH2_PROXY_INSECURE_SKIP_VERIFY}" - OAUTH2_PROXY_UPSTREAMS: "${OAUTH2_PROXY_UPSTREAMS}" - OAUTH2_PROXY_REVERSE_PROXY: "${OAUTH2_PROXY_REVERSE_PROXY}" - OAUTH2_PROXY_TRUSTED_PROXY_IPS: "${OAUTH2_PROXY_TRUSTED_PROXY_IPS}" - OAUTH2_PROXY_COOKIE_NAME: "${OAUTH2_PROXY_COOKIE_NAME}" - OAUTH2_PROXY_APPROVAL_PROMPT: "${OAUTH2_PROXY_APPROVAL_PROMPT}" - OAUTH2_PROXY_OIDC_ISSUER_URL: "${OAUTH2_PROXY_OIDC_ISSUER_URL}" - OAUTH2_PROXY_PROVIDER: "${OAUTH2_PROXY_PROVIDER}" - OAUTH2_PROXY_REDIRECT_URL: "${OAUTH2_PROXY_REDIRECT_URL}" - OAUTH2_PROXY_EMAIL_DOMAINS: "${OAUTH2_PROXY_EMAIL_DOMAINS}" - OAUTH2_PROXY_COOKIE_SECURE: "${OAUTH2_PROXY_COOKIE_SECURE}" - OAUTH2_PROXY_HTTP_ADDRESS: "${OAUTH2_PROXY_HTTP_ADDRESS}" - SSL_CERT_FILE: "${SSL_CERT_FILE}" - OAUTH2_PROXY_PASS_USER_HEADERS: "${OAUTH2_PROXY_PASS_USER_HEADERS}" - PATH: "${PATH}" - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "${OAUTH2_PROXY_SKIP_PROVIDER_BUTTON}" - OAUTH2_PROXY_CLIENT_SECRET: "${OAUTH2_PROXY_CLIENT_SECRET}" # секрет из .env - OAUTH2_PROXY_COOKIE_SECRET: "${OAUTH2_PROXY_COOKIE_SECRET}" # секрет из .env - healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:1881/ping"] - interval: 30s - retries: 3 - + OAUTH2_PROXY_APPROVAL_PROMPT: "auto" + OAUTH2_PROXY_CLIENT_ID: "nodered-proxy" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_NODERED_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_NAME: "_oauth2_proxy_nodered" + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_NODERED_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:1881" + OAUTH2_PROXY_INSECURE_SKIP_VERIFY: "false" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/nodered/" + OAUTH2_PROXY_PASS_USER_HEADERS: "true" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://flow.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_TRUSTED_PROXY_IPS: "192.168.1.0/24,10.88.0.0/24,127.0.0.1/32" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.108:1880" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" +networks: + automation-lxc_automation_net: + external: true + ct108_default: + external: true diff --git a/deploy/ct109/oauth2-env.example b/deploy/ct109/oauth2-env.example new file mode 100644 index 0000000..dfe6eea --- /dev/null +++ b/deploy/ct109/oauth2-env.example @@ -0,0 +1,3 @@ +# Значения положить в .env на CT109 (chmod 600) +OAUTH2_PROXY_VAULTWARDEN_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_VAULTWARDEN_OAUTH2_PROXY_COOKIE_SECRET= diff --git a/deploy/ct109/oauth2-proxy.compose.yml b/deploy/ct109/oauth2-proxy.compose.yml new file mode 100644 index 0000000..699a38f --- /dev/null +++ b/deploy/ct109/oauth2-proxy.compose.yml @@ -0,0 +1,28 @@ +# Сгенерировано oauth2-compose.py по живому состоянию (10.11.2026). +# Секреты — в .env на CT (права 600), в Git не попадают. +# Проверка: docker compose -f oauth2-proxy.compose.yml config + +services: + oauth2-proxy-vaultwarden: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-vaultwarden" + restart: "unless-stopped" + network_mode: "host" + environment: + OAUTH2_PROXY_CLIENT_ID: "fHvTtwDTKE7rkrjyUF8UjILLHq8P5QaE40gdHpT9" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_VAULTWARDEN_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SAMESITE: "lax" + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_VAULTWARDEN_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4180" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/vaultwarden-sso/" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://vault.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_SKIP_AUTH_ROUTES: "^/api/.*,^/identity/.*,^/notifications/.*,^/icons/.*,^/images/.*,^/attachments/.*,^/vw_static/.*,^/alive$" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_UPSTREAMS: "http://127.0.0.1:8081" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" diff --git a/deploy/ct110/oauth2-env.example b/deploy/ct110/oauth2-env.example new file mode 100644 index 0000000..4410a4e --- /dev/null +++ b/deploy/ct110/oauth2-env.example @@ -0,0 +1,47 @@ +# Значения положить в .env на CT110 (chmod 600) +BESZEL_AGENT_KEY= +HOMEBOX_HBOX_AUTH_API_KEY_PEPPER= +HOMEBOX_HBOX_OIDC_CLIENT_SECRET= +OAUTH2_PROXY_3D_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_3D_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_ADGUARD_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_ADGUARD_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_ALERTMANAGER_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_ALERTMANAGER_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_FINANCE_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_FINANCE_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_FRIGATE_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_FRIGATE_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_GRAFANA_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_GRAFANA_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_GROCY_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_GROCY_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_HOMEBOX_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_HOMEBOX_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_JACKETT_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_JACKETT_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_JELLYSTAT_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_JELLYSTAT_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_LIDARR_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_LIDARR_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_LOGS_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_LOGS_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_MEALIE_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_MEALIE_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_MEMOS_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_MEMOS_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_METRICS_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_METRICS_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_MONICA_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_MONICA_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_PAPERLESS_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_PAPERLESS_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_SEERR_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_SEERR_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_STIRLING_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_STIRLING_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_SYNCTHING_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_SYNCTHING_OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_VIKUNJA_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_VIKUNJA_OAUTH2_PROXY_COOKIE_SECRET= +VIKUNJA_VIKUNJA_AUTH_OPENID_PROVIDERS_AUTHENTIK_CLIENTSECRET= diff --git a/deploy/ct110/oauth2-proxy.compose.yml b/deploy/ct110/oauth2-proxy.compose.yml index 5f1b63d..9b4d752 100644 --- a/deploy/ct110/oauth2-proxy.compose.yml +++ b/deploy/ct110/oauth2-proxy.compose.yml @@ -1,54 +1,76 @@ -# oauth2-proxy для CT110 — сгенерировано из живого состояния -# НЕ содержит секретов: они подставляются из .env на CT +# Сгенерировано oauth2-compose.py по живому состоянию (10.11.2026). +# Секреты — в .env на CT (права 600), в Git не попадают. +# Проверка: docker compose -f oauth2-proxy.compose.yml config + services: - oauth2-proxy-monica: + oauth2-proxy-3d: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" - container_name: "oauth2-proxy-monica" + container_name: "oauth2-proxy-3d" restart: "unless-stopped" + networks: + - "ct110_default" + ports: + - "9131:9131" environment: - SSL_CERT_FILE: "${SSL_CERT_FILE}" - OAUTH2_PROXY_REDIRECT_URL: "${OAUTH2_PROXY_REDIRECT_URL}" - OAUTH2_PROXY_OIDC_ISSUER_URL: "${OAUTH2_PROXY_OIDC_ISSUER_URL}" - PATH: "${PATH}" - OAUTH2_PROXY_TRUSTED_PROXY_IPS: "${OAUTH2_PROXY_TRUSTED_PROXY_IPS}" - OAUTH2_PROXY_PROVIDER: "${OAUTH2_PROXY_PROVIDER}" - OAUTH2_PROXY_HTTP_ADDRESS: "${OAUTH2_PROXY_HTTP_ADDRESS}" - OAUTH2_PROXY_EMAIL_DOMAINS: "${OAUTH2_PROXY_EMAIL_DOMAINS}" - OAUTH2_PROXY_SET_XAUTHREQUEST: "${OAUTH2_PROXY_SET_XAUTHREQUEST}" - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "${OAUTH2_PROXY_SKIP_PROVIDER_BUTTON}" - OAUTH2_PROXY_UPSTREAMS: "${OAUTH2_PROXY_UPSTREAMS}" - OAUTH2_PROXY_COOKIE_SECURE: "${OAUTH2_PROXY_COOKIE_SECURE}" - OAUTH2_PROXY_PASS_USER_HEADERS: "${OAUTH2_PROXY_PASS_USER_HEADERS}" - OAUTH2_PROXY_CLIENT_SECRET: "${OAUTH2_PROXY_CLIENT_SECRET}" # секрет из .env - OAUTH2_PROXY_COOKIE_SECRET: "${OAUTH2_PROXY_COOKIE_SECRET}" # секрет из .env - healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:4180/ping"] - interval: 30s - retries: 3 - - oauth2-proxy-metrics: + OAUTH2_PROXY_CLIENT_ID: "3d-proxy" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_3D_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_NAME: "_oauth2_proxy_3d" + OAUTH2_PROXY_COOKIE_SAMESITE: "lax" + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_3D_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:9131" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/3d/" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_SESSION_COOKIE_MINIMAL: "true" + OAUTH2_PROXY_SET_XAUTHREQUEST: "true" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_TRUSTED_PROXY_IPS: "192.168.1.0/24,10.88.0.0/24,127.0.0.1/32" + OAUTH2_PROXY_UPSTREAMS: "static://202" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" + oauth2-proxy-adguard: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" - container_name: "oauth2-proxy-metrics" + container_name: "oauth2-proxy-adguard" restart: "unless-stopped" + network_mode: "host" environment: - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "${OAUTH2_PROXY_SKIP_PROVIDER_BUTTON}" - PATH: "${PATH}" - OAUTH2_PROXY_TRUSTED_PROXY_IPS: "${OAUTH2_PROXY_TRUSTED_PROXY_IPS}" - OAUTH2_PROXY_HTTP_ADDRESS: "${OAUTH2_PROXY_HTTP_ADDRESS}" - OAUTH2_PROXY_UPSTREAMS: "${OAUTH2_PROXY_UPSTREAMS}" - OAUTH2_PROXY_OIDC_ISSUER_URL: "${OAUTH2_PROXY_OIDC_ISSUER_URL}" - OAUTH2_PROXY_PROVIDER: "${OAUTH2_PROXY_PROVIDER}" - OAUTH2_PROXY_EMAIL_DOMAINS: "${OAUTH2_PROXY_EMAIL_DOMAINS}" - OAUTH2_PROXY_COOKIE_SECURE: "${OAUTH2_PROXY_COOKIE_SECURE}" - OAUTH2_PROXY_REDIRECT_URL: "${OAUTH2_PROXY_REDIRECT_URL}" - SSL_CERT_FILE: "${SSL_CERT_FILE}" - OAUTH2_PROXY_CLIENT_SECRET: "${OAUTH2_PROXY_CLIENT_SECRET}" # секрет из .env - OAUTH2_PROXY_COOKIE_SECRET: "${OAUTH2_PROXY_COOKIE_SECRET}" # секрет из .env - healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:4180/ping"] - interval: 30s - retries: 3 - + OAUTH2_PROXY_CLIENT_ID: "QNT9thuJnFOiImpGs52L41eShL79ah0lu5ZVHSO9" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_ADGUARD_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_ADGUARD_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4191" + OAUTH2_PROXY_OIDC_ISSUER_URL: "http://192.168.1.114:9000/application/o/adguardproxy2/" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://adguard.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.107:3000" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" + oauth2-proxy-alertmanager: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-alertmanager" + restart: "unless-stopped" + network_mode: "host" + environment: + OAUTH2_PROXY_CLIENT_ID: "xDCHJpfQx6DkJENmZVF80eBqM1fPsPvI5hb65DKt" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_ALERTMANAGER_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_ALERTMANAGER_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "false" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4201" + OAUTH2_PROXY_OIDC_ISSUER_URL: "http://192.168.1.114:9000/application/o/alertmanagerproxy/" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "http://192.168.1.110:4201/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.134:9093" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" oauth2-proxy-finance: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" container_name: "oauth2-proxy-finance" @@ -56,27 +78,65 @@ services: ports: - "9104:9104" environment: - OAUTH2_PROXY_PROVIDER: "${OAUTH2_PROXY_PROVIDER}" - PATH: "${PATH}" - OAUTH2_PROXY_EMAIL_DOMAINS: "${OAUTH2_PROXY_EMAIL_DOMAINS}" - OAUTH2_PROXY_PASS_USER_HEADERS: "${OAUTH2_PROXY_PASS_USER_HEADERS}" - OAUTH2_PROXY_UPSTREAMS: "${OAUTH2_PROXY_UPSTREAMS}" - OAUTH2_PROXY_HTTP_ADDRESS: "${OAUTH2_PROXY_HTTP_ADDRESS}" - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "${OAUTH2_PROXY_SKIP_PROVIDER_BUTTON}" - OAUTH2_PROXY_REDIRECT_URL: "${OAUTH2_PROXY_REDIRECT_URL}" - OAUTH2_PROXY_SET_XAUTHREQUEST: "${OAUTH2_PROXY_SET_XAUTHREQUEST}" - OAUTH2_PROXY_REVERSE_PROXY: "${OAUTH2_PROXY_REVERSE_PROXY}" - OAUTH2_PROXY_TRUSTED_PROXY_IPS: "${OAUTH2_PROXY_TRUSTED_PROXY_IPS}" - OAUTH2_PROXY_OIDC_ISSUER_URL: "${OAUTH2_PROXY_OIDC_ISSUER_URL}" - OAUTH2_PROXY_COOKIE_SECURE: "${OAUTH2_PROXY_COOKIE_SECURE}" - SSL_CERT_FILE: "${SSL_CERT_FILE}" - OAUTH2_PROXY_CLIENT_SECRET: "${OAUTH2_PROXY_CLIENT_SECRET}" # секрет из .env - OAUTH2_PROXY_COOKIE_SECRET: "${OAUTH2_PROXY_COOKIE_SECRET}" # секрет из .env - healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:9104/ping"] - interval: 30s - retries: 3 - + OAUTH2_PROXY_CLIENT_ID: "finance-proxy" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_FINANCE_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_FINANCE_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:9104" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/finance/" + OAUTH2_PROXY_PASS_USER_HEADERS: "true" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://finance.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_SET_XAUTHREQUEST: "true" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_TRUSTED_PROXY_IPS: "192.168.1.0/24,10.88.0.0/24,127.0.0.1/32" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.110:8080" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" + oauth2-proxy-frigate: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-frigate" + restart: "unless-stopped" + network_mode: "host" + environment: + OAUTH2_PROXY_CLIENT_ID: "wg0bbd2Mec0B5DrCdp4s6i4kbNHjtfUlAncLxzhn" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_FRIGATE_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_FRIGATE_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4197" + OAUTH2_PROXY_OIDC_ISSUER_URL: "http://192.168.1.114:9000/application/o/frigateproxy/" + OAUTH2_PROXY_PASS_ACCESS_TOKEN: "true" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://cams.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.126:5000" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" + oauth2-proxy-grafana: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-grafana" + restart: "unless-stopped" + network_mode: "host" + environment: + OAUTH2_PROXY_CLIENT_ID: "ScoMyBH7XCE5D5qAYrbl59dhjBh1xemMvekWtLP5" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_GRAFANA_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_GRAFANA_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "false" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4198" + OAUTH2_PROXY_OIDC_ISSUER_URL: "http://192.168.1.114:9000/application/o/grafanaproxy/" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "http://192.168.1.110:4198/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.113:3000" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" oauth2-proxy-grocy: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" container_name: "oauth2-proxy-grocy" @@ -84,26 +144,208 @@ services: ports: - "9284:4180" environment: - OAUTH2_PROXY_UPSTREAMS: "${OAUTH2_PROXY_UPSTREAMS}" - SSL_CERT_FILE: "${SSL_CERT_FILE}" - OAUTH2_PROXY_COOKIE_SECURE: "${OAUTH2_PROXY_COOKIE_SECURE}" - OAUTH2_PROXY_PASS_USER_HEADERS: "${OAUTH2_PROXY_PASS_USER_HEADERS}" - OAUTH2_PROXY_EMAIL_DOMAINS: "${OAUTH2_PROXY_EMAIL_DOMAINS}" - OAUTH2_PROXY_SET_XAUTHREQUEST: "${OAUTH2_PROXY_SET_XAUTHREQUEST}" - OAUTH2_PROXY_TRUSTED_PROXY_IPS: "${OAUTH2_PROXY_TRUSTED_PROXY_IPS}" - OAUTH2_PROXY_HTTP_ADDRESS: "${OAUTH2_PROXY_HTTP_ADDRESS}" - OAUTH2_PROXY_OIDC_ISSUER_URL: "${OAUTH2_PROXY_OIDC_ISSUER_URL}" - PATH: "${PATH}" - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "${OAUTH2_PROXY_SKIP_PROVIDER_BUTTON}" - OAUTH2_PROXY_PROVIDER: "${OAUTH2_PROXY_PROVIDER}" - OAUTH2_PROXY_REDIRECT_URL: "${OAUTH2_PROXY_REDIRECT_URL}" - OAUTH2_PROXY_COOKIE_SECRET: "${OAUTH2_PROXY_COOKIE_SECRET}" # секрет из .env - OAUTH2_PROXY_CLIENT_SECRET: "${OAUTH2_PROXY_CLIENT_SECRET}" # секрет из .env - healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:4180/ping"] - interval: 30s - retries: 3 - + OAUTH2_PROXY_CLIENT_ID: "UlfdoWX5yK8BpVzw2fAH0y1e6zS2MungwbgQetOr" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_GROCY_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_GROCY_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4180" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/grocy/" + OAUTH2_PROXY_PASS_USER_HEADERS: "true" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://grocy.buryans.ru/oauth2/callback" + OAUTH2_PROXY_SET_XAUTHREQUEST: "true" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_TRUSTED_PROXY_IPS: "192.168.1.0/24,10.88.0.0/24,127.0.0.1/32" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.110:9283/" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" + oauth2-proxy-homebox: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-homebox" + restart: "unless-stopped" + network_mode: "host" + environment: + OAUTH2_PROXY_CLIENT_ID: "EJJirYSkDD5DUb9HMOHgg40kGis7dJMOlIKZtufR" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_HOMEBOX_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_HOMEBOX_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4196" + OAUTH2_PROXY_OIDC_ISSUER_URL: "http://192.168.1.114:9000/application/o/homeboxproxy/" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://homebox.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_UPSTREAMS: "http://127.0.0.1:9287" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" + oauth2-proxy-jackett: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-jackett" + restart: "unless-stopped" + network_mode: "host" + environment: + OAUTH2_PROXY_CLIENT_ID: "ezfgT3TPG42Qnd3oIiytmZWdFWjUfamCWSNPbmdW" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_JACKETT_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_JACKETT_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "false" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4202" + OAUTH2_PROXY_OIDC_ISSUER_URL: "http://192.168.1.114:9000/application/o/jackettproxy/" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "http://192.168.1.110:4202/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.124:9117" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" + oauth2-proxy-jellystat: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-jellystat" + restart: "unless-stopped" + network_mode: "host" + environment: + OAUTH2_PROXY_CLIENT_ID: "Az96M0LyszjbCUeX1GkmYyWqMAXPS5hYh8QiqFvF" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_JELLYSTAT_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_JELLYSTAT_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "false" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4199" + OAUTH2_PROXY_OIDC_ISSUER_URL: "http://192.168.1.114:9000/application/o/jellystatproxy/" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "http://192.168.1.110:4199/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.103:3100" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" + oauth2-proxy-lidarr: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-lidarr" + restart: "unless-stopped" + network_mode: "host" + environment: + OAUTH2_PROXY_CLIENT_ID: "q8XBcuJ3S1Ruxkf1hUbkNOVfuWfnC4kxCOUDBZB3" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_LIDARR_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_LIDARR_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "false" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4200" + OAUTH2_PROXY_OIDC_ISSUER_URL: "http://192.168.1.114:9000/application/o/lidarrproxy/" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "http://192.168.1.110:4200/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.240:8686" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" + oauth2-proxy-logs: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-logs" + restart: "unless-stopped" + network_mode: "host" + environment: + OAUTH2_PROXY_CLIENT_ID: "LwpETORGuJA5ofy1blRPcUUXyEhDk9TbAQfgdUex" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_LOGS_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_LOGS_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:9997" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/logs/" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://logs.buryans.ru/oauth2/callback" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_TRUSTED_PROXY_IPS: "192.168.1.0/24,10.88.0.0/24,127.0.0.1/32" + OAUTH2_PROXY_UPSTREAMS: "http://127.0.0.1:9998/" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" + oauth2-proxy-mealie: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-mealie" + restart: "unless-stopped" + network_mode: "host" + environment: + OAUTH2_PROXY_CLIENT_ID: "nVE4UxKAy5GjQnqXv0P384usm3ZCpLnz5eWdjUoO" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_MEALIE_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_MEALIE_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4195" + OAUTH2_PROXY_OIDC_ISSUER_URL: "http://192.168.1.114:9000/application/o/mealieproxy/" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://meals.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_UPSTREAMS: "http://127.0.0.1:9925" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" + oauth2-proxy-memos: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-memos" + restart: "unless-stopped" + network_mode: "host" + environment: + OAUTH2_PROXY_CLIENT_ID: "Tf1nXJKE3iAcDhl8ek47Xz48RsOfr677ASXcLaw2" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_MEMOS_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_MEMOS_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4194" + OAUTH2_PROXY_OIDC_ISSUER_URL: "http://192.168.1.114:9000/application/o/memosproxy/" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://memos.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_UPSTREAMS: "http://127.0.0.1:5230" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" + oauth2-proxy-metrics: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-metrics" + restart: "unless-stopped" + network_mode: "host" + environment: + OAUTH2_PROXY_CLIENT_ID: "sFC6azBA8ifyaIRJYI2PcZ8sUh24w0YVSL5JdYOA" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_METRICS_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_METRICS_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:9996" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/metrics/" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://metrics.buryans.ru/oauth2/callback" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_TRUSTED_PROXY_IPS: "192.168.1.0/24,10.88.0.0/24,127.0.0.1/32" + OAUTH2_PROXY_UPSTREAMS: "http://127.0.0.1:8092/" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" + oauth2-proxy-monica: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-monica" + restart: "unless-stopped" + network_mode: "host" + environment: + OAUTH2_PROXY_CLIENT_ID: "ZtZGgVGJb5uU8fzMcpLCP0cc4R6pN7egWATkc9lT" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_MONICA_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_MONICA_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:3015" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/monica/" + OAUTH2_PROXY_PASS_USER_HEADERS: "true" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://monica.buryans.ru/oauth2/callback" + OAUTH2_PROXY_SET_XAUTHREQUEST: "true" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_TRUSTED_PROXY_IPS: "192.168.1.0/24,10.88.0.0/24,127.0.0.1/32" + OAUTH2_PROXY_UPSTREAMS: "http://127.0.0.1:8081/" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" oauth2-proxy-paperless: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" container_name: "oauth2-proxy-paperless" @@ -111,101 +353,110 @@ services: ports: - "9981:9981" environment: - OAUTH2_PROXY_PASS_USER_HEADERS: "${OAUTH2_PROXY_PASS_USER_HEADERS}" - OAUTH2_PROXY_UPSTREAMS: "${OAUTH2_PROXY_UPSTREAMS}" - OAUTH2_PROXY_REVERSE_PROXY: "${OAUTH2_PROXY_REVERSE_PROXY}" - PATH: "${PATH}" - OAUTH2_PROXY_PROVIDER: "${OAUTH2_PROXY_PROVIDER}" - OAUTH2_PROXY_EMAIL_DOMAINS: "${OAUTH2_PROXY_EMAIL_DOMAINS}" - OAUTH2_PROXY_OIDC_ISSUER_URL: "${OAUTH2_PROXY_OIDC_ISSUER_URL}" - OAUTH2_PROXY_REDIRECT_URL: "${OAUTH2_PROXY_REDIRECT_URL}" - OAUTH2_PROXY_COOKIE_SECURE: "${OAUTH2_PROXY_COOKIE_SECURE}" - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "${OAUTH2_PROXY_SKIP_PROVIDER_BUTTON}" - SSL_CERT_FILE: "${SSL_CERT_FILE}" - OAUTH2_PROXY_HTTP_ADDRESS: "${OAUTH2_PROXY_HTTP_ADDRESS}" - OAUTH2_PROXY_SET_XAUTHREQUEST: "${OAUTH2_PROXY_SET_XAUTHREQUEST}" - OAUTH2_PROXY_TRUSTED_PROXY_IPS: "${OAUTH2_PROXY_TRUSTED_PROXY_IPS}" - OAUTH2_PROXY_COOKIE_SECRET: "${OAUTH2_PROXY_COOKIE_SECRET}" # секрет из .env - OAUTH2_PROXY_CLIENT_SECRET: "${OAUTH2_PROXY_CLIENT_SECRET}" # секрет из .env - healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:9981/ping"] - interval: 30s - retries: 3 - - oauth2-proxy-logs: + OAUTH2_PROXY_CLIENT_ID: "paperless-proxy" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_PAPERLESS_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_PAPERLESS_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:9981" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/paperless/" + OAUTH2_PROXY_PASS_USER_HEADERS: "true" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://docs.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_SET_XAUTHREQUEST: "true" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_TRUSTED_PROXY_IPS: "192.168.1.0/24,10.88.0.0/24,127.0.0.1/32" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.105:8000" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" + oauth2-proxy-seerr: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" - container_name: "oauth2-proxy-logs" + container_name: "oauth2-proxy-seerr" restart: "unless-stopped" + network_mode: "host" environment: - OAUTH2_PROXY_REDIRECT_URL: "${OAUTH2_PROXY_REDIRECT_URL}" - OAUTH2_PROXY_OIDC_ISSUER_URL: "${OAUTH2_PROXY_OIDC_ISSUER_URL}" - OAUTH2_PROXY_COOKIE_SECURE: "${OAUTH2_PROXY_COOKIE_SECURE}" - PATH: "${PATH}" - OAUTH2_PROXY_PROVIDER: "${OAUTH2_PROXY_PROVIDER}" - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "${OAUTH2_PROXY_SKIP_PROVIDER_BUTTON}" - OAUTH2_PROXY_UPSTREAMS: "${OAUTH2_PROXY_UPSTREAMS}" - SSL_CERT_FILE: "${SSL_CERT_FILE}" - OAUTH2_PROXY_TRUSTED_PROXY_IPS: "${OAUTH2_PROXY_TRUSTED_PROXY_IPS}" - OAUTH2_PROXY_EMAIL_DOMAINS: "${OAUTH2_PROXY_EMAIL_DOMAINS}" - OAUTH2_PROXY_HTTP_ADDRESS: "${OAUTH2_PROXY_HTTP_ADDRESS}" - OAUTH2_PROXY_COOKIE_SECRET: "${OAUTH2_PROXY_COOKIE_SECRET}" # секрет из .env - OAUTH2_PROXY_CLIENT_SECRET: "${OAUTH2_PROXY_CLIENT_SECRET}" # секрет из .env - healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:4180/ping"] - interval: 30s - retries: 3 - + OAUTH2_PROXY_CLIENT_ID: "QNT9thuJnFOiImpGs52L41eShL79ah0lu5ZVHSO9" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_SEERR_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_SEERR_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4190" + OAUTH2_PROXY_OIDC_ISSUER_URL: "http://192.168.1.114:9000/application/o/seerrproxy2/" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://ombi.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.121:5055" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" oauth2-proxy-stirling: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" container_name: "oauth2-proxy-stirling" restart: "unless-stopped" + network_mode: "host" environment: - OAUTH2_PROXY_REDIRECT_URL: "${OAUTH2_PROXY_REDIRECT_URL}" - SSL_CERT_FILE: "${SSL_CERT_FILE}" - OAUTH2_PROXY_EMAIL_DOMAINS: "${OAUTH2_PROXY_EMAIL_DOMAINS}" - OAUTH2_PROXY_COOKIE_SECURE: "${OAUTH2_PROXY_COOKIE_SECURE}" - OAUTH2_PROXY_HTTP_ADDRESS: "${OAUTH2_PROXY_HTTP_ADDRESS}" - OAUTH2_PROXY_PASS_USER_HEADERS: "${OAUTH2_PROXY_PASS_USER_HEADERS}" - OAUTH2_PROXY_PROVIDER: "${OAUTH2_PROXY_PROVIDER}" - OAUTH2_PROXY_SET_XAUTHREQUEST: "${OAUTH2_PROXY_SET_XAUTHREQUEST}" - PATH: "${PATH}" - OAUTH2_PROXY_TRUSTED_PROXY_IPS: "${OAUTH2_PROXY_TRUSTED_PROXY_IPS}" - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "${OAUTH2_PROXY_SKIP_PROVIDER_BUTTON}" - OAUTH2_PROXY_UPSTREAMS: "${OAUTH2_PROXY_UPSTREAMS}" - OAUTH2_PROXY_OIDC_ISSUER_URL: "${OAUTH2_PROXY_OIDC_ISSUER_URL}" - OAUTH2_PROXY_COOKIE_SECRET: "${OAUTH2_PROXY_COOKIE_SECRET}" # секрет из .env - OAUTH2_PROXY_CLIENT_SECRET: "${OAUTH2_PROXY_CLIENT_SECRET}" # секрет из .env - healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:4180/ping"] - interval: 30s - retries: 3 - - oauth2-proxy-3d: + OAUTH2_PROXY_CLIENT_ID: "BWqb2DAvmI4FwAfBw3K4VUUBjveQ54EJ4gu6kNSS" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_STIRLING_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_STIRLING_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:8090" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/stirling/" + OAUTH2_PROXY_PASS_USER_HEADERS: "true" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://pdf.buryans.ru/oauth2/callback" + OAUTH2_PROXY_SET_XAUTHREQUEST: "true" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_TRUSTED_PROXY_IPS: "192.168.1.0/24,10.88.0.0/24,127.0.0.1/32" + OAUTH2_PROXY_UPSTREAMS: "http://127.0.0.1:8089/" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" + oauth2-proxy-syncthing: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" - container_name: "oauth2-proxy-3d" + container_name: "oauth2-proxy-syncthing" restart: "unless-stopped" - ports: - - "9131:9131" + network_mode: "host" environment: - OAUTH2_PROXY_REVERSE_PROXY: "${OAUTH2_PROXY_REVERSE_PROXY}" - OAUTH2_PROXY_COOKIE_NAME: "${OAUTH2_PROXY_COOKIE_NAME}" - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "${OAUTH2_PROXY_SKIP_PROVIDER_BUTTON}" - OAUTH2_PROXY_SESSION_COOKIE_MINIMAL: "${OAUTH2_PROXY_SESSION_COOKIE_MINIMAL}" - OAUTH2_PROXY_SET_XAUTHREQUEST: "${OAUTH2_PROXY_SET_XAUTHREQUEST}" - OAUTH2_PROXY_COOKIE_SAMESITE: "${OAUTH2_PROXY_COOKIE_SAMESITE}" - OAUTH2_PROXY_UPSTREAMS: "${OAUTH2_PROXY_UPSTREAMS}" - OAUTH2_PROXY_PROVIDER: "${OAUTH2_PROXY_PROVIDER}" - OAUTH2_PROXY_TRUSTED_PROXY_IPS: "${OAUTH2_PROXY_TRUSTED_PROXY_IPS}" - OAUTH2_PROXY_COOKIE_SECURE: "${OAUTH2_PROXY_COOKIE_SECURE}" - OAUTH2_PROXY_EMAIL_DOMAINS: "${OAUTH2_PROXY_EMAIL_DOMAINS}" - OAUTH2_PROXY_HTTP_ADDRESS: "${OAUTH2_PROXY_HTTP_ADDRESS}" - PATH: "${PATH}" - OAUTH2_PROXY_OIDC_ISSUER_URL: "${OAUTH2_PROXY_OIDC_ISSUER_URL}" - SSL_CERT_FILE: "${SSL_CERT_FILE}" - OAUTH2_PROXY_CLIENT_SECRET: "${OAUTH2_PROXY_CLIENT_SECRET}" # секрет из .env - OAUTH2_PROXY_COOKIE_SECRET: "${OAUTH2_PROXY_COOKIE_SECRET}" # секрет из .env - healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:9131/ping"] - interval: 30s - retries: 3 - + OAUTH2_PROXY_CLIENT_ID: "vaquoc8Ep7uVXd4IyB0G4vareAclswYTaExmkWDR" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_SYNCTHING_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_SYNCTHING_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4192" + OAUTH2_PROXY_OIDC_ISSUER_URL: "http://192.168.1.114:9000/application/o/syncthingproxy/" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://sync.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.139:8384" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" + oauth2-proxy-vikunja: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-vikunja" + restart: "unless-stopped" + network_mode: "host" + environment: + OAUTH2_PROXY_CLIENT_ID: "eDEODeRTRalusZv08WHV5TLPw4xWIJwD82ZItFBf" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_VIKUNJA_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_VIKUNJA_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4193" + OAUTH2_PROXY_OIDC_ISSUER_URL: "http://192.168.1.114:9000/application/o/vikunjaproxy/" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://vikunja.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_UPSTREAMS: "http://127.0.0.1:9285" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" +volumes: + a96f654f0260e2ae6d63645b081ccb96c46d6fad265e8e09625ff89f10cd6577: + external: true +networks: + ct110_default: + external: true diff --git a/deploy/ct115/oauth2-env.example b/deploy/ct115/oauth2-env.example new file mode 100644 index 0000000..826ed04 --- /dev/null +++ b/deploy/ct115/oauth2-env.example @@ -0,0 +1,3 @@ +# Значения положить в .env на CT115 (chmod 600) +OAUTH2_PROXY_OPENCLAW_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_OPENCLAW_OAUTH2_PROXY_COOKIE_SECRET= diff --git a/deploy/ct115/oauth2-proxy.compose.yml b/deploy/ct115/oauth2-proxy.compose.yml index 8388c4b..dacac39 100644 --- a/deploy/ct115/oauth2-proxy.compose.yml +++ b/deploy/ct115/oauth2-proxy.compose.yml @@ -1,31 +1,37 @@ -# oauth2-proxy для CT115 — сгенерировано из живого состояния -# НЕ содержит секретов: они подставляются из .env на CT +# Сгенерировано oauth2-compose.py по живому состоянию (10.11.2026). +# Секреты — в .env на CT (права 600), в Git не попадают. +# Проверка: docker compose -f oauth2-proxy.compose.yml config + services: oauth2-proxy-openclaw: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" container_name: "oauth2-proxy-openclaw" restart: "unless-stopped" + networks: + - "ct115_default" + security_opt: + - "apparmor=unconfined" ports: - "9108:9108" environment: - SSL_CERT_FILE: "${SSL_CERT_FILE}" - OAUTH2_PROXY_REDIRECT_URL: "${OAUTH2_PROXY_REDIRECT_URL}" - OAUTH2_PROXY_TRUSTED_PROXY_IPS: "${OAUTH2_PROXY_TRUSTED_PROXY_IPS}" - OAUTH2_PROXY_COOKIE_SECURE: "${OAUTH2_PROXY_COOKIE_SECURE}" - OAUTH2_PROXY_REVERSE_PROXY: "${OAUTH2_PROXY_REVERSE_PROXY}" - OAUTH2_PROXY_PROVIDER: "${OAUTH2_PROXY_PROVIDER}" - PATH: "${PATH}" - OAUTH2_PROXY_EMAIL_DOMAINS: "${OAUTH2_PROXY_EMAIL_DOMAINS}" - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "${OAUTH2_PROXY_SKIP_PROVIDER_BUTTON}" - OAUTH2_PROXY_HTTP_ADDRESS: "${OAUTH2_PROXY_HTTP_ADDRESS}" - OAUTH2_PROXY_UPSTREAMS: "${OAUTH2_PROXY_UPSTREAMS}" - OAUTH2_PROXY_PASS_USER_HEADERS: "${OAUTH2_PROXY_PASS_USER_HEADERS}" - OAUTH2_PROXY_SET_XAUTHREQUEST: "${OAUTH2_PROXY_SET_XAUTHREQUEST}" - OAUTH2_PROXY_OIDC_ISSUER_URL: "${OAUTH2_PROXY_OIDC_ISSUER_URL}" - OAUTH2_PROXY_COOKIE_SECRET: "${OAUTH2_PROXY_COOKIE_SECRET}" # секрет из .env - OAUTH2_PROXY_CLIENT_SECRET: "${OAUTH2_PROXY_CLIENT_SECRET}" # секрет из .env - healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:9108/ping"] - interval: 30s - retries: 3 - + OAUTH2_PROXY_CLIENT_ID: "openclaw-proxy" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_OPENCLAW_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_OPENCLAW_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:9108" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/openclaw/" + OAUTH2_PROXY_PASS_USER_HEADERS: "true" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://openclaw.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_SET_XAUTHREQUEST: "true" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_TRUSTED_PROXY_IPS: "192.168.1.0/24,10.88.0.0/24,127.0.0.1/32" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.115:18789" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" +networks: + ct115_default: + external: true diff --git a/deploy/ct117/oauth2-env.example b/deploy/ct117/oauth2-env.example new file mode 100644 index 0000000..39383de --- /dev/null +++ b/deploy/ct117/oauth2-env.example @@ -0,0 +1,3 @@ +# Значения положить в .env на CT117 (chmod 600) +OAUTH2_PROXY_SONARR_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_SONARR_OAUTH2_PROXY_COOKIE_SECRET= diff --git a/deploy/ct117/oauth2-proxy.compose.yml b/deploy/ct117/oauth2-proxy.compose.yml index c137440..61884e3 100644 --- a/deploy/ct117/oauth2-proxy.compose.yml +++ b/deploy/ct117/oauth2-proxy.compose.yml @@ -1,31 +1,35 @@ -# oauth2-proxy для CT117 — сгенерировано из живого состояния -# НЕ содержит секретов: они подставляются из .env на CT +# Сгенерировано oauth2-compose.py по живому состоянию (10.11.2026). +# Секреты — в .env на CT (права 600), в Git не попадают. +# Проверка: docker compose -f oauth2-proxy.compose.yml config + services: oauth2-proxy-sonarr: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" container_name: "oauth2-proxy-sonarr" restart: "unless-stopped" + networks: + - "ct117_default" ports: - "9989:9989" environment: - OAUTH2_PROXY_PROVIDER: "${OAUTH2_PROXY_PROVIDER}" - OAUTH2_PROXY_HTTP_ADDRESS: "${OAUTH2_PROXY_HTTP_ADDRESS}" - OAUTH2_PROXY_TRUSTED_PROXY_IPS: "${OAUTH2_PROXY_TRUSTED_PROXY_IPS}" - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "${OAUTH2_PROXY_SKIP_PROVIDER_BUTTON}" - OAUTH2_PROXY_REVERSE_PROXY: "${OAUTH2_PROXY_REVERSE_PROXY}" - SSL_CERT_FILE: "${SSL_CERT_FILE}" - PATH: "${PATH}" - OAUTH2_PROXY_UPSTREAMS: "${OAUTH2_PROXY_UPSTREAMS}" - OAUTH2_PROXY_EMAIL_DOMAINS: "${OAUTH2_PROXY_EMAIL_DOMAINS}" - OAUTH2_PROXY_REDIRECT_URL: "${OAUTH2_PROXY_REDIRECT_URL}" - OAUTH2_PROXY_SET_XAUTHREQUEST: "${OAUTH2_PROXY_SET_XAUTHREQUEST}" - OAUTH2_PROXY_OIDC_ISSUER_URL: "${OAUTH2_PROXY_OIDC_ISSUER_URL}" - OAUTH2_PROXY_PASS_USER_HEADERS: "${OAUTH2_PROXY_PASS_USER_HEADERS}" - OAUTH2_PROXY_COOKIE_SECURE: "${OAUTH2_PROXY_COOKIE_SECURE}" - OAUTH2_PROXY_COOKIE_SECRET: "${OAUTH2_PROXY_COOKIE_SECRET}" # секрет из .env - OAUTH2_PROXY_CLIENT_SECRET: "${OAUTH2_PROXY_CLIENT_SECRET}" # секрет из .env - healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:9989/ping"] - interval: 30s - retries: 3 - + OAUTH2_PROXY_CLIENT_ID: "sonarr-proxy" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_SONARR_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_SONARR_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:9989" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/sonarr/" + OAUTH2_PROXY_PASS_USER_HEADERS: "true" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://sonarr.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_SET_XAUTHREQUEST: "true" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_TRUSTED_PROXY_IPS: "192.168.1.0/24,10.88.0.0/24,127.0.0.1/32" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.117:8989" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" +networks: + ct117_default: + external: true diff --git a/deploy/ct118/oauth2-env.example b/deploy/ct118/oauth2-env.example new file mode 100644 index 0000000..414646b --- /dev/null +++ b/deploy/ct118/oauth2-env.example @@ -0,0 +1,3 @@ +# Значения положить в .env на CT118 (chmod 600) +OAUTH2_PROXY_RADARR_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_RADARR_OAUTH2_PROXY_COOKIE_SECRET= diff --git a/deploy/ct118/oauth2-proxy.compose.yml b/deploy/ct118/oauth2-proxy.compose.yml index 5b5ecd3..a384be2 100644 --- a/deploy/ct118/oauth2-proxy.compose.yml +++ b/deploy/ct118/oauth2-proxy.compose.yml @@ -1,31 +1,35 @@ -# oauth2-proxy для CT118 — сгенерировано из живого состояния -# НЕ содержит секретов: они подставляются из .env на CT +# Сгенерировано oauth2-compose.py по живому состоянию (10.11.2026). +# Секреты — в .env на CT (права 600), в Git не попадают. +# Проверка: docker compose -f oauth2-proxy.compose.yml config + services: oauth2-proxy-radarr: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" container_name: "oauth2-proxy-radarr" restart: "unless-stopped" + networks: + - "ct118_default" ports: - "9988:9988" environment: - OAUTH2_PROXY_COOKIE_SECURE: "${OAUTH2_PROXY_COOKIE_SECURE}" - PATH: "${PATH}" - SSL_CERT_FILE: "${SSL_CERT_FILE}" - OAUTH2_PROXY_SET_XAUTHREQUEST: "${OAUTH2_PROXY_SET_XAUTHREQUEST}" - OAUTH2_PROXY_OIDC_ISSUER_URL: "${OAUTH2_PROXY_OIDC_ISSUER_URL}" - OAUTH2_PROXY_EMAIL_DOMAINS: "${OAUTH2_PROXY_EMAIL_DOMAINS}" - OAUTH2_PROXY_PASS_USER_HEADERS: "${OAUTH2_PROXY_PASS_USER_HEADERS}" - OAUTH2_PROXY_REDIRECT_URL: "${OAUTH2_PROXY_REDIRECT_URL}" - OAUTH2_PROXY_UPSTREAMS: "${OAUTH2_PROXY_UPSTREAMS}" - OAUTH2_PROXY_HTTP_ADDRESS: "${OAUTH2_PROXY_HTTP_ADDRESS}" - OAUTH2_PROXY_REVERSE_PROXY: "${OAUTH2_PROXY_REVERSE_PROXY}" - OAUTH2_PROXY_TRUSTED_PROXY_IPS: "${OAUTH2_PROXY_TRUSTED_PROXY_IPS}" - OAUTH2_PROXY_PROVIDER: "${OAUTH2_PROXY_PROVIDER}" - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "${OAUTH2_PROXY_SKIP_PROVIDER_BUTTON}" - OAUTH2_PROXY_CLIENT_SECRET: "${OAUTH2_PROXY_CLIENT_SECRET}" # секрет из .env - OAUTH2_PROXY_COOKIE_SECRET: "${OAUTH2_PROXY_COOKIE_SECRET}" # секрет из .env - healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:9988/ping"] - interval: 30s - retries: 3 - + OAUTH2_PROXY_CLIENT_ID: "radarr-proxy" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_RADARR_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_RADARR_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:9988" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/radarr/" + OAUTH2_PROXY_PASS_USER_HEADERS: "true" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://radarr.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_SET_XAUTHREQUEST: "true" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_TRUSTED_PROXY_IPS: "192.168.1.0/24,10.88.0.0/24,127.0.0.1/32" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.118:7878" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" +networks: + ct118_default: + external: true diff --git a/deploy/ct119/oauth2-env.example b/deploy/ct119/oauth2-env.example new file mode 100644 index 0000000..ae1b039 --- /dev/null +++ b/deploy/ct119/oauth2-env.example @@ -0,0 +1,3 @@ +# Значения положить в .env на CT119 (chmod 600) +OAUTH2_PROXY_PROWLARR_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_PROWLARR_OAUTH2_PROXY_COOKIE_SECRET= diff --git a/deploy/ct119/oauth2-proxy.compose.yml b/deploy/ct119/oauth2-proxy.compose.yml index e6a89da..300bcc6 100644 --- a/deploy/ct119/oauth2-proxy.compose.yml +++ b/deploy/ct119/oauth2-proxy.compose.yml @@ -1,31 +1,35 @@ -# oauth2-proxy для CT119 — сгенерировано из живого состояния -# НЕ содержит секретов: они подставляются из .env на CT +# Сгенерировано oauth2-compose.py по живому состоянию (10.11.2026). +# Секреты — в .env на CT (права 600), в Git не попадают. +# Проверка: docker compose -f oauth2-proxy.compose.yml config + services: oauth2-proxy-prowlarr: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" container_name: "oauth2-proxy-prowlarr" restart: "unless-stopped" + networks: + - "ct119_default" ports: - "9987:9987" environment: - OAUTH2_PROXY_COOKIE_SECURE: "${OAUTH2_PROXY_COOKIE_SECURE}" - OAUTH2_PROXY_PROVIDER: "${OAUTH2_PROXY_PROVIDER}" - OAUTH2_PROXY_PASS_USER_HEADERS: "${OAUTH2_PROXY_PASS_USER_HEADERS}" - OAUTH2_PROXY_EMAIL_DOMAINS: "${OAUTH2_PROXY_EMAIL_DOMAINS}" - OAUTH2_PROXY_REDIRECT_URL: "${OAUTH2_PROXY_REDIRECT_URL}" - OAUTH2_PROXY_SET_XAUTHREQUEST: "${OAUTH2_PROXY_SET_XAUTHREQUEST}" - OAUTH2_PROXY_OIDC_ISSUER_URL: "${OAUTH2_PROXY_OIDC_ISSUER_URL}" - OAUTH2_PROXY_UPSTREAMS: "${OAUTH2_PROXY_UPSTREAMS}" - OAUTH2_PROXY_HTTP_ADDRESS: "${OAUTH2_PROXY_HTTP_ADDRESS}" - SSL_CERT_FILE: "${SSL_CERT_FILE}" - OAUTH2_PROXY_TRUSTED_PROXY_IPS: "${OAUTH2_PROXY_TRUSTED_PROXY_IPS}" - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "${OAUTH2_PROXY_SKIP_PROVIDER_BUTTON}" - OAUTH2_PROXY_REVERSE_PROXY: "${OAUTH2_PROXY_REVERSE_PROXY}" - PATH: "${PATH}" - OAUTH2_PROXY_COOKIE_SECRET: "${OAUTH2_PROXY_COOKIE_SECRET}" # секрет из .env - OAUTH2_PROXY_CLIENT_SECRET: "${OAUTH2_PROXY_CLIENT_SECRET}" # секрет из .env - healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:9987/ping"] - interval: 30s - retries: 3 - + OAUTH2_PROXY_CLIENT_ID: "prowlarr-proxy" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_PROWLARR_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_PROWLARR_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:9987" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/prowlarr/" + OAUTH2_PROXY_PASS_USER_HEADERS: "true" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://prowlarr.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_SET_XAUTHREQUEST: "true" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_TRUSTED_PROXY_IPS: "192.168.1.0/24,10.88.0.0/24,127.0.0.1/32" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.119:9696" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" +networks: + ct119_default: + external: true diff --git a/deploy/ct155/oauth2-env.example b/deploy/ct155/oauth2-env.example new file mode 100644 index 0000000..d98e8e2 --- /dev/null +++ b/deploy/ct155/oauth2-env.example @@ -0,0 +1,3 @@ +# Значения положить в .env на CT155 (chmod 600) +OAUTH2_PROXY_ELEMENT_OAUTH2_PROXY_CLIENT_SECRET= +OAUTH2_PROXY_ELEMENT_OAUTH2_PROXY_COOKIE_SECRET= diff --git a/deploy/ct155/oauth2-proxy.compose.yml b/deploy/ct155/oauth2-proxy.compose.yml index fb9d221..bed343c 100644 --- a/deploy/ct155/oauth2-proxy.compose.yml +++ b/deploy/ct155/oauth2-proxy.compose.yml @@ -1,31 +1,37 @@ -# oauth2-proxy для CT155 — сгенерировано из живого состояния -# НЕ содержит секретов: они подставляются из .env на CT +# Сгенерировано oauth2-compose.py по живому состоянию (10.11.2026). +# Секреты — в .env на CT (права 600), в Git не попадают. +# Проверка: docker compose -f oauth2-proxy.compose.yml config + services: oauth2-proxy-element: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" container_name: "oauth2-proxy-element" restart: "unless-stopped" + networks: + - "ct155_default" + security_opt: + - "apparmor=unconfined" ports: - "9103:9103" environment: - OAUTH2_PROXY_PASS_USER_HEADERS: "${OAUTH2_PROXY_PASS_USER_HEADERS}" - OAUTH2_PROXY_COOKIE_SECURE: "${OAUTH2_PROXY_COOKIE_SECURE}" - OAUTH2_PROXY_OIDC_ISSUER_URL: "${OAUTH2_PROXY_OIDC_ISSUER_URL}" - OAUTH2_PROXY_SET_XAUTHREQUEST: "${OAUTH2_PROXY_SET_XAUTHREQUEST}" - OAUTH2_PROXY_HTTP_ADDRESS: "${OAUTH2_PROXY_HTTP_ADDRESS}" - PATH: "${PATH}" - OAUTH2_PROXY_REVERSE_PROXY: "${OAUTH2_PROXY_REVERSE_PROXY}" - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "${OAUTH2_PROXY_SKIP_PROVIDER_BUTTON}" - OAUTH2_PROXY_TRUSTED_PROXY_IPS: "${OAUTH2_PROXY_TRUSTED_PROXY_IPS}" - OAUTH2_PROXY_EMAIL_DOMAINS: "${OAUTH2_PROXY_EMAIL_DOMAINS}" - OAUTH2_PROXY_UPSTREAMS: "${OAUTH2_PROXY_UPSTREAMS}" - OAUTH2_PROXY_PROVIDER: "${OAUTH2_PROXY_PROVIDER}" - OAUTH2_PROXY_REDIRECT_URL: "${OAUTH2_PROXY_REDIRECT_URL}" - SSL_CERT_FILE: "${SSL_CERT_FILE}" - OAUTH2_PROXY_COOKIE_SECRET: "${OAUTH2_PROXY_COOKIE_SECRET}" # секрет из .env - OAUTH2_PROXY_CLIENT_SECRET: "${OAUTH2_PROXY_CLIENT_SECRET}" # секрет из .env - healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:9103/ping"] - interval: 30s - retries: 3 - + OAUTH2_PROXY_CLIENT_ID: "element-proxy" + OAUTH2_PROXY_CLIENT_SECRET: ${OAUTH2_PROXY_ELEMENT_OAUTH2_PROXY_CLIENT_SECRET} + OAUTH2_PROXY_COOKIE_SECRET: ${OAUTH2_PROXY_ELEMENT_OAUTH2_PROXY_COOKIE_SECRET} + OAUTH2_PROXY_COOKIE_SECURE: "true" + OAUTH2_PROXY_EMAIL_DOMAINS: "*" + OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:9103" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://authentik.buryans.ru/application/o/element/" + OAUTH2_PROXY_PASS_USER_HEADERS: "true" + OAUTH2_PROXY_PROVIDER: "oidc" + OAUTH2_PROXY_REDIRECT_URL: "https://element.buryans.ru/oauth2/callback" + OAUTH2_PROXY_REVERSE_PROXY: "true" + OAUTH2_PROXY_SET_XAUTHREQUEST: "true" + OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_TRUSTED_PROXY_IPS: "192.168.1.0/24,10.88.0.0/24,127.0.0.1/32" + OAUTH2_PROXY_UPSTREAMS: "http://192.168.1.155:8088" + SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" + entrypoint: + - "/bin/oauth2-proxy" +networks: + ct155_default: + external: true diff --git a/ops/scripts/check_sso_providers.py b/ops/scripts/check_sso_providers.py index 9b15267..8d59381 100755 --- a/ops/scripts/check_sso_providers.py +++ b/ops/scripts/check_sso_providers.py @@ -46,6 +46,29 @@ def problems(p): return out +def outside_compose(): + """oauth2-proxy без compose = конфигурация не сохранена, потеряется при пересоздании.""" + out = [] + try: + cts = subprocess.run("pct list | awk 'NR>1{print $1}'", shell=True, + capture_output=True, text=True, timeout=30).stdout.split() + except Exception: + return out + for ct in cts: + names = subprocess.run("pct exec %s -- docker ps --format '{{.Names}}'" % ct, + shell=True, capture_output=True, text=True, timeout=30).stdout.split() + for n in names: + if not n.startswith("oauth2-proxy"): + continue + proj = subprocess.run( + "pct exec %s -- docker inspect %s --format " + "'{{index .Config.Labels \"com.docker.compose.project\"}}'" % (ct, n), + shell=True, capture_output=True, text=True, timeout=30).stdout.strip() + if not proj or proj == "": + out.append("CT%s %s" % (ct, n)) + return out + + def main(): fix = "--fix" in sys.argv d = api("/providers/oauth2/?page_size=100") @@ -92,7 +115,15 @@ def main(): elif issuer: print(" ✓ oauth2-proxy issuer: %s" % issuer) - return 1 if bad else 0 + lost = outside_compose() + if lost: + print(" ⛔ oauth2-proxy вне compose (конфиг потеряется): %d" % len(lost)) + for x in lost[:10]: + print(" %s" % x) + else: + print(" ✓ все oauth2-proxy под compose") + + return 1 if (bad or lost) else 0 if __name__ == "__main__": diff --git a/ops/scripts/oauth2-compose.py b/ops/scripts/oauth2-compose.py new file mode 100755 index 0000000..d98d300 --- /dev/null +++ b/ops/scripts/oauth2-compose.py @@ -0,0 +1,76 @@ +#!/usr/bin/env python3 +"""Выгружает все oauth2-proxy в compose-файлы репозитория. + +Зачем: 43 контейнера созданы `docker run` — конфигурация нигде не сохранена. +При пересоздании (обновление образа, перезагрузка) настройки теряются. + +Правила: + * где `deploy/ctNNN/docker-compose.yml` ещё нет — пишем туда; + * где уже есть — пишем отдельный `oauth2-proxy.compose.yml` + (так уже сделано для ct118 и ct119); + * секреты в Git не попадают: в compose ${VAR}, значения — в /root/.env-out. + +Запуск: python3 ops/scripts/oauth2-compose.py [--dry] +""" +import importlib.util +import os +import sys + +REPO = "/root/buryan-infra" +D2C = os.path.join(REPO, "ops", "scripts", "docker-to-compose.py") + +spec = importlib.util.spec_from_file_location("d2c", D2C) +d2c = importlib.util.module_from_spec(spec) +spec.loader.exec_module(d2c) + + +def main(): + dry = "--dry" in sys.argv + import subprocess + cts = subprocess.run("pct list | awk 'NR>1{print $1}'", shell=True, + capture_output=True, text=True).stdout.split() + total = 0 + written = [] + for ct in cts: + try: + services, volumes, envfile, networks = d2c.build(ct) + except Exception as e: + print("CT%s: ошибка %s" % (ct, str(e)[:60])) + continue + # берём только oauth2-proxy + services = {k: v for k, v in services.items() if k.startswith("oauth2-proxy")} + if not services: + continue + d = os.path.join(REPO, "deploy", "ct" + ct) + main_file = os.path.join(d, "docker-compose.yml") + target = main_file if not os.path.exists(main_file) else os.path.join( + d, "oauth2-proxy.compose.yml") + body = ("# Сгенерировано oauth2-compose.py по живому состоянию (10.11.2026).\n" + "# Секреты — в .env на CT (права 600), в Git не попадают.\n" + "# Проверка: docker compose -f %s config\n\n" + % os.path.basename(target)) + d2c.yaml_dump(services, volumes, networks) + print("%-8s %-2d служб -> %s" % ("CT" + ct, len(services), + os.path.relpath(target, REPO))) + written.append((ct, target, len(services), len(envfile))) + total += len(services) + if dry: + continue + os.makedirs(d, exist_ok=True) + with open(target, "w", encoding="utf-8") as f: + f.write(body) + with open(os.path.join(d, "oauth2-env.example"), "w", encoding="utf-8") as f: + f.write("# Значения положить в .env на CT%s (chmod 600)\n" % ct) + for k in sorted(envfile): + f.write("%s=\n" % k) + os.makedirs("/root/.env-out", exist_ok=True) + envpath = "/root/.env-out/ct%s.env" % ct + with open(envpath, "w", encoding="utf-8") as f: + for k in sorted(envfile): + f.write('%s="%s"\n' % (k, envfile[k])) + os.chmod(envpath, 0o600) + print("\nвсего служб:", total, "| файлов:", len(written)) + return 0 + + +if __name__ == "__main__": + raise SystemExit(main()) diff --git a/ops/sso/OAUTH2-COMPOSE.md b/ops/sso/OAUTH2-COMPOSE.md new file mode 100644 index 0000000..91f14ae --- /dev/null +++ b/ops/sso/OAUTH2-COMPOSE.md @@ -0,0 +1,74 @@ +# 32 oauth2-proxy переведены под compose (10.11.2026) + +## Проблема + +Вход в сервисы защищён `oauth2-proxy`, но **43 контейнера** созданы командой +`docker run` — конфигурация нигде не сохранена. Пересоздали контейнер +(обновление образа, перезагрузка) — настройки потеряны. С Vaultwarden это +уже случилось: мы восстанавливали прокси вручную. + +В репозитории было только **10 compose-файлов** из 43. + +## Что сделано + +### Генератор `ops/scripts/oauth2-compose.py` + +Читает живое состояние (`docker inspect`) и выгружает все oauth2-proxy в +compose. Использует готовый `docker-to-compose.py` для сборки YAML. + +Правила: + +* где `deploy/ctNNN/docker-compose.yml` ещё нет — пишем туда; +* где есть — отдельный `oauth2-proxy.compose.yml` (как уже было у ct118/ct119); +* секреты в Git **не попадают**: в compose `${VAR}`, значения — в + `/root/.env-out/ctNNN.env` (права 600). + +### Сгенерировано 11 файлов, 32 службы + +``` +CT102 1 CT107 1 CT115 1 CT119 1 +CT106 1 CT108 2 CT117 1 CT155 1 +CT109 1 CT110 21 CT118 1 +``` + +Проверка YAML: 32 службы, 0 битых, **0 файлов с открытыми секретами**. + +### Контейнеры переведены под compose + +Процедура на каждый CT: доставить compose + env → удалить ручной контейнер → +`docker compose up -d` → проверить порт. + +``` +итог: служб 32 | отвечают 32 | проблем 0 +вне compose всего: 0 +``` + +Простой на службу — около 4 секунд. + +## Ловушка при проверке + +Первый замер показал «4 из 21 портов отвечают» на CT110. Оказалось, +у части прокси `network_mode: host` (порт в `HTTP_ADDRESS`), у части — +проброс (`9284:4180`). Проверять надо **по портам из compose**, а не по +`HTTP_ADDRESS`. После правильной проверки — 32 из 32. + +## Защита от повторения + +`check_sso_providers.py` (задание Hermes `sso-providers`, ежедневно 07:05) +теперь проверяет ещё и это: + +``` +✓ все oauth2-proxy под compose +``` + +Появится новый контейнер через `docker run` — станет событием в шине. + +## Что осталось + +1. **Значения секретов** лежат в `/root/.env-out/ctNNN.env` (600) и + продублированы на CT в `/opt/buryan-hub/oauth2.env`. При ротации менять + в обоих местах. +2. **Не автоматизирован откат**: если compose-файл окажется неверным, + вернуть ручной контейнер можно из резервных копий `.bak-*`. +3. Проверить вход в сервисы, которые давно не открывались (grocy, monica, + stirling, memos) — они были среди сломанных SSO-провайдеров.