Merge lp:~jderose/dmedia/systemd into lp:dmedia

[Jason Gerard DeRose]

Adds initial support for running Dmedia as a systemd user service.

[David Jordan (dmj726)]

This looks good to me. One thing is to make sure it autostarts. Unless there's a better way, one way would be to call the service from a script in /etc/xdg/autostart/ but let systemd manage it from there forward.

review: Approve

=== removed file 'dbus-activation-hack.sh'
--- dbus-activation-hack.sh	2014-05-24 05:09:55 +0000
+++ dbus-activation-hack.sh	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# Based on script of the same name in the Ubuntu 13.10 `hud` package.
-# We should be able to drop this as soon as we drop 13.10 support.
-#
-#                       Original comment:
-# This is a quick hack to make it so that DBus activation works as the
-# DBus daemon holds onto the PID until the name gets registered.  So we
-# need the PID to exist until then.  10 seconds should be more that enough
-# time for the service to register the name.
-#
-# This can go away if we get DBus Activation for Upstart
-
-if [ "x$UPSTART_SESSION" != "x" ]; then
-	start dmedia
-	sleep 5
-else
-	/usr/lib/dmedia/dmedia-service
-fi
 
=== modified file 'debian/dmedia.install'
--- debian/dmedia.install	2013-02-21 10:50:22 +0000
+++ debian/dmedia.install	2019-12-10 02:19:02 +0000
@@ -1,1 +1,2 @@
 debian/source_dmedia.py usr/share/apport/package-hooks/
+dmedia.service usr/lib/systemd/user/
 
=== removed file 'debian/dmedia.user-session.upstart'
--- debian/dmedia.user-session.upstart	2013-12-12 20:11:58 +0000
+++ debian/dmedia.user-session.upstart	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-# Dmedia - a distributed object store aimed at professional content creation
-
-description "Start the per user Dmedia instance"
-author "Jason Gerard DeRose <[e-mail]>"
-
-start on desktop-start
-stop on desktop-end
-respawn
-
-exec /usr/lib/dmedia/dmedia-service
 
=== modified file 'debian/rules'
--- debian/rules	2014-09-28 03:04:13 +0000
+++ debian/rules	2019-12-10 02:19:02 +0000
@@ -25,5 +25,4 @@
 				--install-layout=deb \
 				--root=$(CURDIR)/debian/dmedia; \
 	done
-	install -m 644 -D debian/dmedia.user-session.upstart debian/dmedia/usr/share/upstart/sessions/dmedia.conf
 
 
=== added file 'dmedia.service'
--- dmedia.service	1970-01-01 00:00:00 +0000
+++ dmedia.service	2019-12-10 02:19:02 +0000
@@ -0,0 +1,9 @@
+[Unit]
+Description=Dmedia Distributed Object Store
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.Dmedia
+ExecStart=/usr/lib/dmedia/dmedia-service
+Restart=on-failure
+
 
=== modified file 'setup.py'
--- setup.py	2015-11-21 19:32:59 +0000
+++ setup.py	2019-12-10 02:19:02 +0000
@@ -217,7 +217,6 @@
         ),
         ('lib/dmedia', [
                 'dmedia-service',
-                'dbus-activation-hack.sh',
                 'dmedia-transcoder',
             ]
         ),
 
=== modified file 'share/org.freedesktop.Dmedia.service'
--- share/org.freedesktop.Dmedia.service	2013-12-11 14:55:01 +0000
+++ share/org.freedesktop.Dmedia.service	2019-12-10 02:19:02 +0000
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=org.freedesktop.Dmedia
-Exec=/usr/lib/dmedia/dbus-activation-hack.sh
+SystemdService=dmedia.service
+Exec=/usr/lib/dmedia/dmedia-service