Add vitastor-mon.service, vitastor.target, create user and log directory during package installation

mon/make-etcd.sh

@@ -1,13 +1,12 @@
 #!/bin/bash
-# Very simple systemd unit generator for etcd & vitastor-mon services
-# Not the final solution yet, mostly for tests
+# Simple systemd unit generator for etcd
 # Copyright (c) Vitaliy Filippov, 2019+
 # License: MIT
 
-# USAGE: ./make-units.sh
+# USAGE: [IP_SUBSTR=10.200.1.] [ETCD_HOSTS=etcd0=http://10.200.1.10:2380,...] ./make-etcd.sh
 
-IP_SUBSTR="10.200.1."
-ETCD_HOSTS="etcd0=http://10.200.1.10:2380,etcd1=http://10.200.1.11:2380,etcd2=http://10.200.1.12:2380"
+IP_SUBSTR=${IP_SUBSTR:-10.200.1.}
+ETCD_HOSTS=${ETCD_HOSTS:-etcd0=http://10.200.1.10:2380,etcd1=http://10.200.1.11:2380,etcd2=http://10.200.1.12:2380}
 
 # determine IP
 IP=`ip -json a s | jq -r '.[].addr_info[] | select(.local | startswith("'$IP_SUBSTR'")) | .local'`
@@ -16,7 +15,6 @@ ETCD_NUM=${ETCD_HOSTS/$IP*/}
 [ "$ETCD_NUM" != "$ETCD_HOSTS" ] || exit 1
 ETCD_NUM=$(echo $ETCD_NUM | tr -d -c , | wc -c)
 
-# etcd
 useradd etcd
 
 mkdir -p /var/lib/etcd$ETCD_NUM.etcd
@@ -50,37 +48,3 @@ EOF
 systemctl daemon-reload
 systemctl enable etcd
 systemctl start etcd
-
-useradd vitastor
-chmod 755 /root
-
-# Vitastor target
-cat >/etc/systemd/system/vitastor.target <<EOF
-[Unit]
-Description=vitastor target
-[Install]
-WantedBy=multi-user.target
-EOF
-
-# Monitor unit
-ETCD_MON=$(echo $ETCD_HOSTS | perl -pe 's/:2380/:2379/g; s/etcd\d*=//g;')
-cat >/etc/systemd/system/vitastor-mon.service <<EOF
-[Unit]
-Description=Vitastor monitor
-After=network-online.target local-fs.target time-sync.target
-Wants=network-online.target local-fs.target time-sync.target
-
-[Service]
-Restart=always
-ExecStart=node /usr/lib/vitastor/mon/mon-main.js --etcd_url '$ETCD_MON' --etcd_prefix '/vitastor' --etcd_start_timeout 5
-WorkingDirectory=/
-User=vitastor
-PrivateTmp=false
-TasksMax=infinity
-Restart=always
-StartLimitInterval=0
-RestartSec=10
-
-[Install]
-WantedBy=vitastor.target
-EOF

mon/mon-main.js

@@ -12,7 +12,7 @@ for (let i = 2; i < process.argv.length; i++)
     if (process.argv[i] === '-h' || process.argv[i] === '--help')
     {
         console.error('USAGE: '+process.argv[0]+' '+process.argv[1]+' [--verbose 1]'+
-            ' [--etcd_address "http://127.0.0.1:2379,..."] [--config_file /etc/vitastor/vitastor.conf]'+
+            ' [--etcd_address "http://127.0.0.1:2379,..."] [--config_path /etc/vitastor/vitastor.conf]'+
             ' [--etcd_prefix "/vitastor"] [--etcd_start_timeout 5]');
         process.exit();
     }

mon/vitastor-mon.service

@@ -0,0 +1,18 @@
+[Unit]
+Description=Vitastor monitor
+After=network-online.target local-fs.target time-sync.target
+Wants=network-online.target local-fs.target time-sync.target
+
+[Service]
+Restart=always
+ExecStart=node /usr/lib/vitastor/mon/mon-main.js
+WorkingDirectory=/
+User=vitastor
+PrivateTmp=false
+TasksMax=infinity
+Restart=always
+StartLimitInterval=0
+RestartSec=10
+
+[Install]
+WantedBy=vitastor.target

mon/vitastor.target

@@ -0,0 +1,4 @@
+[Unit]
+Description=vitastor target
+[Install]
+WantedBy=multi-user.target