Add a systemd user service for each D-Bus session service

This means that, under a systemd user session where dbus-daemon uses
systemd for activation, they will correctly go into their own cgroups
instead of being treated as part of dbus.service.

6 files changed, 26 insertions, 0 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index affb9b85..ee08c124 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,6 +7,9 @@ SUBDIRS = \
 servicedir = $(datadir)/dbus-1/services
 nodist_service_DATA = org.gnome.zeitgeist.Engine.service
 
+systemd_userdir = $(prefix)/lib/systemd/user
+nodist_systemd_user_DATA = zeitgeist.service
+
 bashcompletiondir = $(datadir)/bash-completion/completions
 dist_bashcompletion_DATA = completions/zeitgeist-daemon
 
@@ -21,11 +24,13 @@ CLEANFILES = \
 	org.gnome.zeitgeist.Engine.service \
 	PythonSerializer.pyc \
 	zeitgeist-datahub.desktop \
+	zeitgeist.service \
 	$(NULL)
 
 EXTRA_DIST = \
 	org.gnome.zeitgeist.Engine.service.in \
 	ontology2code \
+	zeitgeist.service.in \
 	$(xdgautostart_in_files) \
 	$(NULL)
 
diff --git a/data/org.gnome.zeitgeist.Engine.service.in b/data/org.gnome.zeitgeist.Engine.service.in
index 4b20045c..edc6b9cb 100644
--- a/data/org.gnome.zeitgeist.Engine.service.in
+++ b/data/org.gnome.zeitgeist.Engine.service.in
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=org.gnome.zeitgeist.Engine
 Exec=@bindir@/zeitgeist-daemon
+SystemdService=zeitgeist.service
diff --git a/data/zeitgeist.service.in b/data/zeitgeist.service.in
new file mode 100644
index 00000000..88c30999
--- /dev/null
+++ b/data/zeitgeist.service.in
@@ -0,0 +1,7 @@
+[Unit]
+Description=Zeitgeist activity log service
+
+[Service]
+Type=dbus
+BusName=org.gnome.zeitgeist.Engine
+ExecStart=@prefix@/bin/zeitgeist-daemon
diff --git a/extensions/fts++/Makefile.am b/extensions/fts++/Makefile.am
index 4a519fb5..402c4c5b 100644
--- a/extensions/fts++/Makefile.am
+++ b/extensions/fts++/Makefile.am
@@ -7,6 +7,9 @@ pkglibexec_PROGRAMS = zeitgeist-fts
 servicedir = $(datadir)/dbus-1/services
 nodist_service_DATA = org.gnome.zeitgeist.SimpleIndexer.service
 
+systemd_userdir = $(prefix)/lib/systemd/user
+nodist_systemd_user_DATA = zeitgeist-fts.service
+
 %.service: %.service.in
 	$(AM_V_GEN)sed -e "s|@pkglibexecdir[@]|$(pkglibexecdir)|" $< > $@
 
@@ -86,12 +89,14 @@ EXTRA_DIST = \
 	$(zeitgeist_fts_CSOURCES) \
 	org.gnome.zeitgeist.SimpleIndexer.service.in \
 	fts.vapi \
+	zeitgeist-fts.service.in \
 	$(NULL)
 
 CLEANFILES = \
 	$(BUILT_SOURCES) \
 	$(zeitgeist_fts_VALASOURCES:.vala=.c) \
 	org.gnome.zeitgeist.SimpleIndexer.service \
+	zeitgeist-fts.service \
 	$(NULL)
 
 DISTCLEANFILES = \
diff --git a/extensions/fts++/org.gnome.zeitgeist.SimpleIndexer.service.in b/extensions/fts++/org.gnome.zeitgeist.SimpleIndexer.service.in
index 4a12ea53..3248d2b1 100644
--- a/extensions/fts++/org.gnome.zeitgeist.SimpleIndexer.service.in
+++ b/extensions/fts++/org.gnome.zeitgeist.SimpleIndexer.service.in
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=org.gnome.zeitgeist.SimpleIndexer
 Exec=@pkglibexecdir@/zeitgeist-fts
+SystemdService=zeitgeist-fts.service
diff --git a/extensions/fts++/zeitgeist-fts.service.in b/extensions/fts++/zeitgeist-fts.service.in
new file mode 100644
index 00000000..93bf8f61
--- /dev/null
+++ b/extensions/fts++/zeitgeist-fts.service.in
@@ -0,0 +1,7 @@
+[Unit]
+Description=Zeitgeist full-text search indexer
+
+[Service]
+Type=dbus
+BusName=org.gnome.zeitgeist.SimpleIndexer
+ExecStart=@libexecdir@/zeitgeist-fts