diff --git a/services/search/README.md b/services/search/README.md index 03e56c687a..9d09419b37 100644 --- a/services/search/README.md +++ b/services/search/README.md @@ -98,7 +98,7 @@ As soon as Tika is installed and configured, the search service needs to be told The following settings must be set: * `SEARCH_EXTRACTOR_TYPE=tika` -* `SEARCH_EXTRACTOR_TIKA_TIKA_URL=http://YOUR-TIKA.URL` +* `SEARCH_EXTRACTOR_TIKA_TIKA_URL=http://YOUR-TIKA.URL` (or the shared `OC_TIKA_URL`, which the thumbnails service reads too) Additionally, the following optional settings can be set: diff --git a/services/search/pkg/config/content.go b/services/search/pkg/config/content.go index 515db03b63..bd9baa7a82 100644 --- a/services/search/pkg/config/content.go +++ b/services/search/pkg/config/content.go @@ -9,6 +9,6 @@ type Extractor struct { // ExtractorTika configures the Tika extractor type ExtractorTika struct { - TikaURL string `yaml:"tika_url" env:"SEARCH_EXTRACTOR_TIKA_TIKA_URL" desc:"URL of the tika server." introductionVersion:"1.0.0"` + TikaURL string `yaml:"tika_url" env:"OC_TIKA_URL;SEARCH_EXTRACTOR_TIKA_TIKA_URL" desc:"URL of the tika server." introductionVersion:"1.0.0"` CleanStopWords bool `yaml:"clean_stop_words" env:"SEARCH_EXTRACTOR_TIKA_CLEAN_STOP_WORDS" desc:"Defines if stop words should be cleaned or not. See the documentation for more details." introductionVersion:"1.0.0"` } diff --git a/services/thumbnails/README.md b/services/thumbnails/README.md index 7b9570d89a..3ad862eac6 100644 --- a/services/thumbnails/README.md +++ b/services/thumbnails/README.md @@ -32,7 +32,7 @@ Thumbnails can be generated from the following source file types: - txt - camera raw files: nef, cr2, pef, arw, sr2, srf, dng -For camera raw files the thumbnail is generated from the JPEG preview the camera embedded in the file, the raw sensor data itself is not developed. Raw files without an embedded preview cannot be thumbnailed. Preview extraction is done by an Apache Tika server, so raw thumbnails require `THUMBNAILS_PREPROCESSOR_TIKA_TIKA_URL` to be set. +For camera raw files the thumbnail is generated from the JPEG preview the camera embedded in the file, the raw sensor data itself is not developed. Raw files without an embedded preview cannot be thumbnailed. Preview extraction is done by an Apache Tika server, so raw thumbnails require `THUMBNAILS_PREPROCESSOR_TIKA_TIKA_URL` (or the shared `OC_TIKA_URL`, which the search service reads too) to be set. The thumbnail service retrieves source files using the information provided by the backend. The Linux backend identifies source files usually based on the extension. diff --git a/services/thumbnails/pkg/config/config.go b/services/thumbnails/pkg/config/config.go index 083d987116..86a9214203 100644 --- a/services/thumbnails/pkg/config/config.go +++ b/services/thumbnails/pkg/config/config.go @@ -57,5 +57,5 @@ type Preprocessor struct { // Tika configures preview extraction via an Apache Tika server. type Tika struct { - TikaURL string `yaml:"tika_url" env:"THUMBNAILS_PREPROCESSOR_TIKA_TIKA_URL" desc:"URL of a Tika server used to extract embedded previews from raw images. When empty, raw images are not thumbnailed." introductionVersion:"%%NEXT%%"` + TikaURL string `yaml:"tika_url" env:"OC_TIKA_URL;THUMBNAILS_PREPROCESSOR_TIKA_TIKA_URL" desc:"URL of a Tika server used to extract embedded previews from raw images. When empty, raw images are not thumbnailed." introductionVersion:"%NEXT%"` }