From e429a0042bbf88c33f4c59e5df786ac86038de1b Mon Sep 17 00:00:00 2001 From: VD Date: Mon, 12 Oct 2020 12:52:03 +0200 Subject: [PATCH] fix(domain): Allow FQDN domain definition Allows `subdomain.domain` form in the environment variables --- README.md | 2 +- run-parsoid.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6e32273..b4ec62d 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ docker run -d -p 8142:8000 -e PARSOID_DOMAIN_localhost=http://localhost/w/api.ph ## Settings (ENV vars) -- `PARSOID_DOMAIN_{domain}` defines URI and domain for the Parsoid service. The value of `{domain}` should be the same as the `MW_REST_DOMAIN` parameter in the MediaWiki web container. You can specify such variables multiple times (one for each domain the service should run for) +- `PARSOID_DOMAIN_{domain}` defines URI and domain for the Parsoid service. The value of `{domain}` should be the same as the `MW_REST_DOMAIN` parameter in the MediaWiki web container. You can specify such variables multiple times (one for each domain the service should run for). When the `{domain}` contains 1 or multiple dot(.) character(s), replace it by underscore character(s), for i.e.: www.mediawiki.org results in the domain part be `PARSOID_DOMAIN_www_mediawiki_org` - `PARSOID_NUM_WORKERS` defines the number of worker processes to the parsoid service. Set to `0` to run everything in a single process without clustering. Use `ncpu` to run as many workers as there are CPU units. - `PARSOID_LOGGING_LEVEL` by default `info` - `PARSOID_STRICT_SSL` by default `true` [`true`, `false`] diff --git a/run-parsoid.sh b/run-parsoid.sh index 53a70fd..228efbe 100644 --- a/run-parsoid.sh +++ b/run-parsoid.sh @@ -94,11 +94,11 @@ do if [ -z "${!var}" ]; then echo >&2 "The $var variable must not be an empty string"; fi - + domain=${var:15} cat <> config.yaml - uri: '${!var}' - domain: '${var:15}' + domain: '${domain//_/.}' EOT done chmod 744 config.yaml