[libvirt PATCH 23/42] systemd: Switch virtproxyd to common templates
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
src/remote/meson.build | 10 +++-------
src/remote/virtproxyd.service.in | 25 -------------------------
2 files changed, 3 insertions(+), 32 deletions(-)
delete mode 100644 src/remote/virtproxyd.service.in
diff --git a/src/remote/meson.build b/src/remote/meson.build
index 365d632095..73a9f0a986 100644
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -226,16 +226,12 @@ 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'),
- 'deps': 'Conflicts=' + libvirtd_socket_conflicts,
+ 'socket_unit_extra': [
+ 'Conflicts=' + libvirtd_socket_conflicts,
+ ],
}
openrc_init_files += {
diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in
deleted file mode 100644
index 9b829641f7..0000000000
--- 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
--
2.41.0