@@ -45,18 +45,22 @@ usage:
45 $(basename "$0") shell
45 $(basename "$0") shell
46 $(basename "$0") install [all|user]
46 $(basename "$0") install [all|user]
47 $(basename "$0") remove [all]
47 $(basename "$0") remove [all]
48− $(basename "$0") activate [server]
48+ $(basename "$0") activate [service]
49− $(basename "$0") deactivate [server]
49+ $(basename "$0") deactivate [service]
50− $(basename "$0") show [server]
50+ $(basename "$0") show [service]
53 start interactive shell from user ${SERVICE_USER}
53 start interactive shell from user ${SERVICE_USER}
55− show server status and log
56−install / remove
54+install / remove all
57− all - complete setup of filtron server
55+ complete setup of filtron service
57+ activate and start service daemon (systemd unit)
59+ stop and deactivate service daemon (systemd unit)
58install user
60install user
59 add service user '$SERVICE_USER' at $SERVICE_HOME
61 add service user '$SERVICE_USER' at $SERVICE_HOME
63+ show service status and log
61 [ ! -z ${1+x} ] && echo -e "$1"
65 [ ! -z ${1+x} ] && echo -e "$1"
@@ -68,7 +72,7 @@ main(){
69 case $1 in
73 case $1 in
70 --source-only) ;;
74 --source-only) ;;
71− -h|--help) usage ;;
75+ -h|--help) usage; exit 0;;
74 sudo_or_exit
78 sudo_or_exit
@@ -76,9 +80,9 @@ main(){
78 case $2 in
82 case $2 in
80 sudo_or_exit
84 sudo_or_exit
81− show_server
85+ show_service
83 *) usage "$_usage"; exit 42;;
87 *) usage "$_usage"; exit 42;;
@@ -99,13 +103,13 @@ main(){
99 activate)
103 activate)
100 sudo_or_exit
104 sudo_or_exit
101 case $2 in
105 case $2 in
102− server) activate_server ;;
106+ service) activate_service ;;
103 *) usage "$_usage"; exit 42;;
107 *) usage "$_usage"; exit 42;;
105 deactivate)
109 deactivate)
106 sudo_or_exit
110 sudo_or_exit
107 case $2 in
111 case $2 in
108− server) deactivate_server ;;
112+ service) deactivate_service ;;
109 *) usage "$_usage"; exit 42;;
113 *) usage "$_usage"; exit 42;;
111 *) usage "ERROR: unknown or missing command $1"; exit 42;;
115 *) usage "ERROR: unknown or missing command $1"; exit 42;;
@@ -120,36 +124,36 @@ install_all() {
121 install_filtron
125 install_filtron
123− install_server
127+ install_service
127remove_all() {
131remove_all() {
128 rst_title "De-Install $SERVICE_NAME (service)"
132 rst_title "De-Install $SERVICE_NAME (service)"
129− remove_server
133+ remove_service
131 remove_user
135 remove_user
132 rm -r "$FILTRON_ETC" 2>&1 | prefix_stdout
136 rm -r "$FILTRON_ETC" 2>&1 | prefix_stdout
136−install_server() {
140+install_service() {
137 rst_title "Install System-D Unit ${SERVICE_NAME}.service" section
141 rst_title "Install System-D Unit ${SERVICE_NAME}.service" section
139 install_template ${SERVICE_SYSTEMD_UNIT} root root 644
143 install_template ${SERVICE_SYSTEMD_UNIT} root root 644
141− activate_server
145+ activate_service
144−remove_server() {
148+remove_service() {
145 if ! ask_yn "Do you really want to deinstall $SERVICE_NAME?"; then
149 if ! ask_yn "Do you really want to deinstall $SERVICE_NAME?"; then
148− deactivate_server
152+ deactivate_service
149 rm "${SERVICE_SYSTEMD_UNIT}" 2>&1 | prefix_stdout
153 rm "${SERVICE_SYSTEMD_UNIT}" 2>&1 | prefix_stdout
152−activate_server () {
156+activate_service () {
153 rst_title "Activate $SERVICE_NAME (service)" section
157 rst_title "Activate $SERVICE_NAME (service)" section
155 tee_stderr <<EOF | bash 2>&1 | prefix_stdout
159 tee_stderr <<EOF | bash 2>&1 | prefix_stdout
@@ -161,7 +165,7 @@ systemctl status $SERVICE_NAME.service
164−deactivate_server () {
168+deactivate_service () {
165 rst_title "De-Activate $SERVICE_NAME (service)" section
169 rst_title "De-Activate $SERVICE_NAME (service)" section
167 tee_stderr <<EOF | bash 2>&1 | prefix_stdout
171 tee_stderr <<EOF | bash 2>&1 | prefix_stdout
@@ -238,8 +242,8 @@ EOF
238 install_template --no-eval "$FILTRON_RULES" root root 644
242 install_template --no-eval "$FILTRON_RULES" root root 644
241−show_server () {
245+show_service () {
242− rst_title "server status & log"
246+ rst_title "service status & log"
244 systemctl status filtron.service
248 systemctl status filtron.service