Skip to content

Commit a43c4dd

Browse files
committed
✨ Update webserver configuration: rename WEBSERVER_HOST and add WEBSERVER_RPC_NAMESPACE
1 parent 38dbebc commit a43c4dd

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

services/api-server/.env-devel

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ RABBIT_PORT=5672
3535
RABBIT_SECURE=false
3636
RABBIT_USER=admin
3737

38-
# webserver
39-
WEBSERVER_HOST=webserver
38+
# webserver (WB_API_WEBSERVER_HOST)
39+
WEBSERVER_HOST=wb-api-server
40+
WEBSERVER_RPC_NAMESPACE=wb-api-server
4041
# Take from general .env-devel
4142
WEBSERVER_SESSION_SECRET_KEY='REPLACE_ME_with_result__Fernet_generate_key='
4243

services/api-server/src/simcore_service_api_server/core/settings.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from common_library.basic_types import DEFAULT_FACTORY
55
from common_library.logging.logging_utils_filtering import LoggerName, MessageSubstring
66
from models_library.basic_types import BootModeEnum, LogLevel
7+
from models_library.rabbitmq_basic_types import RPCNamespace
78
from pydantic import (
89
AliasChoices,
910
Field,
@@ -41,6 +42,11 @@ class WebServerSettings(WebServerBaseSettings, MixinSessionSettings):
4142
]
4243
WEBSERVER_SESSION_NAME: str = DEFAULT_SESSION_COOKIE_NAME
4344

45+
WEBSERVER_RPC_NAMESPACE: Annotated[
46+
RPCNamespace,
47+
Field(description="Namespace for the RPC server"),
48+
]
49+
4450
@field_validator("WEBSERVER_SESSION_SECRET_KEY")
4551
@classmethod
4652
def _check_valid_fernet_key(cls, v):

services/web/server/src/simcore_service_webserver/application_settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ class ApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
157157

158158
WEBSERVER_RPC_NAMESPACE: Annotated[
159159
RPCNamespace | None,
160-
Field(description="Namespace for the RPC service, if any, otherwise None"),
160+
Field(description="Namespace for the RPC server (if any) otherwise None"),
161161
]
162162

163163
WEBSERVER_SERVER_HOST: Annotated[

0 commit comments

Comments
 (0)