picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rename sabridge to saproxy to be less cryptic

Browse source
This commit is contained in:
David Strauss 2013-10-15 17:00:18 -07:00
parent ae25936d0f
commit d1b38fac57
7 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -71,7 +71,7 @@
/systemd-reply-password /systemd-reply-password
/systemd-rfkill /systemd-rfkill
/systemd-run /systemd-run
/systemd-sabridge /systemd-saproxy
/systemd-shutdown /systemd-shutdown
/systemd-shutdownd /systemd-shutdownd
/systemd-sleep /systemd-sleep

2
Makefile-man.am
View file

@ -66,7 +66,7 @@ MANPAGES += \
man/systemd-nspawn.1 \ man/systemd-nspawn.1 \
man/systemd-remount-fs.service.8 \ man/systemd-remount-fs.service.8 \
man/systemd-run.1 \ man/systemd-run.1 \
man/systemd-sabridge.1 \ man/systemd-saproxy.1 \
man/systemd-shutdownd.service.8 \ man/systemd-shutdownd.service.8 \
man/systemd-sleep.conf.5 \ man/systemd-sleep.conf.5 \
man/systemd-suspend.service.8 \ man/systemd-suspend.service.8 \

10
Makefile.am
View file

@ -300,7 +300,7 @@ bin_PROGRAMS = \
systemd-delta \ systemd-delta \
systemd-analyze \ systemd-analyze \
systemd-run \ systemd-run \
systemd-sabridge systemd-saproxy
dist_bin_SCRIPTS = \ dist_bin_SCRIPTS = \
src/kernel-install/kernel-install src/kernel-install/kernel-install
@ -3210,10 +3210,10 @@ EXTRA_DIST += \
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
systemd_sabridge_SOURCES = \ systemd_saproxy_SOURCES = \
src/sabridge/sabridge.c src/saproxy/saproxy.c
systemd_sabridge_LDADD = \ systemd_saproxy_LDADD = \
libsystemd-shared.la \ libsystemd-shared.la \
libsystemd-logs.la \ libsystemd-logs.la \
libsystemd-journal-internal.la \ libsystemd-journal-internal.la \
@ -3221,7 +3221,7 @@ systemd_sabridge_LDADD = \
libsystemd-daemon.la \ libsystemd-daemon.la \
libsystemd-bus.la libsystemd-bus.la
systemd_sabridge_CFLAGS = \ systemd_saproxy_CFLAGS = \
$(AM_CFLAGS) $(AM_CFLAGS)
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------

8
TODO
View file

@ -48,13 +48,13 @@ CGroup Rework Completion:
Features: Features:
* sabridge: Support multiple inherited sockets mapped using different proxies * saproxy: Support multiple inherited sockets mapped using different proxies
* sabridge: Use a nonblocking alternative to getaddrinfo * saproxy: Use a nonblocking alternative to getaddrinfo
* sabridge: Until we can start daemons directly, find a less ugly, less racy alternative than shell scripts for the second man page example. * saproxy: Until we can start daemons directly, find a less ugly, less racy alternative than shell scripts for the second man page example.
* sabridge: Support starting daemons directly without requiring a shell script; update man pages * saproxy: Support starting daemons directly without requiring a shell script; update man pages
* "systemctl cat" or "systemctl view" command or or so, that cats the backing unit file of a service, plus its drop-ins and shows them in a pager * "systemctl cat" or "systemctl view" command or or so, that cats the backing unit file of a service, plus its drop-ins and shows them in a pager

26
man/systemd-sabridge.xml → man/systemd-saproxy.xml
View file

