git.iko.soy/searx
on master help sign in
filtron.sh: add 'install rules' command
e6bf203Markus Heiser
utils/filtron.sh+3−1
compare with master
unifiedsplit
@@ -58,7 +58,7 @@ usage() {
58usage::
58usage::
59
59
60 $(basename "$0") shell
60 $(basename "$0") shell
61− $(basename "$0") install [all|user]
61+ $(basename "$0") install [all|user|rules]
62 $(basename "$0") update [filtron]
62 $(basename "$0") update [filtron]
63 $(basename "$0") remove [all]
63 $(basename "$0") remove [all]
64 $(basename "$0") activate [service]
64 $(basename "$0") activate [service]
@@ -72,6 +72,7 @@ shell
72install / remove
72install / remove
73 :all: complete setup of filtron service
73 :all: complete setup of filtron service
74 :user: add/remove service user '$SERVICE_USER' ($SERVICE_HOME)
74 :user: add/remove service user '$SERVICE_USER' ($SERVICE_HOME)
75+ :rules: reinstall filtron rules $FILTRON_RULES
75update filtron
76update filtron
76 Update filtron installation ($SERVICE_HOME)
77 Update filtron installation ($SERVICE_HOME)
77activate service
78activate service
@@ -133,6 +134,7 @@ main() {
133 rst_title "Re-Install filtron rules"
134 rst_title "Re-Install filtron rules"
134 echo
135 echo
135 install_template --no-eval "$FILTRON_RULES" root root 644
136 install_template --no-eval "$FILTRON_RULES" root root 644
137+ systemd_restart_service "${SERVICE_NAME}"
136 ;;
138 ;;
137 *) usage "$_usage"; exit 42;;
139 *) usage "$_usage"; exit 42;;
138 esac ;;
140 esac ;;
utils/lib.sh+15−1
@@ -569,7 +569,7 @@ systemd_remove_service() {
569
569
570systemd_activate_service() {
570systemd_activate_service() {
571
571
572− # usage: systemd_activate_service "${SERVICE_NAME}"w
572+ # usage: systemd_activate_service "${SERVICE_NAME}"
573
573
574 rst_title "Activate ${1} (service)" section
574 rst_title "Activate ${1} (service)" section
575 echo
575 echo
@@ -594,6 +594,20 @@ systemctl disable ${1}.service
594EOF
594EOF
595}
595}
596
596
597+systemd_restart_service() {
598+
599+ # usage: systemd_restart_service "${SERVICE_NAME}"
600+
601+ rst_title "Restart ${1} (service)" section
602+ echo
603+ tee_stderr <<EOF | bash 2>&1
604+systemctl restart ${1}.service
605+EOF
606+ tee_stderr <<EOF | bash 2>&1
607+systemctl status --no-pager ${1}.service
608+EOF
609+}
610+
597
611
598# Apache
612# Apache
599# ------
613# ------