Merge lp:~jamesh/storage-framework/systemd-units into lp:storage-framework/devel

[James Henstridge]

Add systemd unit files for registry and local provider.

Add systemd unit files for registry and local provider.

When installed, you can check the status of e.g. the registry with:

    systemctl --user status storage-framework-registry

Which will tell you whether it is running and show the tail of the log file. A larger log file can be displayed with:

    journalctl --user-unit storage-framework-registry

This separates out the log entries from dbus-daemon's log. Like all log files collected by systemd, the entries are automatically time stamped and tagged with the process that produced them.

[Michi Henning (michihenning)]

Looks good!

review: Approve

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:125
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/281/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1923
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1930
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1711
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1711/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1711
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1711/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1711
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1711/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1711
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1711/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1711
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1711/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1711
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1711/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/281/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2017-03-30 00:57:11 +0000
+++ debian/changelog	2017-04-06 05:04:54 +0000
@@ -1,8 +1,11 @@
-storage-framework (0.4+17.04.20170320.1-0ubuntu2) UNRELEASED; urgency=medium
+storage-framework (0.4-0ubuntu2) UNRELEASED; urgency=medium
 
   [ Michi Henning ]
   * Removed dependency on libgio.
 
+  [ James Henstridge ]
+  * Add systemd units for registry and local provider D-Bus services.
+
  -- Michi Henning <[e-mail]>  Wed, 29 Mar 2017 12:21:40 +1000
 
 storage-framework (0.3+17.04.20170320.1-0ubuntu1) zesty; urgency=medium

=== modified file 'debian/storage-framework-registry.install'
--- debian/storage-framework-registry.install	2017-03-17 04:59:44 +0000
+++ debian/storage-framework-registry.install	2017-04-06 05:04:54 +0000
@@ -1,4 +1,4 @@
 usr/lib/*/*/storage-framework-registry
-usr/share/dbus-1/services/com.canonical.StorageFramework.Registry.service
 usr/lib/*/*/storage-provider-local
-usr/share/dbus-1/services/com.canonical.StorageFramework.Provider.Local.service
+usr/lib/systemd/user/*
+usr/share/dbus-1/services/*

=== modified file 'src/local-provider/CMakeLists.txt'
--- src/local-provider/CMakeLists.txt	2017-03-23 06:55:00 +0000
+++ src/local-provider/CMakeLists.txt	2017-04-06 05:04:54 +0000
@@ -33,9 +33,22 @@
     RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}
 )
 
-configure_file(com.canonical.StorageFramework.Provider.Local.service.in com.canonical.StorageFramework.Provider.Local.service)
+# D-Bus service activation file
+configure_file(
+    com.canonical.StorageFramework.Provider.Local.service.in
+    com.canonical.StorageFramework.Provider.Local.service)
 
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.StorageFramework.Provider.Local.service
     DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services
 )
+
+# systemd unit
+configure_file(
+    storage-provider-local.service.in
+    storage-provider-local.service)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-provider-local.service
+    DESTINATION "lib/systemd/user"
+)

=== modified file 'src/local-provider/com.canonical.StorageFramework.Provider.Local.service.in'
--- src/local-provider/com.canonical.StorageFramework.Provider.Local.service.in	2017-03-17 04:59:44 +0000
+++ src/local-provider/com.canonical.StorageFramework.Provider.Local.service.in	2017-04-06 05:04:54 +0000
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=com.canonical.StorageFramework.Provider.Local
 Exec=@CMAKE_INSTALL_FULL_LIBDIR@/@PROJECT_NAME@/storage-provider-local
+SystemdService=storage-provider-local.service

=== added file 'src/local-provider/storage-provider-local.service.in'
--- src/local-provider/storage-provider-local.service.in	1970-01-01 00:00:00 +0000
+++ src/local-provider/storage-provider-local.service.in	2017-04-06 05:04:54 +0000
@@ -0,0 +1,7 @@
+[Unit]
+Description=Storage Framework local provider
+
+[Service]
+Type=dbus
+BusName=com.canonical.StorageFramework.Provider.Local
+ExecStart=@CMAKE_INSTALL_FULL_LIBDIR@/@PROJECT_NAME@/storage-provider-local

=== modified file 'src/registry/CMakeLists.txt'
--- src/registry/CMakeLists.txt	2017-03-17 09:43:46 +0000
+++ src/registry/CMakeLists.txt	2017-04-06 05:04:54 +0000
@@ -46,9 +46,22 @@
     RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}
 )
 
-configure_file(com.canonical.StorageFramework.Registry.service.in com.canonical.StorageFramework.Registry.service)
+# D-Bus service activation file
+configure_file(
+    com.canonical.StorageFramework.Registry.service.in
+    com.canonical.StorageFramework.Registry.service)
 
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.StorageFramework.Registry.service
     DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services
 )
+
+# systemd unit
+configure_file(
+    storage-framework-registry.service.in
+    storage-framework-registry.service)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-registry.service
+    DESTINATION "lib/systemd/user"
+)

=== modified file 'src/registry/com.canonical.StorageFramework.Registry.service.in'
--- src/registry/com.canonical.StorageFramework.Registry.service.in	2016-11-21 04:24:13 +0000
+++ src/registry/com.canonical.StorageFramework.Registry.service.in	2017-04-06 05:04:54 +0000
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=com.canonical.StorageFramework.Registry
 Exec=@CMAKE_INSTALL_FULL_LIBDIR@/@PROJECT_NAME@/storage-framework-registry
+SystemdService=storage-framework-registry.service

=== added file 'src/registry/storage-framework-registry.service.in'
--- src/registry/storage-framework-registry.service.in	1970-01-01 00:00:00 +0000
+++ src/registry/storage-framework-registry.service.in	2017-04-06 05:04:54 +0000
@@ -0,0 +1,7 @@
+[Unit]
+Description=Storage Framework registry
+
+[Service]
+Type=dbus
+BusName=com.canonical.StorageFramework.Registry
+ExecStart=@CMAKE_INSTALL_FULL_LIBDIR@/@PROJECT_NAME@/storage-framework-registry