Ubuntu Server Guide

Merge lp:~tribaal/serverguide/svn-fixes into lp:~ubuntu-core-doc/serverguide/saucy

  1. svn-fixes
  2. Merge into saucy
Proposed by Chris Glass
Status: Merged
Approved by: Doug Smythies
Approved revision: 145
Merged at revision: 141
Proposed branch: lp:~tribaal/serverguide/svn-fixes
Merge into: lp:~ubuntu-core-doc/serverguide/saucy
Diff against target: 74 lines (+17/-10)
1 file modified
serverguide/C/vcs.xml (+17/-10)
To merge this branch: bzr merge lp:~tribaal/serverguide/svn-fixes
Reviewer Review Type Date Requested Status
Doug Smythies Approve
Review via email: mp+168281@code.launchpad.net

Commit message

Fixes for the SVN section of the "Version Control Systems" chapter.

Description of the change

This branch fixes the SVN section of the "version control systems" chapter.

A few inaccuracies and omissions were detected by following the guide to the letter on a fresh saucy install (up-to-date as of June 9th 2013).

To post a comment you must log in.
Revision history for this message
Doug Smythies (dsmythies) wrote :

Thanks for your contribution and attention to detail.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'serverguide/C/vcs.xml'
2--- serverguide/C/vcs.xml 2012-08-20 08:09:16 +0000
3+++ serverguide/C/vcs.xml 2013-06-09 11:22:28 +0000
4@@ -96,7 +96,7 @@
5 </para>
6 <para>
7 <screen>
8-<command>sudo apt-get install subversion libapache2-svn</command>
9+<command>sudo apt-get install subversion apache2 libapache2-svn</command>
10 </screen>
11 </para>
12
13@@ -210,7 +210,7 @@
14 <programlisting>
15 &lt;Location /svn&gt;
16 DAV svn
17- SVNPath /home/svn
18+ SVNParentPath /path/to/repos
19 AuthType Basic
20 AuthName "Your repository name"
21 AuthUserFile /etc/subversion/passwd
22@@ -219,21 +219,28 @@
23 </programlisting>
24 <note>
25 <para>The above configuration snippet assumes that Subversion
26- repositories are created under <filename>/home/svn/</filename>
27- directory using <command>svnadmin</command> command. They can be
28+ repositories are created under <filename>/path/to/repos</filename>
29+ directory using <command>svnadmin</command> command and that the HTTP user has sufficent access rights to the files (see below). They can be
30 accessible using <command>http://hostname/svn/repos_name</command>
31 url.</para>
32- </note>
33+ </note>
34+ <para>
35+ Changing the apache configuration like the above requires to reload
36+ the service with the following command
37+ </para>
38+<screen>
39+ <command>sudo service apache2 reload</command>
40+</screen>
41 <para>
42 To import or commit files to your Subversion repository over
43 HTTP, the repository should be owned by the HTTP user. In
44- Ubuntu systems, normally the HTTP user is
45+ Ubuntu systems, the HTTP user is
46 <command>www-data</command>. To change the ownership of the
47 repository files enter the following command from terminal
48 prompt:
49 </para>
50 <screen>
51-<command>sudo chown -R www-data:www-data /path/to/repos</command>
52+ <command>sudo chown -R www-data:www-data /path/to/repos</command>
53 </screen>
54 <note>
55 <para>
56@@ -356,8 +363,8 @@
57 <para><screen><command>svn co help</command></screen></para>
58
59 </sect3>
60- <sect3 id="access-via-custom-protocol-with-ssl" status="review">
61- <title>Access via custom protocol with SSL encryption (svn+ssh://)</title>
62+ <sect3 id="access-via-custom-protocol-with-ssh" status="review">
63+ <title>Access via custom protocol with SSH encryption (svn+ssh://)</title>
64 <para> The configuration and server process is same as in the
65 svn:// method. For details, please refer to the above section.
66 This step assumes you have followed the above step and started
67@@ -377,7 +384,7 @@
68 </para>
69 <para>
70 <screen>
71-<command>svn co svn+ssh://hostname/var/svn/repos/project</command>
72+ <command>svn co svn+ssh://ssh_username@hostname/path/to/repos/project</command>
73 </screen>
74 </para>
75

Subscribers

People subscribed via source and target branches