diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-11-27 20:55:15 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-11-27 20:55:15 +0100 |
| commit | 8cf030b349cbcb0901d880c9165d785dfc9cd569 (patch) | |
| tree | 5939c59e2d23a97604755a791c959df38dc5a745 /man | |
| parent | 76cd584b8d6e0df5f662f193803ce2bdc530ac86 (diff) | |
Revert "socket-proxyd: Add --listener option for listener/destination pairs."
This reverts commit adcf4c81c58511b67644e17fa743d1729d3c9ccf.
We have a better solution for the problem of making two processes run in
the same namespace, and --listener is not needed hence and should be
dropped.
Conflicts:
man/systemd-socket-proxyd.xml
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-socket-proxyd.xml | 80 |
1 files changed, 1 insertions, 79 deletions
diff --git a/man/systemd-socket-proxyd.xml b/man/systemd-socket-proxyd.xml index 9d8822bbd2..4eb13e4d25 100644 --- a/man/systemd-socket-proxyd.xml +++ b/man/systemd-socket-proxyd.xml @@ -31,12 +31,6 @@ <surname>Strauss</surname> <email>david@davidstrauss.net</email> </author> - <author> - <contrib>Developer</contrib> - <firstname>Lennart</firstname> - <surname>Poettering</surname> - <email>lennart@poettering.net</email> - </author> </authorgroup> </refentryinfo> <refmeta> @@ -90,17 +84,6 @@ <para>The following options are understood:</para> <variablelist> <varlistentry> - <term><option>-l</option></term> - <term><option>--listener=</option></term> - <listitem> - <para>Restricts listening to a - single inherited socket, specified - as a file descriptor. By default, - the proxy listens on all inherited - sockets.</para> - </listitem> - </varlistentry> - <varlistentry> <term><option>-h</option></term> <term><option>--help</option></term> <listitem> @@ -213,12 +196,8 @@ while [ ! -f /tmp/nginx.pid ] do /usr/bin/inotifywait /tmp/nginx.pid done -exec /usr/bin/systemd-socket-proxyd localhost:8080]]> +exec /usr/bin/systemd-socket-proxyd localhost 8080]]> </programlisting> - <para>Make it executable:</para> - <programlisting> -<![CDATA[chmod 755 /usr/bin/socket-proxyd-nginx.sh]]> - </programlisting> </example> <example label="nginx configuration"> <title> @@ -239,63 +218,6 @@ $ curl http://localhost:80/]]> </programlisting> </example> </refsect2> - - <refsect2> - <title>Multiple Listeners with Multiple Destinations</title> - <para>When using namespaces, it may be useful to - have multiple listeners with each going to a unique - destination. systemd always passes sockets into - services in the order specified in the socket - unit, beginning with file descriptor 3.</para> - <para>In this example, port <literal>80</literal> - will proxy to <literal>localhost:8080</literal>, - and port <literal>443</literal> will proxy to - <literal>localhost:8443</literal>.</para> - <example label="proxy socket unit"> - <title>/etc/systemd/system/multi-destination.socket</title> - <programlisting> -<![CDATA[[Socket] -ListenStream=80 -ListenStream=443 - -[Install] -WantedBy=sockets.target]]> -</programlisting> - </example> - <example label="proxy service unit"> - <title>/etc/systemd/system/multi-destination.service</title> - <programlisting> -<![CDATA[[Service] -ExecStart=/usr/bin/socket-proxyd-multi-destination.sh -PrivateTmp=true -PrivateNetwork=true]]> -</programlisting> - </example> - - <example label="shell script"> - <title> - /usr/bin/socket-proxyd-multi-destination.sh</title> - <programlisting> -<![CDATA[#!/bin/sh -/usr/bin/systemd-socket-proxyd --listener=3 localhost:8080 & -/usr/bin/systemd-socket-proxyd --listener=4 localhost:8443 & -wait]]> -</programlisting> - <para>Make it executable:</para> - <programlisting> -<![CDATA[chmod 755 /usr/bin/socket-proxyd-multi-destination.sh]]> - </programlisting> - </example> - - <example label="commands"> - <programlisting> -<![CDATA[# systemctl enable multi-destination.socket -# systemctl start multi-destination.socket -$ curl http://localhost/ -$ curl https://localhost/]]> -</programlisting> - </example> - </refsect2> </refsect1> <refsect1> <title>See Also</title> |