diff --git a/komga-webui/src/locales/en.json b/komga-webui/src/locales/en.json index ca86bc1bd..0fb0c16fa 100644 --- a/komga-webui/src/locales/en.json +++ b/komga-webui/src/locales/en.json @@ -851,6 +851,7 @@ "tab_title": "Server" }, "server_settings": { + "config_precedence": "Takes precedence over the configuration file", "dialog_regenerate_thumbnails": { "body": "Thumbnails size has changed. Do you want to regenerate book thumbnails?", "btn_alternate": "Yes, all books", @@ -861,6 +862,8 @@ "label_delete_empty_collections": "Delete empty collections after scan", "label_delete_empty_readlists": "Delete empty read lists after scan", "label_rememberme_duration": "Remember me duration (in days)", + "label_server_context_path": "Base URL", + "label_server_port": "Server Port", "label_task_pool_size": "Task threads", "label_thumbnail_size": "Thumbnails size", "requires_restart": "Requires restart to take effect", @@ -917,7 +920,9 @@ "users": "Users" }, "validation": { + "context_path": "Must start with '/', not end with '/-_', and contain only '/-_a-z0-9'", "one_or_more": "Must be 1 or more", + "tcp_port": "Must be between 1 and 65535", "zero_or_more": "Must be 0 or more" }, "welcome": { diff --git a/komga-webui/src/types/komga-settings.ts b/komga-webui/src/types/komga-settings.ts index 1c9d551b2..0ef340ccd 100644 --- a/komga-webui/src/types/komga-settings.ts +++ b/komga-webui/src/types/komga-settings.ts @@ -4,6 +4,14 @@ export interface SettingsDto { rememberMeDurationDays: number, thumbnailSize: ThumbnailSizeDto, taskPoolSize: number, + serverPort: SettingMultiSource, + serverContextPath: SettingMultiSource, +} + +export interface SettingMultiSource { + configurationSource?: T, + databaseSource?: T, + effectiveValue?: T, } export interface SettingsUpdateDto { @@ -13,6 +21,8 @@ export interface SettingsUpdateDto { renewRememberMeKey?: boolean, thumbnailSize?: ThumbnailSizeDto, taskPoolSize?: number, + serverPort?: number, + serverContextPath?: string, } export enum ThumbnailSizeDto { diff --git a/komga-webui/src/views/ServerSettings.vue b/komga-webui/src/views/ServerSettings.vue index e93cdaf4c..181ab19f7 100644 --- a/komga-webui/src/views/ServerSettings.vue +++ b/komga-webui/src/views/ServerSettings.vue @@ -53,6 +53,59 @@ persistent-hint :hint="$t('server_settings.requires_restart')" /> + + + + + + + + @@ -85,11 +138,13 @@