@ -20,9 +20,9 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>. along with systemd; If not, see <http://www.gnu.org/licenses/>.
--> -->
<refentry id="systemd-sabridge"> <refentry id="systemd-saproxy">
<refentryinfo> <refentryinfo>
<title>systemd-sabridge</title> <title>systemd-saproxy</title>
<productname>systemd</productname> <productname>systemd</productname>
<authorgroup> <authorgroup>
<author> <author>
@ -34,23 +34,23 @@
</authorgroup> </authorgroup>
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>systemd-sabridge</refentrytitle> <refentrytitle>systemd-saproxy</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>systemd-sabridge</refname> <refname>systemd-saproxy</refname>
<refpurpose>Inherit a socket. Bidirectionally <refpurpose>Inherit a socket. Bidirectionally
proxy.</refpurpose> proxy.</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>systemd-sabridge</command> <command>systemd-saproxy</command>
<arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt" rep="repeat">OPTIONS</arg>
<arg choice="plain"><replaceable>HOSTNAME-OR-IP</replaceable></arg> <arg choice="plain"><replaceable>HOSTNAME-OR-IP</replaceable></arg>
<arg choice="plain"><replaceable>PORT-OR-SERVICE</replaceable></arg> <arg choice="plain"><replaceable>PORT-OR-SERVICE</replaceable></arg>
</cmdsynopsis> </cmdsynopsis>
<cmdsynopsis> <cmdsynopsis>
<command>systemd-sabridge</command> <command>systemd-saproxy</command>
<arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt" rep="repeat">OPTIONS</arg>
<arg choice="plain"><replaceable>UNIX-DOMAIN-SOCKET-PATH</replaceable> <arg choice="plain"><replaceable>UNIX-DOMAIN-SOCKET-PATH</replaceable>
</arg> </arg>
@ -59,7 +59,7 @@
<refsect1> <refsect1>
<title>Description</title> <title>Description</title>
<para> <para>
<command>systemd-sabridge</command>provides a proxy <command>systemd-saproxy</command>provides a proxy
to socket-activate services that do not yet support to socket-activate services that do not yet support
native socket activation. On behalf of the daemon, native socket activation. On behalf of the daemon,
the proxy inherits the socket from systemd, accepts the proxy inherits the socket from systemd, accepts
@ -68,7 +68,7 @@
data between the two.</para> data between the two.</para>
<para>This utility's behavior is similar to <para>This utility's behavior is similar to
<citerefentry><refentrytitle>socat</refentrytitle><manvolnum>1</manvolnum> </citerefentry>. <citerefentry><refentrytitle>socat</refentrytitle><manvolnum>1</manvolnum> </citerefentry>.
The main differences for <command>systemd-sabridge</command> The main differences for <command>systemd-saproxy</command>
are support for socket activation with are support for socket activation with
<literal>Accept=false</literal> and an event-driven <literal>Accept=false</literal> and an event-driven
design that scales better with the number of design that scales better with the number of
@ -102,7 +102,7 @@
invoked indirectly, for invoked indirectly, for
example with a shell script example with a shell script
rather than with rather than with
<option>ExecStart=/usr/bin/systemd-sabridge</option> <option>ExecStart=/usr/bin/systemd-saproxy</option>
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -137,7 +137,7 @@ After=nginx.service
Requires=nginx.service Requires=nginx.service
[Service] [Service]
ExecStart=/usr/bin/systemd-sabridge /tmp/nginx.sock ExecStart=/usr/bin/systemd-saproxy /tmp/nginx.sock
PrivateTmp=true PrivateTmp=true
PrivateNetwork=true]]> PrivateNetwork=true]]>
</programlisting> </programlisting>
@ -190,14 +190,14 @@ After=syslog.target remote-fs.target nss-lookup.target
[Service] [Service]
ExecStartPre=/usr/sbin/nginx -t ExecStartPre=/usr/sbin/nginx -t
ExecStart=/usr/bin/sabridge-nginx.sh ExecStart=/usr/bin/saproxy-nginx.sh
PrivateTmp=true PrivateTmp=true
PrivateNetwork=true]]> PrivateNetwork=true]]>
</programlisting> </programlisting>
</example> </example>
<example label="shell script"> <example label="shell script">
<title> <title>
/usr/bin/sabridge-nginx.sh</title> /usr/bin/saproxy-nginx.sh</title>
<programlisting> <programlisting>
<![CDATA[#!/bin/sh <![CDATA[#!/bin/sh
/usr/sbin/nginx /usr/sbin/nginx
@ -205,7 +205,7 @@ while [ ! -f /tmp/nginx.pid ]
do do
/usr/bin/inotifywait /tmp/nginx.pid /usr/bin/inotifywait /tmp/nginx.pid
done done
/usr/bin/systemd-sabridge --ignore-env localhost 8080]]> /usr/bin/systemd-saproxy --ignore-env localhost 8080]]>
</programlisting> </programlisting>
</example> </example>
<example label="nginx configuration"> <example label="nginx configuration">

0
src/sabridge/Makefile → src/saproxy/Makefile
View file

4
src/sabridge/sabridge.c → src/saproxy/saproxy.c
View file

@ -448,7 +448,7 @@ static int help(void) {
} }
static void version(void) { static void version(void) {
puts(PACKAGE_STRING " sabridge"); puts(PACKAGE_STRING " saproxy");
} }
static int parse_argv(int argc, char *argv[], struct proxy *p) { static int parse_argv(int argc, char *argv[], struct proxy *p) {
@ -561,7 +561,7 @@ int main(int argc, char *argv[]) {
goto finish; goto finish;
} }
log_info("Starting the socket activation bridge with listener fd=%d.", p.listen_fd); log_info("Starting the socket activation proxy with listener fd=%d.", p.listen_fd);
r = run_main_loop(&p); r = run_main_loop(&p);
if (r < 0) { if (r < 0) {