build: systemd runs the panel on hosts instead of supervisor

The installer and the manual installation install four systemd units
(webvirt-cloud, webvirt-novncd, webvirt-socketiod, webvirt-worker) that
run as the web server's user with absolute paths and read
/etc/default/webvirtcloud. gunicorn, socketiod and the worker stop with
KillMode=mixed, so they wind down their own children. supervisor, its
installer code and the contributed systemd files go; the README gets
the update, rollback and a one-time move from supervisor, and the
installer refuses to run over a supervisor install. Docker keeps runit;
novncd's runit script is the one-line form of the others.

conf/systemd/README.md

@@ -1,16 +0,0 @@
-# Ubuntu Service Files
-
-I choose to install this service on Ubuntu 22.04
-
-The process is not fully documented but I wanted to contribute the service files
-
-The file webvirt is beeing installed into /etc/default/webvirt and allows you to easily change the location of the webvirtcloud installation path
-
-The PATH variable being set for these services includes /usr/bin which contains the ssh executable. That is being used by webvirt-cloud and webvirt-novncd
-
-Should the executable be located in another location please adjust the path
-
-The error you should be seeing is "ssh executable not found"
-
-
-Use one of the two service managers: the installer sets up supervisor (`conf/supervisor/webvirtcloud.conf` runs the worker); these units are for manual installs without supervisor. Enabling both starts two workers; the second waits for the lease and does nothing.

conf/systemd/install.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-FILEPATH=$(readlink -f "$0");
-SCRIPTPATH=$(dirname "$FILEPATH");
-cd "$SCRIPTPATH"
-cp webvirt-* /lib/systemd/system/
-cp webvirt /etc/default/
-echo Run to start services \"systemctl daemon-reload\; systemctl enable --now $(ls webvirt-* | tr "\n" " ")\"

conf/systemd/webvirt

@@ -1,2 +0,0 @@
-WEBVIRT_PATH="/srv/webvirtcloud"
-PATH="$WEBVIRT_PATH/venv/bin:/usr/bin"

conf/systemd/webvirt-cloud.service

@@ -1,23 +1,19 @@
 [Unit]
-Description=Webvirt Cloud Webinterface
+Description=WebVirtCloud panel (gunicorn)
 Wants=network-online.target
 After=network-online.target
 
 [Service]
-Type=simple
-Restart=on-failure
-RestartSec=10
 User=www-data
 Group=www-data
-LimitNOFILE=64000
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-EnvironmentFile=/etc/default/webvirt
-
-ExecStart=/bin/bash -c "cd ${WEBVIRT_PATH};${WEBVIRT_PATH}/venv/bin/gunicorn webvirtcloud.wsgi:application -c ${WEBVIRT_PATH}/gunicorn.conf.py"
-
-# Make sure stderr/stdout is captured in the systemd journal.
-StandardOutput=journal
-StandardError=journal
+WorkingDirectory=/srv/webvirtcloud
+EnvironmentFile=-/etc/default/webvirtcloud
+ExecStart=/srv/webvirtcloud/venv/bin/gunicorn webvirtcloud.wsgi:application -c /srv/webvirtcloud/gunicorn.conf.py
+# gunicorn stops its workers itself; the rest of the group is killed after the timeout
+KillMode=mixed
+TimeoutStopSec=90
+Restart=on-failure
+RestartSec=10
 
 [Install]
 WantedBy=multi-user.target

conf/systemd/webvirt-novncd.service

@@ -1,23 +1,16 @@
 [Unit]
-Description=Webvirt Cloud NOVNCD
+Description=WebVirtCloud VNC console proxy (novncd)
 Wants=network-online.target
 After=network-online.target
 
 [Service]
-Type=simple
-Restart=on-failure
-RestartSec=10
 User=www-data
 Group=www-data
-LimitNOFILE=64000
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-EnvironmentFile=/etc/default/webvirt
-
-ExecStart=/bin/bash -c "cd ${WEBVIRT_PATH};${WEBVIRT_PATH}/venv/bin/python3 ${WEBVIRT_PATH}/console/novncd"
-
-# Make sure stderr/stdout is captured in the systemd journal.
-StandardOutput=journal
-StandardError=journal
+WorkingDirectory=/srv/webvirtcloud
+EnvironmentFile=-/etc/default/webvirtcloud
+ExecStart=/srv/webvirtcloud/venv/bin/python3 /srv/webvirtcloud/console/novncd
+Restart=on-failure
+RestartSec=10
 
 [Install]
 WantedBy=multi-user.target

conf/systemd/webvirt-socketiod.service

@@ -1,23 +1,18 @@
 [Unit]
-Description=Webvirt Cloud serial console (socketiod; refuses connections unless SERIAL_CONSOLE_ENABLED = True)
+Description=WebVirtCloud serial console (socketiod; refuses connections unless SERIAL_CONSOLE_ENABLED)
 Wants=network-online.target
 After=network-online.target
 
 [Service]
-Type=simple
-Restart=on-failure
-RestartSec=10
 User=www-data
 Group=www-data
-LimitNOFILE=64000
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-EnvironmentFile=/etc/default/webvirt
-
-ExecStart=/bin/bash -c "cd ${WEBVIRT_PATH};${WEBVIRT_PATH}/venv/bin/python3 ${WEBVIRT_PATH}/console/socketiod"
-
-# Make sure stderr/stdout is captured in the systemd journal.
-StandardOutput=journal
-StandardError=journal
+WorkingDirectory=/srv/webvirtcloud
+EnvironmentFile=-/etc/default/webvirtcloud
+ExecStart=/srv/webvirtcloud/venv/bin/python3 /srv/webvirtcloud/console/socketiod
+# gunicorn stops its worker itself; the consoles end with their ptys
+KillMode=mixed
+Restart=on-failure
+RestartSec=10
 
 [Install]
 WantedBy=multi-user.target

conf/systemd/webvirt-worker.service

@@ -4,16 +4,17 @@ Wants=network-online.target
 After=network-online.target
 
 [Service]
-Type=simple
-Restart=on-failure
-RestartSec=10
 User=www-data
 Group=www-data
-EnvironmentFile=/etc/default/webvirt
-ExecStart=/bin/bash -c "cd ${WEBVIRT_PATH}; WEBVIRTCLOUD_LOG_FILE=${WEBVIRT_PATH}/data/webvirtcloud-worker.log ${WEBVIRT_PATH}/venv/bin/python3 manage.py run_worker"
+WorkingDirectory=/srv/webvirtcloud
+EnvironmentFile=-/etc/default/webvirtcloud
+Environment=WEBVIRTCLOUD_LOG_FILE=/srv/webvirtcloud/data/webvirtcloud-worker.log
+ExecStart=/srv/webvirtcloud/venv/bin/python3 /srv/webvirtcloud/manage.py run_worker
+# the worker finishes its jobs for up to 60 s; its libvirt connections stay meanwhile
+KillMode=mixed
 TimeoutStopSec=90
-StandardOutput=journal
-StandardError=journal
+Restart=on-failure
+RestartSec=10
 
 [Install]
 WantedBy=multi-user.target