summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarit.de>2020-02-11 15:58:35 +0100
committerMarkus Heiser <markus.heiser@darmarit.de>2020-02-11 15:58:35 +0100
commite6bf2038c38599a278ca110276c942e7e111d207 (patch)
treef43d0d6536ad39e8511fdfae0eca4afda026b92b
parent0d6153db127133e59137f4359975bafd705e0f4b (diff)
filtron.sh: add 'install rules' command
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
-rwxr-xr-xutils/filtron.sh4
-rwxr-xr-xutils/lib.sh16
2 files changed, 18 insertions, 2 deletions
diff --git a/utils/filtron.sh b/utils/filtron.sh
index 1bea7a717..df6932723 100755
--- a/utils/filtron.sh
+++ b/utils/filtron.sh
@@ -58,7 +58,7 @@ usage() {
usage::
$(basename "$0") shell
- $(basename "$0") install [all|user]
+ $(basename "$0") install [all|user|rules]
$(basename "$0") update [filtron]
$(basename "$0") remove [all]
$(basename "$0") activate [service]
@@ -72,6 +72,7 @@ shell
install / remove
:all: complete setup of filtron service
:user: add/remove service user '$SERVICE_USER' ($SERVICE_HOME)
+ :rules: reinstall filtron rules $FILTRON_RULES
update filtron
Update filtron installation ($SERVICE_HOME)
activate service
@@ -133,6 +134,7 @@ main() {
rst_title "Re-Install filtron rules"
echo
install_template --no-eval "$FILTRON_RULES" root root 644
+ systemd_restart_service "${SERVICE_NAME}"
;;
*) usage "$_usage"; exit 42;;
esac ;;
diff --git a/utils/lib.sh b/utils/lib.sh
index 59ad12229..991fe77fa 100755
--- a/utils/lib.sh
+++ b/utils/lib.sh
@@ -569,7 +569,7 @@ systemd_remove_service() {
systemd_activate_service() {
- # usage: systemd_activate_service "${SERVICE_NAME}"w
+ # usage: systemd_activate_service "${SERVICE_NAME}"
rst_title "Activate ${1} (service)" section
echo
@@ -594,6 +594,20 @@ systemctl disable ${1}.service
EOF
}
+systemd_restart_service() {
+
+ # usage: systemd_restart_service "${SERVICE_NAME}"
+
+ rst_title "Restart ${1} (service)" section
+ echo
+ tee_stderr <<EOF | bash 2>&1
+systemctl restart ${1}.service
+EOF
+ tee_stderr <<EOF | bash 2>&1
+systemctl status --no-pager ${1}.service
+EOF
+}
+
# Apache
# ------