summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2017-02-18 15:27:15 +0100
committerRico Tzschichholz <ricotz@ubuntu.com>2017-02-18 15:27:15 +0100
commite727a1701365edb69c7ba85edd0eba59d964b7c9 (patch)
tree44ad72ebb7f0907e8491dd0985fe736d27e14c28 /data
parent153cad41ed51b898def94ade15bde288584705f0 (diff)
downloadzeitgeist-e727a1701365edb69c7ba85edd0eba59d964b7c9.tar.gz
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.
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am5
-rw-r--r--data/org.gnome.zeitgeist.Engine.service.in1
-rw-r--r--data/zeitgeist.service.in7
3 files changed, 13 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