mirror of https://github.com/searxng/searxng.git
[fix] utils/searx.sh install settings - do not eval the template
The settings template in utils/templates/etc/searx/settings.yml does not include any replacements (shell environment variables). BTW: utils/filtron.sh & utils/lib.sh Add some more messages to installation procedures, to be more clear. Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
parent
102c815231
commit
8ba4dc26d1
|
@ -302,6 +302,12 @@ install_rules() {
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if cmp --silent "${FILTRON_RULES}" "${FILTRON_RULES_TEMPLATE}"; then
|
||||||
|
info_msg "${FILTRON_RULES} is up to date with"
|
||||||
|
info_msg "${FILTRON_RULES_TEMPLATE}"
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
rst_para "Diff between origin's rules file (+) and current (-):"
|
rst_para "Diff between origin's rules file (+) and current (-):"
|
||||||
echo "${FILTRON_RULES}" "${FILTRON_RULES_TEMPLATE}"
|
echo "${FILTRON_RULES}" "${FILTRON_RULES_TEMPLATE}"
|
||||||
$DIFF_CMD "${FILTRON_RULES}" "${FILTRON_RULES_TEMPLATE}"
|
$DIFF_CMD "${FILTRON_RULES}" "${FILTRON_RULES_TEMPLATE}"
|
||||||
|
|
|
@ -437,7 +437,8 @@ install_template() {
|
||||||
|
|
||||||
if [[ "$do_eval" == "1" ]]; then
|
if [[ "$do_eval" == "1" ]]; then
|
||||||
template_file="${CACHE}${dst}${variant}"
|
template_file="${CACHE}${dst}${variant}"
|
||||||
info_msg "BUILD template ${template_file}"
|
info_msg "BUILD ${template_file}"
|
||||||
|
info_msg "BUILD using template ${template_origin}"
|
||||||
if [[ -n ${SUDO_USER} ]]; then
|
if [[ -n ${SUDO_USER} ]]; then
|
||||||
sudo -u "${SUDO_USER}" mkdir -p "$(dirname "${template_file}")"
|
sudo -u "${SUDO_USER}" mkdir -p "$(dirname "${template_file}")"
|
||||||
else
|
else
|
||||||
|
|
|
@ -621,7 +621,7 @@ install_settings() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p "$(dirname "${SEARX_SETTINGS_PATH}")"
|
mkdir -p "$(dirname "${SEARX_SETTINGS_PATH}")"
|
||||||
install_template \
|
install_template --no-eval \
|
||||||
"${SEARX_SETTINGS_PATH}" \
|
"${SEARX_SETTINGS_PATH}" \
|
||||||
"${SERVICE_USER}" "${SERVICE_GROUP}"
|
"${SERVICE_USER}" "${SERVICE_GROUP}"
|
||||||
configure_searx
|
configure_searx
|
||||||
|
|
Loading…
Reference in New Issue