Changeset ab4735a7

Timestamp:

07/20/2014 05:46:43 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485

Children:

7e9d2b38

Parents:

d3a4bcb

Message:

Convert svn server to systemd (untested).

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@13518 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• TODO (modified) (1 diff)
• general/prog/prog.xml (modified) (1 diff)
• general/prog/svnserver-systemd.xml (moved) (moved from general/prog/svnserver.xml ) (2 diffs)
• systemd-units/blfs/default/svnserve (modified) (1 diff)

TODO

@@ -1 @@
-svn server
 wpa_supplicant
 provide systemd units for dhcpcd and dhclient

general/prog/prog.xml

@@ -54 +54 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="slang.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="subversion.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="svnserver.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="svnserver-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="swig.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>

general/prog/svnserver-systemd.xml

@@ -81 +81 @@
 <screen role="root"><userinput>groupadd -g 57 svntest &amp;&amp;
 usermod -G svntest -a svn</userinput></screen>
-
-      <para>Additionally you should set <command>umask 002</command> while
-      working with a repository so that all new files will be writable by
-      owner and group. This is made mandatory by creating a wrapper script for
-      <command>svn</command> and <command>svnserve</command>:</para>
-
-<screen role="root"><userinput>mv /usr/bin/svn /usr/bin/svn.orig &amp;&amp;
-mv /usr/bin/svnserve /usr/bin/svnserve.orig &amp;&amp;
-cat &gt;&gt; /usr/bin/svn &lt;&lt; "EOF"
-<literal>#!/bin/sh
-umask 002
-/usr/bin/svn.orig "$@"</literal>
-EOF
-cat &gt;&gt; /usr/bin/svnserve &lt;&lt; "EOF"
-<literal>#!/bin/sh
-umask 002
-/usr/bin/svnserve.orig "$@"</literal>
-EOF
-chmod 0755 /usr/bin/svn{,serve}</userinput></screen>
-
-      <note>
-        <para>If you use <application>Apache</application> for working with
-        the repository over HTTP, even for anonymous access, you should wrap
-        <command>/usr/sbin/httpd</command> in a similar script.</para>
-      </note>
 
     </sect3>
@@ -276 +251 @@
 EOF</userinput></screen> -->
 
-      <para>To start the server at boot time, install the svn bootscript included
-      in the <xref linkend="bootscripts"/> package.</para>
+      <para>
+        To start the <command>svnserve</command> daemon at boot,
+        install the systemd unit from the <xref linkend="bootscripts"/>
+        package by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
 
       <indexterm zone="svnserver svnserver-init">
-        <primary sortas="f-svn">svn</primary>
+        <primary sortas="f-svnserve">svnserve</primary>
       </indexterm>
 
-<screen role="root"><userinput>make install-svn</userinput></screen>
+<screen role="root"><userinput>make install-svnserve</userinput></screen>
+
+      <para>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"><userinput>mkdir -p /etc/systemd/system/svnserve.service.d
+echo "UMask=0002" > /etc/systemd/system/svnserve.service.d/99-user.conf</userinput></screen>
+
+      <para>Options which are passed to <command>svnserve</command> daemon
+      can be changed in <filename>/etc/default/svnserve</filename>.</para>
 
     </sect3>

systemd-units/blfs/default/svnserve

@@ -4 +4 @@
 #
 # Example: -r /srv/svn/repositories
-SVNSERVE_OPTS=""
+SVNSERVE_OPTS="-r /srv/svn/repositories"
 
 # End /etc/default/svnserve