From: dkg <dkg@fifthhorseman.net>
Date: Sat, 5 Aug 2017 23:19:09 +0000 (-0400)
Subject: man: document socket requirement for systemd-socket-proxyd (#6535)
X-Git-Tag: v235~268
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d7cefe8b2b236a8642aaffd0b782fa3323e6cefc;p=thirdparty%2Fsystemd.git

man: document socket requirement for systemd-socket-proxyd (#6535)

Without this requirement, if proxy-to-nginx.socket was down, and the sysadmin
were to do:

    systemctl start proxy-to-nginx.service

then the service would come up without a configured socket, which doesn't make
sense.  Normally this isn't how we expect a socket-activated service to start,
but it's possible for an admin to do this (if the .socket were already running,
the systemd-socket-proxyd process will start effectively idle).  But the
.service shouldn't end up in a broken state if the .socket isn't already
listening.

Adding the explicit Requires: should ensure that an admin with this
configuration state can't accidentally break their system.
---

diff --git a/man/systemd-socket-proxyd.xml b/man/systemd-socket-proxyd.xml
index b8a7800b82a..96702a89393 100644
--- a/man/systemd-socket-proxyd.xml
+++ b/man/systemd-socket-proxyd.xml
@@ -118,6 +118,8 @@ WantedBy=sockets.target]]></programlisting>
         <programlisting><![CDATA[[Unit]
 Requires=nginx.service
 After=nginx.service
+Requires=proxy-to-nginx.socket
+After=proxy-to-nginx.service
 
 [Service]
 ExecStart=/usr/lib/systemd/systemd-socket-proxyd /tmp/nginx.sock
@@ -159,6 +161,8 @@ WantedBy=sockets.target]]></programlisting>
         <programlisting><![CDATA[[Unit]
 Requires=nginx.service
 After=nginx.service
+Requires=proxy-to-nginx.service
+After=proxy-to-nginx.service
 JoinsNamespaceOf=nginx.service
 
 [Service]