on master help sign in
.config.sh: wrap up to use environment from Makefile as best defaults
8ca86f4Markus Heiser
.config.sh+6−4
@@ -15,7 +15,8 @@
15# Compare your settings here with file .config.mk used by the Makefile targets.
15# Compare your settings here with file .config.mk used by the Makefile targets.
16
16
17# The public URL of the searx instance: PUBLIC_URL="https://mydomain.xy/searx"
17# The public URL of the searx instance: PUBLIC_URL="https://mydomain.xy/searx"
18+# The default is taken from the Makefile environment (SEARX_URL).
18−PUBLIC_URL="${PUBLIC_URL:-http://$(uname -n)/searx}"
19+PUBLIC_URL="${SEARX_URL:-http://$(uname -n)/searx}"
19PUBLIC_HOST="${PUBLIC_HOST:-$(echo "$PUBLIC_URL" | sed -e 's/[^/]*\/\/\([^@]*@\)\?\([^:/]*\).*/\2/')}"
20PUBLIC_HOST="${PUBLIC_HOST:-$(echo "$PUBLIC_URL" | sed -e 's/[^/]*\/\/\([^@]*@\)\?\([^:/]*\).*/\2/')}"
20
21
21# searx.sh
22# searx.sh
@@ -23,9 +24,10 @@ PUBLIC_HOST="${PUBLIC_HOST:-$(echo "$PUBLIC_URL" | sed -e 's/[^/]*\/\/\([^@]*@\)
23
24
24SEARX_INTERNAL_URL="${SEARX_INTERNAL_URL:-127.0.0.1:8888}"
25SEARX_INTERNAL_URL="${SEARX_INTERNAL_URL:-127.0.0.1:8888}"
25
26
26−# Only change, if you maintain a searx brand in your searx fork
27+# Only change, if you maintain a searx brand in your searx fork. The default is
28+# taken from the Makefile environment (DOCS_URL, GIT_URL).
27−SEARX_DOCS_URL="${SEARX_DOCS_URL:-https://asciimoo.github.io/searx}"
29+SEARX_DOCS_URL="${DOCS_URL:-https://asciimoo.github.io/searx}"
28−SEARX_GIT_URL="${SEARX_GIT_URL:-https://github.com/asciimoo/searx.git}"
30+SEARX_GIT_URL="${GIT_URL:-https://github.com/asciimoo/searx.git}"
29SEARX_GIT_BRANCH="${SEARX_GIT_BRANCH:-master}"
31SEARX_GIT_BRANCH="${SEARX_GIT_BRANCH:-master}"
30
32
31# filtron.sh
33# filtron.sh