remote: conditionalize systemd socket unit files

Prepare for reusing libvirtd socket unit files with other daemons by
making various parts of their config conditionally defined by the make
rules.

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

src/remote/Makefile.inc.am

@@ -295,6 +295,10 @@ endif WITH_SASL
 
 LIBVIRTD_UNIT_VARS = \
 	$(COMMON_UNIT_VARS) \
+	-e 's|[@]name[@]|Libvirt|g' \
+	-e 's|[@]service[@]|libvirtd|g' \
+	-e 's|[@]sockprefix[@]|libvirt|g' \
+	-e 's|[@]deps[@]||g' \
 	$(NULL)
 
 libvirtd.service: remote/libvirtd.service.in $(top_builddir)/config.status

src/remote/libvirtd-admin.socket.in

@@ -1,14 +1,15 @@
 [Unit]
-Description=Libvirt admin socket
+Description=@name@ admin socket
-Before=libvirtd.service
+Before=@service@.service
-BindsTo=libvirtd.socket
+BindsTo=@service@.socket
-After=libvirtd.socket
+After=@service@.socket
+@deps@
 
 [Socket]
-# The directory must match the @sysconfdir@/libvirt/libvirtd.conf unix_sock_dir setting
+# The directory must match the @sysconfdir@/libvirt/@service@.conf unix_sock_dir setting
 # when using systemd version < 227
-ListenStream=@localstatedir@/run/libvirt/libvirt-admin-sock
+ListenStream=@localstatedir@/run/libvirt/@sockprefix@-admin-sock
-Service=libvirtd.service
+Service=@service@.service
 SocketMode=0600
 
 [Install]

src/remote/libvirtd-ro.socket.in

@@ -1,14 +1,15 @@
 [Unit]
-Description=Libvirt local read-only socket
+Description=@name@ local read-only socket
-Before=libvirtd.service
+Before=@service@.service
-BindsTo=libvirtd.socket
+BindsTo=@service@.socket
-After=libvirtd.socket
+After=@service@.socket
+@deps@
 
 [Socket]
-# The directory must match the @sysconfdir@/libvirt/libvirtd.conf unix_sock_dir setting
+# The directory must match the @sysconfdir@/libvirt/@service@.conf unix_sock_dir setting
 # when using systemd version < 227
-ListenStream=@localstatedir@/run/libvirt/libvirt-sock-ro
+ListenStream=@localstatedir@/run/libvirt/@sockprefix@-sock-ro
-Service=libvirtd.service
+Service=@service@.service
 SocketMode=0666
 
 [Install]

src/remote/libvirtd-tcp.socket.in

@@ -1,14 +1,15 @@
 [Unit]
-Description=Libvirt non-TLS IP socket
+Description=@name@ non-TLS IP socket
-Before=libvirtd.service
+Before=@service@.service
-BindsTo=libvirtd.socket
+BindsTo=@service@.socket
-After=libvirtd.socket
+After=@service@.socket
+@deps@
 
 [Socket]
-# This must match the @sysconfdir@/libvirt/libvirtd.conf tcp_port setting
+# This must match the @sysconfdir@/libvirt/@service@.conf tcp_port setting
 # when using systemd version < 227
 ListenStream=16509
-Service=libvirtd.service
+Service=@service@.service
 
 [Install]
 WantedBy=sockets.target

src/remote/libvirtd-tls.socket.in

@@ -1,14 +1,15 @@
 [Unit]
-Description=Libvirt TLS IP socket
+Description=@name@ TLS IP socket
-Before=libvirtd.service
+Before=@service@.service
-BindsTo=libvirtd.socket
+BindsTo=@service@.socket
-After=libvirtd.socket
+After=@service@.socket
+@deps@
 
 [Socket]
-# This must match the @sysconfdir@/libvirt/libvirtd.conf tls_port setting
+# This must match the @sysconfdir@/libvirt/@service@.conf tls_port setting
 # when using systemd version < 227
 ListenStream=16514
-Service=libvirtd.service
+Service=@service@.service
 
 [Install]
 WantedBy=sockets.target

src/remote/libvirtd.socket.in

@@ -1,12 +1,13 @@
 [Unit]
-Description=Libvirt local socket
+Description=@name@ local socket
-Before=libvirtd.service
+Before=@service@.service
+@deps@
 
 [Socket]
-# The directory must match the @sysconfdir@/libvirt/libvirtd.conf unix_sock_dir setting
+# The directory must match the @sysconfdir@/libvirt/@service@.conf unix_sock_dir setting
 # when using systemd version < 227
-ListenStream=@localstatedir@/run/libvirt/libvirt-sock
+ListenStream=@localstatedir@/run/libvirt/@sockprefix@-sock
-Service=libvirtd.service
+Service=@service@.service
 SocketMode=0666
 
 [Install]