fix: manager tenant root → NC Drive, /admin → vmis-backend (correct route)
Reverts incorrect redirect: root path now serves NC Drive directly. Manager tenant routes: /admin (priority 200) → vmis-backend, /api (priority 200) → vmis-backend, / → NC container. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -200,19 +200,13 @@ def _generate_tenant_route_yaml(tenant, is_active: bool) -> str:
|
||||
lines = ["http:"]
|
||||
|
||||
if tenant.is_manager:
|
||||
# Manager 租戶:根路徑 redirect 到 /admin,/admin 和 /api 指向 vmis-backend
|
||||
# Manager 租戶:/admin → vmis-backend,/api → vmis-backend,根路徑 → NC Drive
|
||||
lines += [
|
||||
" middlewares:",
|
||||
" vmis-strip-admin:",
|
||||
" stripPrefix:",
|
||||
' prefixes: ["/admin"]',
|
||||
"",
|
||||
" vmis-redirect-admin:",
|
||||
" redirectRegex:",
|
||||
f' regex: "^https://{domain}/?$"',
|
||||
f' replacement: "https://{domain}/admin/"',
|
||||
" permanent: false",
|
||||
"",
|
||||
]
|
||||
lines += [
|
||||
" routers:",
|
||||
@@ -233,22 +227,24 @@ def _generate_tenant_route_yaml(tenant, is_active: bool) -> str:
|
||||
" certResolver: letsencrypt",
|
||||
" priority: 200",
|
||||
"",
|
||||
f" {code}-root:",
|
||||
f" {code}-drive:",
|
||||
f' rule: "Host(`{domain}`)"',
|
||||
f" service: {code}-vmis",
|
||||
f" service: {code}-drive",
|
||||
" entryPoints: [websecure]",
|
||||
" middlewares: [vmis-redirect-admin]",
|
||||
" tls:",
|
||||
" certResolver: letsencrypt",
|
||||
" priority: 100",
|
||||
"",
|
||||
f" {code}-http:",
|
||||
f' rule: "Host(`{domain}`)"',
|
||||
" entryPoints: [web]",
|
||||
" middlewares: [redirect-https]",
|
||||
f" service: {code}-vmis",
|
||||
f" service: {code}-drive",
|
||||
"",
|
||||
" services:",
|
||||
f" {code}-drive:",
|
||||
" loadBalancer:",
|
||||
" servers:",
|
||||
f' - url: "{nc_url}"',
|
||||
f" {code}-vmis:",
|
||||
" loadBalancer:",
|
||||
" servers:",
|
||||
|
||||
Reference in New Issue
Block a user