From 4fec7a74e579796568989c1e70e62947f1f34903 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sun, 6 Feb 2022 16:35:29 +0100 Subject: [PATCH] [fix] docker generated new settings.yml does not work In commit 5a7b12e we normalized settings.yml and c6a5cc019 and de5a8ee7d we changed instance name to ``instance_name: "SearXNG"``. This patch adjust the sed expressions to modify: dockerfiles/docker-entrypoint.sh Closes: https://github.com/searxng/searxng/issues/876 Suggested-by: @neiaberau Signed-off-by: Markus Heiser --- dockerfiles/docker-entrypoint.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dockerfiles/docker-entrypoint.sh b/dockerfiles/docker-entrypoint.sh index 7d0a8a8a..9195ff30 100755 --- a/dockerfiles/docker-entrypoint.sh +++ b/dockerfiles/docker-entrypoint.sh @@ -71,23 +71,24 @@ patch_searxng_settings() { export BASE_URL="${BASE_URL%/}/" # update settings.yml - sed -i -e "s|base_url : False|base_url : ${BASE_URL}|g" \ - -e "s/instance_name : \"searxng\"/instance_name : \"${INSTANCE_NAME}\"/g" \ - -e "s/autocomplete : \"\"/autocomplete : \"${AUTOCOMPLETE}\"/g" \ - -e "s/ultrasecretkey/$(openssl rand -hex 32)/g" \ - "${CONF}" + sed -i \ + -e "s|base_url: false|base_url: ${BASE_URL}|g" \ + -e "s/instance_name: \"SearXNG\"/instance_name: \"${INSTANCE_NAME}\"/g" \ + -e "s/autocomplete: \"\"/autocomplete: \"${AUTOCOMPLETE}\"/g" \ + -e "s/ultrasecretkey/$(openssl rand -hex 32)/g" \ + "${CONF}" # Morty configuration if [ -n "${MORTY_KEY}" ] && [ -n "${MORTY_URL}" ]; then - sed -i -e "s/image_proxy : False/image_proxy : True/g" \ + sed -i -e "s/image_proxy: false/image_proxy: true/g" \ "${CONF}" cat >> "${CONF}" <<-EOF # Morty configuration result_proxy: - url : ${MORTY_URL} - key : !!binary "${MORTY_KEY}" + url: ${MORTY_URL} + key: !!binary "${MORTY_KEY}" EOF fi }