[Pkg-gnupg-commit] [gnupg2] 04/05: enable easy reloads from systemd

[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 ac821e35e2093d5a0a381a934e4dbfddc94e8715
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Jan 10 17:16:01 2017 -0500

    enable easy reloads from systemd
---
 ...r-Enable-systemctl-user-reload-dirmngr-gp.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 37 insertions(+)

diff --git a/debian/patches/0037-systemd-user-Enable-systemctl-user-reload-dirmngr-gp.patch b/debian/patches/0037-systemd-user-Enable-systemctl-user-reload-dirmngr-gp.patch
new file mode 100644
index 0000000..137dc5f
--- /dev/null
+++ b/debian/patches/0037-systemd-user-Enable-systemctl-user-reload-dirmngr-gp.patch
@@ -0,0 +1,36 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Tue, 10 Jan 2017 17:12:09 -0500
+Subject: systemd-user: Enable "systemctl --user reload {dirmngr,gpg-agent}"
+
+* doc/examples/systemd-user/*.service: Add ExecReload directives to
+  indicate the canonical way to reload the services.
+
+GnuPG recommends reloading the agent and dirmngr with "gpgconf
+--reload".  if anyone is running them as systemd user services, they
+might ask them to reload in the systemd way, so teach systemd the
+right thing to do.
+
+Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+---
+ doc/examples/systemd-user/dirmngr.service   | 1 +
+ doc/examples/systemd-user/gpg-agent.service | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/doc/examples/systemd-user/dirmngr.service b/doc/examples/systemd-user/dirmngr.service
+index c79dfc58a..ded533b2f 100644
+--- a/doc/examples/systemd-user/dirmngr.service
++++ b/doc/examples/systemd-user/dirmngr.service
+@@ -8,3 +8,4 @@ RefuseManualStart=true
+ 
+ [Service]
+ ExecStart=/usr/bin/dirmngr --supervised
++ExecReload=/usr/bin/gpgconf --reload dirmngr
+diff --git a/doc/examples/systemd-user/gpg-agent.service b/doc/examples/systemd-user/gpg-agent.service
+index 9ab922081..e88dc7f5f 100644
+--- a/doc/examples/systemd-user/gpg-agent.service
++++ b/doc/examples/systemd-user/gpg-agent.service
+@@ -8,3 +8,4 @@ RefuseManualStart=true
+ 
+ [Service]
+ ExecStart=/usr/bin/gpg-agent --supervised
++ExecReload=/usr/bin/gpgconf --reload gpg-agent
diff --git a/debian/patches/series b/debian/patches/series
index ef62927..9c3426b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -34,3 +34,4 @@ gpg-agent-idling/0004-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
 0034-tools-Fix-memory-leaks-and-improve-error-handling.patch
 0035-doc-Mention-dirmngr.conf.patch
 resolve-ambiguity/0036-common-Avoid-unnecessary-ambiguity-in-argparse.patch
+0037-systemd-user-Enable-systemctl-user-reload-dirmngr-gp.patch

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