Author: dj
Date: Wed Jun 8 20:56:23 2016
New Revision: 17468
Log:
[Systemd merge] - Chapter 13
Modified:
trunk/BOOK/general/prog/php.xml
trunk/BOOK/general/prog/ruby.xml
trunk/BOOK/general/prog/svnserver.xml
Modified: trunk/BOOK/general/prog/php.xml
==============================================================================
--- trunk/BOOK/general/prog/php.xml Wed Jun 8 19:51:15 2016 (r17467)
+++ trunk/BOOK/general/prog/php.xml Wed Jun 8 20:56:23 2016 (r17468)
@@ -220,7 +220,7 @@
Install <application>PHP</application> by running the following commands:
</para>
-<screen><userinput>./configure --prefix=/usr \
+<screen revision="sysv"><userinput>./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--datadir=/usr/share/php \
@@ -242,6 +242,28 @@
--with-readline &&
make</userinput></screen>
+<screen revision="systemd"><userinput>./configure --prefix=/usr
\
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --datadir=/usr/share/php \
+ --mandir=/usr/share/man \
+ --enable-fpm \
+ --with-fpm-user=apache \
+ --with-fpm-group=apache \
+ --with-fpm-systemd \
+ --with-config-file-path=/etc \
+ --with-zlib \
+ --enable-bcmath \
+ --with-bz2 \
+ --enable-calendar \
+ --enable-dba=shared \
+ --with-gdbm \
+ --with-gmp \
+ --enable-ftp \
+ --with-gettext \
+ --enable-mbstring \
+ --with-readline &&
+make</userinput></screen>
<para>
To test the results, issue: <command>make test</command>. A few
tests may fail, in which case you are asked whether you want to send
@@ -298,6 +320,11 @@
<sect2 role="commands">
<title>Command Explanations</title>
+ <para revision="systemd">
+ <command>sed -i "s|lsystemd-daemon|lsystemd|g" configure</command>:
+ This command fixes the detection of the systemd library.
+ </para>
+
<para>
<parameter>--with-datadir=/usr/share/php</parameter>: This works
around a bug in the build machinery, which installs some data to a
@@ -309,6 +336,11 @@
building the fastCGI Process Manager.
</para>
+ <para revision="systemd">
+ <parameter>--with-fpm-systemd</parameter>: This parameter allows
+ the FastCGI Process Manager to integrate with systemd.
+ </para>
+
<para>
<parameter>--with-config-file-path=/etc</parameter>: This parameter
makes <application>PHP</application> look for the
@@ -510,7 +542,8 @@
</sect3>
<sect3 id="php-init">
- <title>Boot Script</title>
+ <title><phrase revision="sysv">Boot Script</phrase>
+ <phrase revision="systemd">Systemd Unit</phrase></title>
<para revision="sysv">
To automatically start the <command>php-fpm</command> daemon when the
@@ -521,9 +554,9 @@
</para>
<para revision="systemd">
- To automatically start the <command>php-fpm</command> daemon when the
- system is rebooted, install the <filename>php-fpm.service</filename>
- unit from the <xref linkend="systemd-units"/> package as the
+ To start the <command>php-fpm</command> daemon at boot,
+ install the systemd unit from the <xref linkend="systemd-units"/>
+ package by running the following command as the
<systemitem class="username">root</systemitem> user:
</para>
Modified: trunk/BOOK/general/prog/ruby.xml
==============================================================================
--- trunk/BOOK/general/prog/ruby.xml Wed Jun 8 19:51:15 2016 (r17467)
+++ trunk/BOOK/general/prog/ruby.xml Wed Jun 8 20:56:23 2016 (r17468)
@@ -85,7 +85,12 @@
<xref linkend="openssl"/>,
<xref linkend="tk"/>,
<xref linkend="valgrind"/>, and
- <ulink url="http://pyyaml.org/wiki/LibYAML";>libyaml</ulink>
+ <phrase revision="sysv">
+ <ulink url="http://pyyaml.org/wiki/LibYAML";>libyaml</ulink>
+ </phrase>
+ <phrase revision="systemd">
+ <xref linkend="yaml"/>
+ </phrase>
</para>
<para condition="html" role="usernotes">User Notes:
Modified: trunk/BOOK/general/prog/svnserver.xml
==============================================================================
--- trunk/BOOK/general/prog/svnserver.xml Wed Jun 8 19:51:15 2016
(r17467)
+++ trunk/BOOK/general/prog/svnserver.xml Wed Jun 8 20:56:23 2016
(r17468)
@@ -208,15 +208,36 @@
<sect3 id="svnserver-init">
<title>4. Starting the Server</title>
- <para>To start the server at boot time, install the svn bootscript
- included in the <xref linkend="bootscripts" revision="sysv"/>
- <xref linkend="systemd-units" revision="systemd"/> package.</para>
+ <para revision="sysv">To start the server at boot time, install the svn
+ bootscript included in the <xref linkend="bootscripts"/> package.</para>
- <indexterm zone="svnserver svnserver-init">
+ <para revision="systemd">To start the server at boot time, install the
+ <filename>svnserve.service</filename> unit from the
+ <xref linkend="systemd-units"/> package.</para>
+
+ <indexterm zone="svnserver svnserver-init" revision="sysv">
<primary sortas="f-svn">svn</primary>
</indexterm>
-<screen role="root"><userinput>make install-svn</userinput></screen>
+<screen role="root" revision="sysv"><userinput>make
install-svn</userinput></screen>
+
+ <indexterm zone="svnserver svnserver-init" revision="systemd">
+ <primary sortas="f-svnserve">svnserve</primary>
+ </indexterm>
+
+<screen role="root" revision="systemd"><userinput>make
install-svnserve</userinput></screen>
+
+ <para revision="systemd">Additionally, the instructions above require
+ that svn server uses <command>umask 002</command> so that all new files
+ will be writable by owner and group. This can be achieved by creating
+ a systemd unit override file by running the following command:</para>
+
+<screen role="root" revision="systemd"><userinput>mkdir -p
/etc/systemd/system/svnserve.service.d
+echo "UMask=0002" >
/etc/systemd/system/svnserve.service.d/99-user.conf</userinput></screen>
+
+ <para revision="systemd">Options which are passed to
+ <command>svnserve</command> daemon can be changed in
+ <filename>/etc/default/svnserve</filename>.</para>
</sect3>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
