[Pkg-gnupg-commit] [gnupg2] 02/03: dirmngr systemd user service is now socket-activated.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit cc370f523c521ed2b62ee704f928d43ab94aa378
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Thu Oct 27 12:47:43 2016 -0400

    dirmngr systemd user service is now socket-activated.
---
 debian/dirmngr.README.Debian        |  6 +++---
 debian/dirmngr.install              |  1 +
 debian/systemd-user/dirmngr.service | 11 +++++------
 debian/systemd-user/dirmngr.socket  | 11 +++++++++++
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/debian/dirmngr.README.Debian b/debian/dirmngr.README.Debian
index 93b8bc4..4fd9156 100644
--- a/debian/dirmngr.README.Debian
+++ b/debian/dirmngr.README.Debian
@@ -13,14 +13,14 @@ Users on machines with systemd can ensure that dirmngr is always
 running for their session, and that it gets terminated safely at
 logout by doing:
 
-   systemctl --user enable dirmngr
+   systemctl --user enable dirmngr.socket
 
 If you do this from the middle of a running session, you probably also
 want to clean up any other running dirmngr, and ensure that the
 service is started for the current session as well:
 
    gpgconf --kill dirmngr
-   systemctl --user start dirmngr
+   systemctl --user start dirmngr.socket
 
 Manual dirmngr startup
 ======================
@@ -45,4 +45,4 @@ session ends with:
 You may wish to add this to your session logout scripts if you're not
 using systemd.
 
- -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>, Tue, 28 Jun 2016 18:36:30 -0400
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>, Thu, 27 Oct 2016 12:46:23 -0400
diff --git a/debian/dirmngr.install b/debian/dirmngr.install
index bcffe40..1ca2db6 100644
--- a/debian/dirmngr.install
+++ b/debian/dirmngr.install
@@ -1,4 +1,5 @@
 debian/systemd-user/dirmngr.service usr/lib/systemd/user
+debian/systemd-user/dirmngr.socket usr/lib/systemd/user
 debian/tmp/usr/bin/dirmngr
 debian/tmp/usr/bin/dirmngr-client
 debian/tmp/usr/lib/gnupg/dirmngr_ldap
diff --git a/debian/systemd-user/dirmngr.service b/debian/systemd-user/dirmngr.service
index dadadc8..c79dfc5 100644
--- a/debian/systemd-user/dirmngr.service
+++ b/debian/systemd-user/dirmngr.service
@@ -1,11 +1,10 @@
 [Unit]
 Description=GnuPG network certificate management daemon
 Documentation=man:dirmngr(8)
+Requires=dirmngr.socket
+After=dirmngr.socket
+## This is a socket-activated service:
+RefuseManualStart=true
 
 [Service]
-Type=forking
-ExecStart=/usr/bin/dirmngr --daemon --homedir %h/.gnupg
-Restart=always
-
-[Install]
-WantedBy=default.target
+ExecStart=/usr/bin/dirmngr --supervised
diff --git a/debian/systemd-user/dirmngr.socket b/debian/systemd-user/dirmngr.socket
new file mode 100644
index 0000000..ebabf89
--- /dev/null
+++ b/debian/systemd-user/dirmngr.socket
@@ -0,0 +1,11 @@
+[Unit]
+Description=GnuPG network certificate management daemon
+Documentation=man:dirmngr(8)
+
+[Socket]
+ListenStream=%t/gnupg/S.dirmngr
+SocketMode=0600
+DirectoryMode=0700
+
+[Install]
+WantedBy=sockets.target

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git