systemd: Switch virtproxyd to common templates

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/remote/meson.build b/src/remote/meson.build
index 78c08bf5add74d608c38fba3e2dc386572026658..5ee6d4e61cc00e16ba81bef89e1040caf4af6044 100644 (file)
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -224,15 +224,9 @@ if conf.has('WITH_REMOTE')
 
     virt_daemon_units += {
       'service': 'virtproxyd',
-      'service_in': files('virtproxyd.service.in'),
       'name': 'Libvirt proxy',
       'sockprefix': 'libvirt',
       'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
-      'socket_in': files('libvirtd.socket.in'),
-      'socket_ro_in': files('libvirtd-ro.socket.in'),
-      'socket_admin_in': files('libvirtd-admin.socket.in'),
-      'socket_tcp_in': files('libvirtd-tcp.socket.in'),
-      'socket_tls_in': files('libvirtd-tls.socket.in'),
     }
 
     openrc_init_files += {

diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in
deleted file mode 100644 (file)
index 9b82964..0000000
--- a/src/remote/virtproxyd.service.in
+++ /dev/null
@@ -1,25 +0,0 @@
-[Unit]
-Description=Virtualization daemon
-Conflicts=libvirtd.service
-Requires=virtproxyd.socket
-Requires=virtproxyd-ro.socket
-Requires=virtproxyd-admin.socket
-After=network.target
-After=dbus.service
-After=apparmor.service
-Documentation=man:virtproxyd(8)
-Documentation=https://libvirt.org
-
-[Service]
-Type=notify
-Environment=VIRTPROXYD_ARGS="--timeout 120"
-EnvironmentFile=-@initconfdir@/virtproxyd
-ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-Also=virtproxyd.socket
-Also=virtproxyd-ro.socket
-Also=virtproxyd-admin.socket