mirror of
https://github.com/bitwarden/server.git
synced 2025-04-06 05:28:15 -05:00
update self-host for sso and portal (#893)
This commit is contained in:
parent
614859a8bc
commit
0607050024
@ -27,6 +27,7 @@ namespace Bit.Setup
|
|||||||
["globalSettings__baseServiceUri__identity"] = "http://localhost/identity",
|
["globalSettings__baseServiceUri__identity"] = "http://localhost/identity",
|
||||||
["globalSettings__baseServiceUri__admin"] = "http://localhost/admin",
|
["globalSettings__baseServiceUri__admin"] = "http://localhost/admin",
|
||||||
["globalSettings__baseServiceUri__sso"] = "http://localhost/sso",
|
["globalSettings__baseServiceUri__sso"] = "http://localhost/sso",
|
||||||
|
["globalSettings__baseServiceUri__portal"] = "http://localhost/portal",
|
||||||
["globalSettings__baseServiceUri__notifications"] = "http://localhost/notifications",
|
["globalSettings__baseServiceUri__notifications"] = "http://localhost/notifications",
|
||||||
["globalSettings__baseServiceUri__internalNotifications"] = "http://notifications:5000",
|
["globalSettings__baseServiceUri__internalNotifications"] = "http://notifications:5000",
|
||||||
["globalSettings__baseServiceUri__internalAdmin"] = "http://admin:5000",
|
["globalSettings__baseServiceUri__internalAdmin"] = "http://admin:5000",
|
||||||
@ -34,6 +35,7 @@ namespace Bit.Setup
|
|||||||
["globalSettings__baseServiceUri__internalApi"] = "http://api:5000",
|
["globalSettings__baseServiceUri__internalApi"] = "http://api:5000",
|
||||||
["globalSettings__baseServiceUri__internalVault"] = "http://web:5000",
|
["globalSettings__baseServiceUri__internalVault"] = "http://web:5000",
|
||||||
["globalSettings__baseServiceUri__internalSso"] = "http://sso:5000",
|
["globalSettings__baseServiceUri__internalSso"] = "http://sso:5000",
|
||||||
|
["globalSettings__baseServiceUri__internalPortal"] = "http://portal:5000",
|
||||||
["globalSettings__pushRelayBaseUri"] = "https://push.bitwarden.com",
|
["globalSettings__pushRelayBaseUri"] = "https://push.bitwarden.com",
|
||||||
["globalSettings__installation__identityUri"] = "https://identity.bitwarden.com",
|
["globalSettings__installation__identityUri"] = "https://identity.bitwarden.com",
|
||||||
};
|
};
|
||||||
@ -92,6 +94,7 @@ namespace Bit.Setup
|
|||||||
["globalSettings__baseServiceUri__admin"] = $"{_context.Config.Url}/admin",
|
["globalSettings__baseServiceUri__admin"] = $"{_context.Config.Url}/admin",
|
||||||
["globalSettings__baseServiceUri__notifications"] = $"{_context.Config.Url}/notifications",
|
["globalSettings__baseServiceUri__notifications"] = $"{_context.Config.Url}/notifications",
|
||||||
["globalSettings__baseServiceUri__sso"] = $"{_context.Config.Url}/sso",
|
["globalSettings__baseServiceUri__sso"] = $"{_context.Config.Url}/sso",
|
||||||
|
["globalSettings__baseServiceUri__portal"] = $"{_context.Config.Url}/portal",
|
||||||
["globalSettings__sqlServer__connectionString"] = $"\"{dbConnectionString}\"",
|
["globalSettings__sqlServer__connectionString"] = $"\"{dbConnectionString}\"",
|
||||||
["globalSettings__identityServer__certificatePassword"] = _context.Install?.IdentityCertPassword,
|
["globalSettings__identityServer__certificatePassword"] = _context.Install?.IdentityCertPassword,
|
||||||
["globalSettings__attachment__baseDirectory"] = $"{_context.OutputDir}/core/attachments",
|
["globalSettings__attachment__baseDirectory"] = $"{_context.OutputDir}/core/attachments",
|
||||||
|
@ -87,22 +87,22 @@ services:
|
|||||||
- default
|
- default
|
||||||
- public
|
- public
|
||||||
|
|
||||||
# sso:
|
sso:
|
||||||
# image: bitwarden/sso:{{{CoreVersion}}}
|
image: bitwarden/sso:{{{CoreVersion}}}
|
||||||
# container_name: bitwarden-sso
|
container_name: bitwarden-sso
|
||||||
# restart: always
|
restart: always
|
||||||
# volumes:
|
volumes:
|
||||||
# - ../identity:/etc/bitwarden/identity
|
- ../identity:/etc/bitwarden/identity
|
||||||
# - ../core:/etc/bitwarden/core
|
- ../core:/etc/bitwarden/core
|
||||||
# - ../ca-certificates:/etc/bitwarden/ca-certificates
|
- ../ca-certificates:/etc/bitwarden/ca-certificates
|
||||||
# - ../logs/sso:/etc/bitwarden/logs
|
- ../logs/sso:/etc/bitwarden/logs
|
||||||
# env_file:
|
env_file:
|
||||||
# - global.env
|
- global.env
|
||||||
# - ../env/uid.env
|
- ../env/uid.env
|
||||||
# - ../env/global.override.env
|
- ../env/global.override.env
|
||||||
# networks:
|
networks:
|
||||||
# - default
|
- default
|
||||||
# - public
|
- public
|
||||||
|
|
||||||
admin:
|
admin:
|
||||||
image: bitwarden/admin:{{{CoreVersion}}}
|
image: bitwarden/admin:{{{CoreVersion}}}
|
||||||
@ -122,6 +122,24 @@ services:
|
|||||||
- default
|
- default
|
||||||
- public
|
- public
|
||||||
|
|
||||||
|
portal:
|
||||||
|
image: bitwarden/portal:{{{CoreVersion}}}
|
||||||
|
container_name: bitwarden-portal
|
||||||
|
restart: always
|
||||||
|
depends_on:
|
||||||
|
- mssql
|
||||||
|
volumes:
|
||||||
|
- ../core:/etc/bitwarden/core
|
||||||
|
- ../ca-certificates:/etc/bitwarden/ca-certificates
|
||||||
|
- ../logs/portal:/etc/bitwarden/logs
|
||||||
|
env_file:
|
||||||
|
- global.env
|
||||||
|
- ../env/uid.env
|
||||||
|
- ../env/global.override.env
|
||||||
|
networks:
|
||||||
|
- default
|
||||||
|
- public
|
||||||
|
|
||||||
icons:
|
icons:
|
||||||
image: bitwarden/icons:{{{CoreVersion}}}
|
image: bitwarden/icons:{{{CoreVersion}}}
|
||||||
container_name: bitwarden-icons
|
container_name: bitwarden-icons
|
||||||
|
@ -104,9 +104,13 @@ server {
|
|||||||
proxy_pass http://identity:5000/;
|
proxy_pass http://identity:5000/;
|
||||||
}
|
}
|
||||||
|
|
||||||
# location /sso/ {
|
location /sso/ {
|
||||||
# proxy_pass http://sso:5000/;
|
proxy_pass http://sso:5000/;
|
||||||
# }
|
}
|
||||||
|
|
||||||
|
location /portal/ {
|
||||||
|
proxy_pass http://portal:5000/;
|
||||||
|
}
|
||||||
|
|
||||||
location /icons/ {
|
location /icons/ {
|
||||||
proxy_pass http://icons:5000/;
|
proxy_pass http://icons:5000/;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user