@@ -45,18 +45,22 @@ usage:
4545 $(basename "$0") shell
4646 $(basename "$0") install [all|user]
4747 $(basename "$0") remove [all]
48− $(basename "$0") activate [server]
49− $(basename "$0") deactivate [server]
50− $(basename "$0") show [server]
48+ $(basename "$0") activate [service]
49+ $(basename "$0") deactivate [service]
50+ $(basename "$0") show [service]
5151
5252shell
5353 start interactive shell from user ${SERVICE_USER}
54−show server
55− show server status and log
56−install / remove
57− all - complete setup of filtron server
54+install / remove all
55+ complete setup of filtron service
56+activate
57+ activate and start service daemon (systemd unit)
58+deactivate service
59+ stop and deactivate service daemon (systemd unit)
5860install user
5961 add service user '$SERVICE_USER' at $SERVICE_HOME
62+show service
63+ show service status and log
6064EOF
6165 [ ! -z ${1+x} ] && echo -e "$1"
6266}
@@ -68,7 +72,7 @@ main(){
6872
6973 case $1 in
7074 --source-only) ;;
71− -h|--help) usage ;;
75+ -h|--help) usage; exit 0;;
7276
7377 shell)
7478 sudo_or_exit
@@ -76,9 +80,9 @@ main(){
7680 ;;
7781 show)
7882 case $2 in
79− server)
83+ service)
8084 sudo_or_exit
81− show_server
85+ show_service
8286 ;;
8387 *) usage "$_usage"; exit 42;;
8488 esac ;;
@@ -99,13 +103,13 @@ main(){
99103 activate)
100104 sudo_or_exit
101105 case $2 in
102− server) activate_server ;;
106+ service) activate_service ;;
103107 *) usage "$_usage"; exit 42;;
104108 esac ;;
105109 deactivate)
106110 sudo_or_exit
107111 case $2 in
108− server) deactivate_server ;;
112+ service) deactivate_service ;;
109113 *) usage "$_usage"; exit 42;;
110114 esac ;;
111115 *) usage "ERROR: unknown or missing command $1"; exit 42;;
@@ -120,36 +124,36 @@ install_all() {
120124 wait_key
121125 install_filtron
122126 wait_key
123− install_server
127+ install_service
124128 wait_key
125129}
126130
127131remove_all() {
128132 rst_title "De-Install $SERVICE_NAME (service)"
129− remove_server
133+ remove_service
130134 wait_key
131135 remove_user
132136 rm -r "$FILTRON_ETC" 2>&1 | prefix_stdout
133137 wait_key
134138}
135139
136−install_server() {
140+install_service() {
137141 rst_title "Install System-D Unit ${SERVICE_NAME}.service" section
138142 echo
139143 install_template ${SERVICE_SYSTEMD_UNIT} root root 644
140144 wait_key
141− activate_server
145+ activate_service
142146}
143147
144−remove_server() {
148+remove_service() {
145149 if ! ask_yn "Do you really want to deinstall $SERVICE_NAME?"; then
146150 return
147151 fi
148− deactivate_server
152+ deactivate_service
149153 rm "${SERVICE_SYSTEMD_UNIT}" 2>&1 | prefix_stdout
150154}
151155
152−activate_server () {
156+activate_service () {
153157 rst_title "Activate $SERVICE_NAME (service)" section
154158 echo
155159 tee_stderr <<EOF | bash 2>&1 | prefix_stdout
@@ -161,7 +165,7 @@ systemctl status $SERVICE_NAME.service
161165EOF
162166}
163167
164−deactivate_server () {
168+deactivate_service () {
165169 rst_title "De-Activate $SERVICE_NAME (service)" section
166170 echo
167171 tee_stderr <<EOF | bash 2>&1 | prefix_stdout
@@ -238,8 +242,8 @@ EOF
238242 install_template --no-eval "$FILTRON_RULES" root root 644
239243}
240244
241−show_server () {
242− rst_title "server status & log"
245+show_service () {
246+ rst_title "service status & log"
243247 echo
244248 systemctl status filtron.service
245249 echo