From d5c0ebc0946a7bb1d99a0168d8a37c612b264ddb Mon Sep 17 00:00:00 2001 From: Roman Buryan Date: Fri, 6 Nov 2026 11:08:04 +0300 Subject: [PATCH] =?UTF-8?q?[SPRINT-V1][B]=20oauth2-proxy=20=D0=B2=20Git:?= =?UTF-8?q?=2018=20=D0=BF=D1=80=D0=BE=D0=BA=D1=81=D0=B8=20=D1=8D=D0=BA?= =?UTF-8?q?=D1=81=D0=BF=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=B2=20deploy/ctNNN/*.compose.yml=20(=D0=B1?= =?UTF-8?q?=D0=B5=D0=B7=20=D1=81=D0=B5=D0=BA=D1=80=D0=B5=D1=82=D0=BE=D0=B2?= =?UTF-8?q?);=20=D1=80=D0=B5=D0=B5=D1=81=D1=82=D1=80:=20SSO=2019=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/ct102/oauth2-proxy.compose.yml | 31 +++ deploy/ct106/oauth2-proxy.compose.yml | 34 +++ deploy/ct107/oauth2-proxy.compose.yml | 31 +++ deploy/ct108/oauth2-proxy.compose.yml | 61 +++++ deploy/ct110/oauth2-proxy.compose.yml | 211 ++++++++++++++++ deploy/ct115/oauth2-proxy.compose.yml | 31 +++ deploy/ct117/oauth2-proxy.compose.yml | 31 +++ deploy/ct118/oauth2-proxy.compose.yml | 31 +++ deploy/ct119/oauth2-proxy.compose.yml | 31 +++ deploy/ct155/oauth2-proxy.compose.yml | 31 +++ ops/infra/README.md | 30 +-- ops/infra/registry.yaml | 346 +++++++++++++------------- ops/scripts/build_registry_v2.py | 19 ++ 13 files changed, 730 insertions(+), 188 deletions(-) create mode 100644 deploy/ct102/oauth2-proxy.compose.yml create mode 100644 deploy/ct106/oauth2-proxy.compose.yml create mode 100644 deploy/ct107/oauth2-proxy.compose.yml create mode 100644 deploy/ct108/oauth2-proxy.compose.yml create mode 100644 deploy/ct110/oauth2-proxy.compose.yml create mode 100644 deploy/ct115/oauth2-proxy.compose.yml create mode 100644 deploy/ct117/oauth2-proxy.compose.yml create mode 100644 deploy/ct118/oauth2-proxy.compose.yml create mode 100644 deploy/ct119/oauth2-proxy.compose.yml create mode 100644 deploy/ct155/oauth2-proxy.compose.yml diff --git a/deploy/ct102/oauth2-proxy.compose.yml b/deploy/ct102/oauth2-proxy.compose.yml new file mode 100644 index 0000000..8bc7440 --- /dev/null +++ b/deploy/ct102/oauth2-proxy.compose.yml @@ -0,0 +1,31 @@ +# oauth2-proxy для CT102 — сгенерировано из живого состояния +# НЕ содержит секретов: они подставляются из .env на CT +services: + oauth2-proxy-dashy: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-dashy" + restart: "unless-stopped" + 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 + diff --git a/deploy/ct106/oauth2-proxy.compose.yml b/deploy/ct106/oauth2-proxy.compose.yml new file mode 100644 index 0000000..99904e0 --- /dev/null +++ b/deploy/ct106/oauth2-proxy.compose.yml @@ -0,0 +1,34 @@ +# oauth2-proxy для CT106 — сгенерировано из живого состояния +# НЕ содержит секретов: они подставляются из .env на CT +services: + oauth2-proxy-home: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-home" + restart: "unless-stopped" + 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 + diff --git a/deploy/ct107/oauth2-proxy.compose.yml b/deploy/ct107/oauth2-proxy.compose.yml new file mode 100644 index 0000000..466739a --- /dev/null +++ b/deploy/ct107/oauth2-proxy.compose.yml @@ -0,0 +1,31 @@ +# oauth2-proxy для CT107 — сгенерировано из живого состояния +# НЕ содержит секретов: они подставляются из .env на CT +services: + oauth2-proxy-status: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-status" + restart: "unless-stopped" + 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 + diff --git a/deploy/ct108/oauth2-proxy.compose.yml b/deploy/ct108/oauth2-proxy.compose.yml new file mode 100644 index 0000000..95f5712 --- /dev/null +++ b/deploy/ct108/oauth2-proxy.compose.yml @@ -0,0 +1,61 @@ +# oauth2-proxy для CT108 — сгенерировано из живого состояния +# НЕ содержит секретов: они подставляются из .env на CT +services: + oauth2-proxy-n8n: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-n8n" + restart: "unless-stopped" + 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-nodered: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-nodered" + restart: "unless-stopped" + 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 + diff --git a/deploy/ct110/oauth2-proxy.compose.yml b/deploy/ct110/oauth2-proxy.compose.yml new file mode 100644 index 0000000..5f1b63d --- /dev/null +++ b/deploy/ct110/oauth2-proxy.compose.yml @@ -0,0 +1,211 @@ +# oauth2-proxy для CT110 — сгенерировано из живого состояния +# НЕ содержит секретов: они подставляются из .env на CT +services: + oauth2-proxy-monica: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-monica" + restart: "unless-stopped" + 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: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-metrics" + restart: "unless-stopped" + 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-finance: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-finance" + restart: "unless-stopped" + 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-grocy: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-grocy" + restart: "unless-stopped" + 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-paperless: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-paperless" + restart: "unless-stopped" + 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: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-logs" + restart: "unless-stopped" + 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-stirling: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-stirling" + restart: "unless-stopped" + 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: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-3d" + restart: "unless-stopped" + ports: + - "9131:9131" + 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 + diff --git a/deploy/ct115/oauth2-proxy.compose.yml b/deploy/ct115/oauth2-proxy.compose.yml new file mode 100644 index 0000000..8388c4b --- /dev/null +++ b/deploy/ct115/oauth2-proxy.compose.yml @@ -0,0 +1,31 @@ +# oauth2-proxy для CT115 — сгенерировано из живого состояния +# НЕ содержит секретов: они подставляются из .env на CT +services: + oauth2-proxy-openclaw: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-openclaw" + restart: "unless-stopped" + 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 + diff --git a/deploy/ct117/oauth2-proxy.compose.yml b/deploy/ct117/oauth2-proxy.compose.yml new file mode 100644 index 0000000..c137440 --- /dev/null +++ b/deploy/ct117/oauth2-proxy.compose.yml @@ -0,0 +1,31 @@ +# oauth2-proxy для CT117 — сгенерировано из живого состояния +# НЕ содержит секретов: они подставляются из .env на CT +services: + oauth2-proxy-sonarr: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-sonarr" + restart: "unless-stopped" + 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 + diff --git a/deploy/ct118/oauth2-proxy.compose.yml b/deploy/ct118/oauth2-proxy.compose.yml new file mode 100644 index 0000000..5b5ecd3 --- /dev/null +++ b/deploy/ct118/oauth2-proxy.compose.yml @@ -0,0 +1,31 @@ +# oauth2-proxy для CT118 — сгенерировано из живого состояния +# НЕ содержит секретов: они подставляются из .env на CT +services: + oauth2-proxy-radarr: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-radarr" + restart: "unless-stopped" + 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 + diff --git a/deploy/ct119/oauth2-proxy.compose.yml b/deploy/ct119/oauth2-proxy.compose.yml new file mode 100644 index 0000000..e6a89da --- /dev/null +++ b/deploy/ct119/oauth2-proxy.compose.yml @@ -0,0 +1,31 @@ +# oauth2-proxy для CT119 — сгенерировано из живого состояния +# НЕ содержит секретов: они подставляются из .env на CT +services: + oauth2-proxy-prowlarr: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-prowlarr" + restart: "unless-stopped" + 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 + diff --git a/deploy/ct155/oauth2-proxy.compose.yml b/deploy/ct155/oauth2-proxy.compose.yml new file mode 100644 index 0000000..fb9d221 --- /dev/null +++ b/deploy/ct155/oauth2-proxy.compose.yml @@ -0,0 +1,31 @@ +# oauth2-proxy для CT155 — сгенерировано из живого состояния +# НЕ содержит секретов: они подставляются из .env на CT +services: + oauth2-proxy-element: + image: "quay.io/oauth2-proxy/oauth2-proxy:latest" + container_name: "oauth2-proxy-element" + restart: "unless-stopped" + 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 + diff --git a/ops/infra/README.md b/ops/infra/README.md index d0fd33a..34bcda1 100644 --- a/ops/infra/README.md +++ b/ops/infra/README.md @@ -1,6 +1,6 @@ # Реестр инфраструктуры (единый источник правды) -_Обновлено: 2026-11-06T11:05:43_ +_Обновлено: 2026-11-06T11:07:31_ | Сущность | Количество | |---|---| @@ -17,38 +17,38 @@ _Обновлено: 2026-11-06T11:05:43_ | adguard.buryans.ru | 192.168.1.107:3000 | да | нет | host | | admin.buryans.ru | 192.168.1.114:9000 | да | нет | host | | authentik.buryans.ru | 192.168.1.114:9000 | да | нет | host | -| backup.buryans.ru | 192.168.1.113:9102 | да | нет | host | -| bazarr.buryans.ru | 192.168.1.120:9986 | да | нет | host | -| books.buryans.ru | 192.168.1.240:9990 | да | нет | host | +| backup.buryans.ru | 192.168.1.113:9102 | да | да | host | +| bazarr.buryans.ru | 192.168.1.120:9986 | да | да | host | +| books.buryans.ru | 192.168.1.240:9990 | да | да | host | | chat.buryans.ru | — | да | нет | host | -| docs.buryans.ru | 192.168.1.110:9981 | да | нет | host | -| element.buryans.ru | 192.168.1.155:9103 | да | нет | host | +| docs.buryans.ru | 192.168.1.110:9981 | да | да | host | +| element.buryans.ru | 192.168.1.155:9103 | да | да | host | | files.buryans.ru | 192.168.1.109:8080 | да | нет | host | -| finance.buryans.ru | 192.168.1.110:9104 | да | нет | host | -| flow.buryans.ru | 192.168.1.108:1881 | да | нет | host | +| finance.buryans.ru | 192.168.1.110:9104 | да | да | host | +| flow.buryans.ru | 192.168.1.108:1881 | да | да | host | | git.buryans.ru | 192.168.1.140:3000 | да | нет | host | | grafana.buryans.ru | — | нет | нет | host | -| grocy.buryans.ru | 192.168.1.110:9284 | да | нет | host | +| grocy.buryans.ru | 192.168.1.110:9284 | да | да | host | | headscale.buryans.ru | 100.64.0.2:8443 | да | нет | host | | home.buryans.ru | 192.168.1.106:9130 | да | да | host | | homebox.buryans.ru | — | нет | нет | host | | hub.buryans.ru | 192.168.1.10:9120/me | да | нет | host | | immich.buryans.ru | 192.168.1.104:2283 | да | нет | host | -| links.buryans.ru | 192.168.1.127:9091 | да | нет | host | +| links.buryans.ru | 192.168.1.127:9091 | да | да | host | | logs.buryans.ru | — | нет | нет | host | | matrix.buryans.ru | 192.168.1.155:8008 | да | нет | host | | meals.buryans.ru | 192.168.1.110:9925 | да | нет | host | | media.buryans.ru | 192.168.1.103:8096 | да | нет | host | | memo.buryans.ru | — | нет | нет | host | | metrics.buryans.ru | — | нет | нет | host | -| music.buryans.ru | 192.168.1.125:9976 | да | нет | host | +| music.buryans.ru | 192.168.1.125:9976 | да | да | host | | n8n.buryans.ru | 192.168.1.108:9105 | да | да | host | -| news.buryans.ru | 192.168.1.240:8091 | да | нет | host | +| news.buryans.ru | 192.168.1.240:8091 | да | да | host | | ns1.buryans.ru | — | да | нет | host | | ombi.buryans.ru | 192.168.1.121:5055 | да | нет | host | -| openclaw.buryans.ru | 192.168.1.115:9108 | да | нет | host | +| openclaw.buryans.ru | 192.168.1.115:9108 | да | да | host | | pdf.buryans.ru | — | нет | нет | host | | plex.buryans.ru | 192.168.1.116:32400 | да | нет | host | -| prowlarr.buryans.ru | 192.168.1.119:9987 | да | нет | host | +| prowlarr.buryans.ru | 192.168.1.119:9987 | да | да | host | | pve.buryans.ru | 192.168.1.10:8006 | да | нет | host | -| radarr.buryans.ru | 192.168.1.118:9988 | да | нет | host | +| radarr.buryans.ru | 192.168.1.118:9988 | да | да | host | diff --git a/ops/infra/registry.yaml b/ops/infra/registry.yaml index 0e5fa3a..cfb65fd 100644 --- a/ops/infra/registry.yaml +++ b/ops/infra/registry.yaml @@ -1,5 +1,5 @@ version: 2 -generated: '2026-11-06T11:05:43' +generated: '2026-11-06T11:07:31' counts: hosts: 34 services: 170 @@ -250,62 +250,62 @@ services: image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.101 - ram_mb: 10.8 + ram_mb: 9.4 - name: promtail host: ct101 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.101 - ram_mb: 4.3 + ram_mb: 15.4 - name: oauth2-proxy-dashy host: ct102 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: - 9983 ip: 192.168.1.102 - ram_mb: 3.3 + ram_mb: 3.8 - name: beszel-agent host: ct102 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.102 - ram_mb: 10.8 + ram_mb: 9.4 - name: dashy host: ct102 image: lissy93/dashy:latest ports: null ip: 192.168.1.102 - ram_mb: 11.6 + ram_mb: 9.6 - name: promtail host: ct102 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.102 - ram_mb: 4.3 + ram_mb: 15.4 - name: jellyfin host: ct103 image: jellyfin/jellyfin:latest ports: null ip: 192.168.1.103 - ram_mb: 203.3 + ram_mb: 192.4 - name: beszel-agent host: ct103 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.103 - ram_mb: 10.8 + ram_mb: 9.4 - name: docmost-redis host: ct103 image: redis:7-alpine ports: null ip: 192.168.1.103 - ram_mb: 7.2 + ram_mb: 7.0 - name: oauth2-proxy-docmost host: ct103 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: null ip: 192.168.1.103 - ram_mb: 6.3 + ram_mb: 6.5 - name: oauth2-proxy-podfetch host: ct103 image: quay.io/oauth2-proxy/oauth2-proxy:latest @@ -318,77 +318,77 @@ services: ports: - 3003 ip: 192.168.1.103 - ram_mb: 11.2 + ram_mb: 10.2 - name: docmost host: ct103 image: docmost/docmost:latest ports: - 3001 ip: 192.168.1.103 - ram_mb: 285.2 + ram_mb: 292.0 - name: promtail host: ct103 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.103 - ram_mb: 4.3 + ram_mb: 15.4 - name: jellystat host: ct103 image: cyfershepard/jellystat:latest ports: - 3100 ip: 192.168.1.103 - ram_mb: 51.5 + ram_mb: 54.6 - name: docmost-db host: ct103 image: postgres:16-alpine ports: null ip: 192.168.1.103 - ram_mb: 29.8 + ram_mb: 21.0 - name: paperless_redis host: ct105 image: redis:7-alpine ports: null ip: 192.168.1.105 - ram_mb: 3.1 + ram_mb: 3.4 - name: beszel-agent host: ct105 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.105 - ram_mb: 10.8 + ram_mb: 9.4 - name: paperless host: ct105 image: ghcr.io/paperless-ngx/paperless-ngx:latest ports: - 8000 ip: 192.168.1.105 - ram_mb: 494.2 + ram_mb: 493.8 - name: promtail host: ct105 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.105 - ram_mb: 4.3 + ram_mb: 15.4 - name: syncthing host: ct105 image: lscr.io/linuxserver/syncthing:latest ports: null ip: 192.168.1.105 - ram_mb: 14.6 + ram_mb: 15.9 - name: oauth2-proxy-home host: ct106 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: - 9130 ip: 192.168.1.106 - ram_mb: 5.7 + ram_mb: 5.8 - name: beszel-agent host: ct106 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.106 - ram_mb: 10.8 + ram_mb: 9.4 - name: mosquitto host: ct106 image: eclipse-mosquitto:latest @@ -402,7 +402,7 @@ services: image: ghcr.io/home-assistant/home-assistant:stable ports: null ip: 192.168.1.106 - ram_mb: 281.5 + ram_mb: 281.9 - name: ha-strip host: ct106 image: nginx:alpine @@ -415,33 +415,33 @@ services: image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.106 - ram_mb: 4.3 + ram_mb: 15.4 - name: oauth2-proxy-status host: ct107 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: - 9109 ip: 192.168.1.107 - ram_mb: 7.2 + ram_mb: 6.1 - name: beszel-agent host: ct107 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.107 - ram_mb: 10.8 + ram_mb: 9.4 - name: uptime_kuma host: ct107 image: louislam/uptime-kuma:2 ports: - 3001 ip: 192.168.1.107 - ram_mb: 158.3 + ram_mb: 87.9 - name: adguard host: ct107 image: adguard/adguardhome:latest ports: null ip: 192.168.1.107 - ram_mb: 41.6 + ram_mb: 28.6 - name: mosquitto host: ct107 image: eclipse-mosquitto:2 @@ -453,91 +453,91 @@ services: image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.107 - ram_mb: 4.3 + ram_mb: 15.4 - name: n8n host: ct108 image: n8nio/n8n:latest ports: - 5680 ip: 192.168.1.108 - ram_mb: 389.1 + ram_mb: 392.6 - name: oauth2-proxy-n8n host: ct108 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: - 9105 ip: 192.168.1.108 - ram_mb: 8.2 + ram_mb: 6.1 - name: oauth2-proxy-nodered host: ct108 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: - 1881 ip: 192.168.1.108 - ram_mb: 6.0 + ram_mb: 6.1 - name: node_red host: ct108 image: nodered/node-red:latest ports: - 1880 ip: 192.168.1.108 - ram_mb: 62.0 + ram_mb: 36.8 - name: beszel-agent host: ct108 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.108 - ram_mb: 10.8 + ram_mb: 9.4 - name: promtail host: ct108 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.108 - ram_mb: 4.3 + ram_mb: 15.4 - name: tg-admin-bot host: ct108 image: telegram-admin-bot-tg-admin-bot ports: null ip: 192.168.1.108 - ram_mb: 35.6 + ram_mb: 39.0 - name: beszel-agent host: ct109 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.109 - ram_mb: 10.8 + ram_mb: 9.4 - name: nextcloud host: ct109 image: nextcloud:latest ports: - 8080 ip: 192.168.1.109 - ram_mb: 187.6 + ram_mb: 184.8 - name: promtail host: ct109 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.109 - ram_mb: 4.3 + ram_mb: 15.4 - name: vaultwarden host: ct109 image: vaultwarden/server:latest ports: - 8081 ip: 192.168.1.109 - ram_mb: 12.8 + ram_mb: 5.0 - name: files_db host: ct109 image: mariadb:10.6 ports: null ip: 192.168.1.109 - ram_mb: 6.0 + ram_mb: 6.2 - name: oauth2-proxy-monica host: ct110 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: null ip: 192.168.1.110 - ram_mb: 5.5 + ram_mb: 5.4 - name: oauth2-proxy-metrics host: ct110 image: quay.io/oauth2-proxy/oauth2-proxy:latest @@ -550,21 +550,21 @@ services: ports: - 9104 ip: 192.168.1.110 - ram_mb: 6.5 + ram_mb: 7.8 - name: oauth2-proxy-grocy host: ct110 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: - 9284 ip: 192.168.1.110 - ram_mb: 5.8 + ram_mb: 5.6 - name: oauth2-proxy-paperless host: ct110 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: - 9981 ip: 192.168.1.110 - ram_mb: 6.0 + ram_mb: 5.9 - name: oauth2-proxy-logs host: ct110 image: quay.io/oauth2-proxy/oauth2-proxy:latest @@ -583,137 +583,137 @@ services: ports: - 9131 ip: 192.168.1.110 - ram_mb: 6.1 + ram_mb: 5.9 - name: paperless_web host: ct110 image: ghcr.io/paperless-ngx/paperless-ngx:latest ports: - 8000 ip: 192.168.1.110 - ram_mb: 222.0 + ram_mb: 220.9 - name: paperless_worker host: ct110 image: ghcr.io/paperless-ngx/paperless-ngx:latest ports: null ip: 192.168.1.110 - ram_mb: 216.9 + ram_mb: 218.7 - name: paperless_redis host: ct110 image: redis:7-alpine ports: null ip: 192.168.1.110 - ram_mb: 3.1 + ram_mb: 3.4 - name: house3d-web host: ct110 image: nginx:1.27-alpine ports: - 8093 ip: 192.168.1.110 - ram_mb: 1.0 + ram_mb: 1.5 - name: stirling-pdf host: ct110 image: frooodle/s-pdf:latest ports: null ip: 192.168.1.110 - ram_mb: 293.4 + ram_mb: 295.7 - name: dozzle host: ct110 image: amir20/dozzle:latest ports: null ip: 192.168.1.110 - ram_mb: 9.3 + ram_mb: 8.9 - name: monica host: ct110 image: monica ports: - 8081 ip: 192.168.1.110 - ram_mb: 30.0 + ram_mb: 28.8 - name: monica-db host: ct110 image: mariadb:11 ports: null ip: 192.168.1.110 - ram_mb: 4.0 + ram_mb: 3.6 - name: firefly host: ct110 image: fireflyiii/core:latest ports: - 8080 ip: 192.168.1.110 - ram_mb: 38.5 + ram_mb: 35.7 - name: mealie host: ct110 image: ghcr.io/mealie-recipes/mealie:latest ports: - 9925 ip: 192.168.1.110 - ram_mb: 45.1 + ram_mb: 44.6 - name: vikunja host: ct110 image: vikunja/vikunja:latest ports: - 9285 ip: 192.168.1.110 - ram_mb: 28.2 + ram_mb: 25.4 - name: promtail host: ct110 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.110 - ram_mb: 4.3 + ram_mb: 15.4 - name: homebox host: ct110 image: ghcr.io/sysadminsmedia/homebox:latest ports: - 9287 ip: 192.168.1.110 - ram_mb: 15.7 + ram_mb: 16.5 - name: grocy host: ct110 image: lscr.io/linuxserver/grocy:latest ports: - 9283 ip: 192.168.1.110 - ram_mb: 3.3 + ram_mb: 3.2 - name: beszel-agent host: ct110 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.110 - ram_mb: 10.8 + ram_mb: 9.4 - name: beszel host: ct110 image: henrygd/beszel:latest ports: - 8092 ip: 192.168.1.110 - ram_mb: 44.7 + ram_mb: 46.2 - name: memos host: ct110 image: neosmemo/memos:stable ports: - 5230 ip: 192.168.1.110 - ram_mb: 9.5 + ram_mb: 9.2 - name: book-bot host: ct111 image: buryan/book-bot:latest ports: null ip: 192.168.1.111 - ram_mb: 3.6 + ram_mb: 4.4 - name: beszel-agent host: ct111 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.111 - ram_mb: 10.8 + ram_mb: 9.4 - name: oauth2-proxy-audiobookshelf host: ct111 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: null ip: 192.168.1.111 - ram_mb: 4.2 + ram_mb: 4.3 - name: oauth2-proxy-calibre host: ct111 image: quay.io/oauth2-proxy/oauth2-proxy:latest @@ -734,41 +734,41 @@ services: ports: - 8091 ip: 192.168.1.111 - ram_mb: 7.2 + ram_mb: 6.5 - name: duplicati host: ct111 image: duplicati/duplicati:latest ports: - 8200 ip: 192.168.1.111 - ram_mb: 10.8 + ram_mb: 11.1 - name: audiobookshelf host: ct111 image: ghcr.io/advplyr/audiobookshelf:latest ports: - 13378 ip: 192.168.1.111 - ram_mb: 12.3 + ram_mb: 12.5 - name: freshrss host: ct111 image: freshrss/freshrss:latest ports: - 8090 ip: 192.168.1.111 - ram_mb: 11.5 + ram_mb: 12.0 - name: calibre-web host: ct111 image: crocodilestick/calibre-web-automated:latest ports: - 8083 ip: 192.168.1.111 - ram_mb: 44.9 + ram_mb: 49.1 - name: lidarr host: ct111 image: ghcr.nju.edu.cn/linuxserver/lidarr:latest ports: null ip: 192.168.1.111 - ram_mb: 56.9 + ram_mb: 61.4 - name: catalog host: ct111 image: buryan/catalog:latest @@ -781,65 +781,65 @@ services: image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.111 - ram_mb: 4.3 + ram_mb: 15.4 - name: kavita host: ct111 image: jvmilazz0/kavita:latest ports: - 5000 ip: 192.168.1.111 - ram_mb: 87.7 + ram_mb: 87.2 - name: promtail host: ct113 image: grafana/promtail:3.5.1 ports: null ip: 192.168.1.113 - ram_mb: 4.3 + ram_mb: 15.4 - name: beszel-agent host: ct113 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.113 - ram_mb: 10.8 + ram_mb: 9.4 - name: loki host: ct113 image: grafana/loki:3.7.9 ports: - 3100 ip: 192.168.1.113 - ram_mb: 75.6 + ram_mb: 78.8 - name: grafana host: ct113 image: grafana/grafana:latest ports: - 3000 ip: 192.168.1.113 - ram_mb: 244.4 + ram_mb: 224.3 - name: oauth2-proxy-backup host: ct113 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: - 9102 ip: 192.168.1.113 - ram_mb: 4.7 + ram_mb: 4.5 - name: authentik-security-redis-1 host: ct114 image: redis:7-alpine ports: null ip: 192.168.1.114 - ram_mb: 2.6 + ram_mb: 2.1 - name: beszel-agent host: ct114 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.114 - ram_mb: 10.8 + ram_mb: 9.4 - name: authentik-security-worker-1 host: ct114 image: ghcr.io/goauthentik/server:2026.8.5 ports: null ip: 192.168.1.114 - ram_mb: 39.2 + ram_mb: 45.4 - name: authentik-security-server-1 host: ct114 image: ghcr.io/goauthentik/server:2026.8.5 @@ -847,51 +847,51 @@ services: - 9000 - 9443 ip: 192.168.1.114 - ram_mb: 97.0 + ram_mb: 94.5 - name: promtail host: ct114 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.114 - ram_mb: 4.3 + ram_mb: 15.4 - name: authentik-security-postgresql-1 host: ct114 image: postgres:16-alpine ports: null ip: 192.168.1.114 - ram_mb: 14.1 + ram_mb: 12.9 - name: oauth2-proxy-openclaw host: ct115 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: - 9108 ip: 192.168.1.115 - ram_mb: 4.5 + ram_mb: 4.4 - name: swarm-redis host: ct115 image: redis:7-alpine ports: - 6379 ip: 192.168.1.115 - ram_mb: 1.9 + ram_mb: 2.1 - name: beszel-agent host: ct115 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.115 - ram_mb: 10.8 + ram_mb: 9.4 - name: openclaw host: ct115 image: 3814fb1f62f9 ports: null ip: 192.168.1.115 - ram_mb: 37.5 + ram_mb: 46.9 - name: promtail host: ct115 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.115 - ram_mb: 4.3 + ram_mb: 15.4 - name: nats host: ct115 image: nats:2.10.17-alpine @@ -899,155 +899,155 @@ services: - 4222 - 8222 ip: 192.168.1.115 - ram_mb: 6.5 + ram_mb: 4.9 - name: beszel-agent host: ct116 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.116 - ram_mb: 10.8 + ram_mb: 9.4 - name: plex host: ct116 image: linuxserver/plex:latest ports: - 32400 ip: 192.168.1.116 - ram_mb: 10.6 + ram_mb: 11.2 - name: promtail host: ct116 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.116 - ram_mb: 4.3 + ram_mb: 15.4 - name: oauth2-proxy-sonarr host: ct117 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: - 9989 ip: 192.168.1.117 - ram_mb: 3.9 + ram_mb: 3.8 - name: sonarr host: ct117 image: lscr.io/linuxserver/sonarr:latest ports: - 8989 ip: 192.168.1.117 - ram_mb: 56.6 + ram_mb: 59.1 - name: beszel-agent host: ct117 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.117 - ram_mb: 10.8 + ram_mb: 9.4 - name: promtail host: ct117 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.117 - ram_mb: 4.3 + ram_mb: 15.4 - name: oauth2-proxy-radarr host: ct118 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: - 9988 ip: 192.168.1.118 - ram_mb: 7.3 + ram_mb: 4.0 - name: radarr host: ct118 image: lscr.io/linuxserver/radarr:latest ports: - 7878 ip: 192.168.1.118 - ram_mb: 90.7 + ram_mb: 91.9 - name: beszel-agent host: ct118 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.118 - ram_mb: 10.8 + ram_mb: 9.4 - name: promtail host: ct118 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.118 - ram_mb: 4.3 + ram_mb: 15.4 - name: oauth2-proxy-prowlarr host: ct119 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: - 9987 ip: 192.168.1.119 - ram_mb: 4.1 + ram_mb: 9.1 - name: prowlarr host: ct119 image: lscr.io/linuxserver/prowlarr:latest ports: - 9696 ip: 192.168.1.119 - ram_mb: 25.8 + ram_mb: 40.6 - name: beszel-agent host: ct119 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.119 - ram_mb: 10.8 + ram_mb: 9.4 - name: promtail host: ct119 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.119 - ram_mb: 4.3 + ram_mb: 15.4 - name: bazarr host: ct120 image: lscr.io/linuxserver/bazarr:latest ports: - 6767 ip: 192.168.1.120 - ram_mb: 31.2 + ram_mb: 38.6 - name: beszel-agent host: ct120 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.120 - ram_mb: 10.8 + ram_mb: 9.4 - name: oauth2-proxy-bazarr host: ct120 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: - 9986 ip: 192.168.1.120 - ram_mb: 3.8 + ram_mb: 4.2 - name: promtail host: ct120 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.120 - ram_mb: 4.3 + ram_mb: 15.4 - name: beszel-agent host: ct121 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.121 - ram_mb: 10.8 + ram_mb: 9.4 - name: seerr host: ct121 image: ghcr.io/seerr-team/seerr:latest ports: - 5055 ip: 192.168.1.121 - ram_mb: 71.8 + ram_mb: 119.9 - name: promtail host: ct121 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.121 - ram_mb: 4.3 + ram_mb: 15.4 - name: beszel-agent host: ct122 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.122 - ram_mb: 10.8 + ram_mb: 9.4 - name: oauth2-proxy-tautulli host: ct122 image: quay.io/oauth2-proxy/oauth2-proxy:latest @@ -1060,58 +1060,58 @@ services: image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.122 - ram_mb: 4.3 + ram_mb: 15.4 - name: tautulli host: ct122 image: tautulli/tautulli:latest ports: - 8181 ip: 192.168.1.122 - ram_mb: 10.8 + ram_mb: 10.9 - name: beszel-agent host: ct124 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.124 - ram_mb: 10.8 + ram_mb: 9.4 - name: jackett host: ct124 image: lscr.io/linuxserver/jackett:latest ports: - 9117 ip: 192.168.1.124 - ram_mb: 4.1 + ram_mb: 3.8 - name: beszel-agent host: ct125 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.125 - ram_mb: 10.8 + ram_mb: 9.4 - name: oauth2-proxy-navidrome host: ct125 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: - 9976 ip: 192.168.1.125 - ram_mb: 4.1 + ram_mb: 5.9 - name: promtail host: ct125 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.125 - ram_mb: 4.3 + ram_mb: 15.4 - name: navidrome host: ct125 image: deluan/navidrome:latest ports: null ip: 192.168.1.125 - ram_mb: 14.9 + ram_mb: 7.7 - name: beszel-agent host: ct126 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.126 - ram_mb: 10.8 + ram_mb: 9.4 - name: frigate host: ct126 image: ghcr.io/blakeblackshear/frigate:stable @@ -1119,58 +1119,58 @@ services: - 5000 - 8971 ip: 192.168.1.126 - ram_mb: 86.3 + ram_mb: 94.1 - name: beszel-agent host: ct127 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.127 - ram_mb: 10.8 + ram_mb: 9.4 - name: oauth2-proxy-linkding host: ct127 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: - 9091 ip: 192.168.1.127 - ram_mb: 3.8 + ram_mb: 4.5 - name: promtail host: ct127 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.127 - ram_mb: 4.3 + ram_mb: 15.4 - name: linkding host: ct127 image: sissbruecker/linkding:latest ports: - 3000 ip: 192.168.1.127 - ram_mb: 34.4 + ram_mb: 31.8 - name: beszel-agent host: ct134 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.134 - ram_mb: 10.8 + ram_mb: 9.4 - name: alertmanager host: ct134 image: prom/alertmanager:v0.34.1 ports: null ip: 192.168.1.134 - ram_mb: 13.1 + ram_mb: 16.7 - name: prometheus host: ct134 image: prom/prometheus:latest ports: - 9090 ip: 192.168.1.134 - ram_mb: 126.4 + ram_mb: 141.8 - name: promtail host: ct134 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.134 - ram_mb: 4.3 + ram_mb: 15.4 - name: buryan-alert-webhook host: ct134 image: python:3.12-alpine @@ -1183,54 +1183,54 @@ services: ports: - 9707 ip: 192.168.1.134 - ram_mb: 5.4 + ram_mb: 6.2 - name: oauth2-proxy-prometheus host: ct134 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: - 9113 ip: 192.168.1.134 - ram_mb: 9.1 + ram_mb: 3.9 - name: exportarr-prowlarr host: ct134 image: ghcr.io/onedr0p/exportarr:latest ports: - 9709 ip: 192.168.1.134 - ram_mb: 8.5 + ram_mb: 8.6 - name: exportarr-bazarr host: ct134 image: ghcr.io/onedr0p/exportarr:latest ports: - 9710 ip: 192.168.1.134 - ram_mb: 5.2 + ram_mb: 4.6 - name: exportarr-radarr host: ct134 image: ghcr.io/onedr0p/exportarr:latest ports: - 9708 ip: 192.168.1.134 - ram_mb: 6.6 + ram_mb: 7.2 - name: beszel-agent host: ct139 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.139 - ram_mb: 10.8 + ram_mb: 9.4 - name: syncthing host: ct139 image: syncthing/syncthing:latest ports: - 8384 ip: 192.168.1.139 - ram_mb: 14.6 + ram_mb: 15.9 - name: promtail host: ct139 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.139 - ram_mb: 4.3 + ram_mb: 15.4 - name: gitea host: ct140 image: gitea/gitea:latest @@ -1244,71 +1244,71 @@ services: image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.140 - ram_mb: 10.8 + ram_mb: 9.4 - name: gitea-runner host: ct140 image: gitea/act_runner:latest ports: null ip: 192.168.1.140 - ram_mb: 6.8 + ram_mb: 6.4 - name: promtail host: ct140 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.140 - ram_mb: 4.3 + ram_mb: 15.4 - name: oauth2-proxy-element host: ct155 image: quay.io/oauth2-proxy/oauth2-proxy:latest ports: - 9103 ip: 192.168.1.155 - ram_mb: 10.6 + ram_mb: 7.4 - name: beszel-agent host: ct155 image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.155 - ram_mb: 10.8 + ram_mb: 9.4 - name: livekit host: ct155 image: livekit/livekit-server:latest ports: null ip: 192.168.1.155 - ram_mb: 14.5 + ram_mb: 17.2 - name: element-web host: ct155 image: vectorim/element-web:latest ports: - 8088 ip: 192.168.1.155 - ram_mb: 1.9 + ram_mb: 2.3 - name: matrix-synapse host: ct155 image: matrixdotorg/synapse:latest ports: - 8008 ip: 192.168.1.155 - ram_mb: 49.3 + ram_mb: 48.5 - name: matrix-coturn host: ct155 image: coturn/coturn:latest ports: null ip: 192.168.1.155 - ram_mb: 3.3 + ram_mb: 2.9 - name: promtail host: ct155 image: grafana/promtail:3.2.1 ports: null ip: 192.168.1.155 - ram_mb: 4.3 + ram_mb: 15.4 - name: mautrix-telegram host: ct155 image: dock.mau.dev/mautrix/telegram:latest ports: - 29317 ip: 192.168.1.155 - ram_mb: 7.7 + ram_mb: 7.9 - name: node_exporter host: vm104 image: prom/node-exporter:latest @@ -1320,33 +1320,33 @@ services: image: henrygd/beszel-agent:latest ports: null ip: 192.168.1.104 - ram_mb: 10.8 + ram_mb: 9.4 - name: zigbee2mqtt host: vm104 image: ghcr.nju.edu.cn/koenkk/zigbee2mqtt:latest ports: null ip: 192.168.1.104 - ram_mb: 11.1 + ram_mb: 12.3 - name: portainer host: vm104 image: portainer/portainer-ce:latest ports: - 9000 ip: 192.168.1.104 - ram_mb: 13.2 + ram_mb: 20.6 - name: immich_database host: vm104 image: tensorchord/pgvecto-rs:pg14-v0.2.0 ports: null ip: 192.168.1.104 - ram_mb: 4.7 + ram_mb: 4.8 - name: heimdall host: vm104 image: lscr.io/linuxserver/heimdall:latest ports: - 8088 ip: 192.168.1.104 - ram_mb: 11.5 + ram_mb: 11.4 domains: - domain: 193.233.210.184 upstream: api.telegram.org/ @@ -1376,17 +1376,17 @@ domains: - domain: backup.buryans.ru upstream: 192.168.1.113:9102 ssl: true - sso: false + sso: true edge: host - domain: bazarr.buryans.ru upstream: 192.168.1.120:9986 ssl: true - sso: false + sso: true edge: host - domain: books.buryans.ru upstream: 192.168.1.240:9990 ssl: true - sso: false + sso: true edge: host - domain: chat.buryans.ru upstream: null @@ -1396,12 +1396,12 @@ domains: - domain: docs.buryans.ru upstream: 192.168.1.110:9981 ssl: true - sso: false + sso: true edge: host - domain: element.buryans.ru upstream: 192.168.1.155:9103 ssl: true - sso: false + sso: true edge: host - domain: files.buryans.ru upstream: 192.168.1.109:8080 @@ -1411,12 +1411,12 @@ domains: - domain: finance.buryans.ru upstream: 192.168.1.110:9104 ssl: true - sso: false + sso: true edge: host - domain: flow.buryans.ru upstream: 192.168.1.108:1881 ssl: true - sso: false + sso: true edge: host - domain: git.buryans.ru upstream: 192.168.1.140:3000 @@ -1431,7 +1431,7 @@ domains: - domain: grocy.buryans.ru upstream: 192.168.1.110:9284 ssl: true - sso: false + sso: true edge: host - domain: headscale.buryans.ru upstream: 100.64.0.2:8443 @@ -1461,7 +1461,7 @@ domains: - domain: links.buryans.ru upstream: 192.168.1.127:9091 ssl: true - sso: false + sso: true edge: host - domain: logs.buryans.ru upstream: null @@ -1496,7 +1496,7 @@ domains: - domain: music.buryans.ru upstream: 192.168.1.125:9976 ssl: true - sso: false + sso: true edge: host - domain: n8n.buryans.ru upstream: 192.168.1.108:9105 @@ -1506,7 +1506,7 @@ domains: - domain: news.buryans.ru upstream: 192.168.1.240:8091 ssl: true - sso: false + sso: true edge: host - domain: ns1.buryans.ru upstream: null @@ -1521,7 +1521,7 @@ domains: - domain: openclaw.buryans.ru upstream: 192.168.1.115:9108 ssl: true - sso: false + sso: true edge: host - domain: pdf.buryans.ru upstream: null @@ -1536,7 +1536,7 @@ domains: - domain: prowlarr.buryans.ru upstream: 192.168.1.119:9987 ssl: true - sso: false + sso: true edge: host - domain: pve.buryans.ru upstream: 192.168.1.10:8006 @@ -1546,7 +1546,7 @@ domains: - domain: radarr.buryans.ru upstream: 192.168.1.118:9988 ssl: true - sso: false + sso: true edge: host - domain: recipes.buryans.ru upstream: null @@ -1561,12 +1561,12 @@ domains: - domain: rss.buryans.ru upstream: 192.168.1.240:8091 ssl: true - sso: false + sso: true edge: host - domain: sonarr.buryans.ru upstream: 192.168.1.117:9989 ssl: true - sso: false + sso: true edge: host - domain: status.buryans.ru upstream: 192.168.1.10:9120/ diff --git a/ops/scripts/build_registry_v2.py b/ops/scripts/build_registry_v2.py index 59d13b6..51a0feb 100755 --- a/ops/scripts/build_registry_v2.py +++ b/ops/scripts/build_registry_v2.py @@ -108,6 +108,18 @@ def costs(hostlist): return out +OAUTH_PORTS = set() + + +def collect_oauth_ports(services_list): + """Порты хостов, на которых слушают oauth2-proxy (для детекта SSO).""" + global OAUTH_PORTS + for sv in services_list: + if sv["name"].startswith("oauth2-proxy") and sv.get("ports"): + OAUTH_PORTS.update(sv["ports"]) + return OAUTH_PORTS + + def domains(): """Домены из nginx: server_name + proxy_pass (хост и VPS).""" seen, out = set(), [] @@ -125,6 +137,12 @@ def domains(): if "oauth2" not in u] ssl = "ssl_certificate" in block auth = ("auth_request" in block) or ("oauth2" in block.lower()) + if not auth and ups: + try: + up_port = int(ups[0].rsplit(":", 1)[-1].split("/")[0]) + auth = up_port in OAUTH_PORTS + except Exception: + pass for n in names[0].split(): n = n.strip() if not n or n in ("_", "localhost") or "$" in n or n in seen: @@ -159,6 +177,7 @@ def main(): os.makedirs(OUT, exist_ok=True) h = hosts() s = services(h) + collect_oauth_ports(s) d = domains() c = costs(h) e = dependencies(h, s, d)