[svnbook] r3902 committed - * src/en/book/ch06-server-configuration.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Fri Jul 8 14:30:17 CDT 2011
Revision: 3902
Author: cmpilato at gmail.com
Date: Fri Jul 8 12:26:33 2011
Log: * src/en/book/ch06-server-configuration.xml
Correct some <screen> instances, making them <programlisting>'s
instead.
Patch by: quinntaylor at mac.com
(Tweaked by me.)
http://code.google.com/p/svnbook/source/detail?r=3902
Modified:
/trunk/src/en/book/ch06-server-configuration.xml
=======================================
--- /trunk/src/en/book/ch06-server-configuration.xml Fri Jul 8 10:27:22
2011
+++ /trunk/src/en/book/ch06-server-configuration.xml Fri Jul 8 12:26:33
2011
@@ -798,11 +798,11 @@
and passwords and choose an authentication realm:</para>
<informalexample>
- <screen>
+ <programlisting>
[general]
password-db = userfile
realm = example realm
-</screen>
+</programlisting>
</informalexample>
<para>The <literal>realm</literal> is a name that you define.
@@ -817,11 +817,11 @@
the same familiar format. For example:</para>
<informalexample>
- <screen>
+ <programlisting>
[users]
harry = foopassword
sally = barpassword
-</screen>
+</programlisting>
</informalexample>
<para>The value of <literal>password-db</literal> can be an
@@ -858,7 +858,7 @@
read/write access to the repository. For example:</para>
<informalexample>
- <screen>
+ <programlisting>
[general]
password-db = userfile
realm = example realm
@@ -868,7 +868,7 @@
# authenticated users can both read and write
auth-access = write
-</screen>
+</programlisting>
</informalexample>
<para>The example settings are, in fact, the default values of
@@ -877,7 +877,7 @@
access completely:</para>
<informalexample>
- <screen>
+ <programlisting>
[general]
password-db = userfile
realm = example realm
@@ -887,7 +887,7 @@
# authenticated users can both read and write
auth-access = write
-</screen>
+</programlisting>
</informalexample>
<para>The server process understands not only
@@ -899,14 +899,14 @@
the <literal>authz-db</literal> variable to point to it:</para>
<informalexample>
- <screen>
+ <programlisting>
[general]
password-db = userfile
realm = example realm
# Specific access rules for specific locations
authz-db = authzfile
-</screen>
+</programlisting>
</informalexample>
<para>We discuss the syntax of the <filename>authzfile</filename>
file
@@ -1031,12 +1031,12 @@
following:</para>
<informalexample>
- <screen>
+ <programlisting>
pwcheck_method: auxprop
auxprop_plugin: sasldb
sasldb_path: /etc/my_sasldb
mech_list: DIGEST-MD5
-</screen>
+</programlisting>
</informalexample>
<para>you've told SASL to advertise the DIGEST-MD5
@@ -1098,12 +1098,12 @@
<filename>svnserve.conf</filename> file:</para>
<informalexample>
- <screen>
+ <programlisting>
[sasl]
use-sasl = true
min-encryption = 128
max-encryption = 256
-</screen>
+</programlisting>
</informalexample>
<para>The <literal>min-encryption</literal> and
@@ -1225,10 +1225,10 @@
this:</para>
<informalexample>
- <screen>
+ <programlisting>
[tunnels]
rsh = rsh
-</screen>
+</programlisting>
</informalexample>
<para>And now, you can use this new tunnel definition by using a
@@ -1243,10 +1243,10 @@
tunneling schemes to be much more clever than that:</para>
<informalexample>
- <screen>
+ <programlisting>
[tunnels]
joessh = $JOESSH /opt/alternate/ssh -p 29934
-</screen>
+</programlisting>
</informalexample>
<para>This example demonstrates a couple of things. First, it
@@ -1561,9 +1561,9 @@
disk:</para>
<informalexample>
- <screen>
+ <programlisting>
LoadModule dav_svn_module modules/mod_dav_svn.so
-</screen>
+</programlisting>
</informalexample>
<para>Apache interprets the <literal>LoadModule</literal>
@@ -1576,9 +1576,9 @@
even an absolute path such as in the following example:</para>
<informalexample>
- <screen>
+ <programlisting>
LoadModule dav_svn_module C:/Subversion/lib/mod_dav_svn.so
-</screen>
+</programlisting>
</informalexample>
<para>Note that if <command>mod_dav</command> was compiled as a
@@ -1588,10 +1588,10 @@
that it comes before the <command>mod_dav_svn</command>
line:</para>
<informalexample>
- <screen>
+ <programlisting>
LoadModule dav_module modules/mod_dav.so
LoadModule dav_svn_module modules/mod_dav_svn.so
-</screen>
+</programlisting>
</informalexample>
@@ -1615,12 +1615,12 @@
following <filename>httpd.conf</filename> syntax:</para>
<informalexample>
- <screen>
+ <programlisting>
<Location /repos>
DAV svn
SVNPath /var/svn/repository
</Location>
-</screen>
+</programlisting>
</informalexample>
<para>If you plan to support multiple Subversion repositories
@@ -1637,14 +1637,14 @@
syntax in the following example:</para>
<informalexample>
- <screen>
+ <programlisting>
<Location /svn>
DAV svn
# any "/svn/foo" URL will map to a repository /var/svn/foo
SVNParentPath /var/svn
</Location>
-</screen>
+</programlisting>
</informalexample>
<para>Using the previous syntax, Apache will delegate the
@@ -1687,9 +1687,9 @@
<filename>httpd.conf</filename> to accomplish this.</para>
<informalexample>
- <screen>
+ <programlisting>
ServerName svn.example.com
-</screen>
+</programlisting>
</informalexample>
<para>If you are using Apache's virtual hosting support via
@@ -1738,12 +1738,12 @@
following:</para>
<informalexample>
- <screen>
+ <programlisting>
<Location /svn>
DAV svn
SVNParentPath /var/svn
</Location>
-</screen>
+</programlisting>
</informalexample>
<para>your repository is <quote>anonymously</quote>
@@ -1834,7 +1834,7 @@
something like this:</para>
<informalexample>
- <screen>
+ <programlisting>
<Location /svn>
DAV svn
SVNParentPath /var/svn
@@ -1842,7 +1842,7 @@
AuthName "Subversion repository"
AuthUserFile /etc/svn-auth-file
</Location>
-</screen>
+</programlisting>
</informalexample>
<para>This <literal><Location></literal> block is not
@@ -1858,7 +1858,7 @@
that all requests require an authenticated user:</para>
<informalexample>
- <screen>
+ <programlisting>
<Location /svn>
DAV svn
SVNParentPath /var/svn
@@ -1867,7 +1867,7 @@
AuthUserFile /etc/svn-auth-file
Require valid-user
</Location>
-</screen>
+</programlisting>
</informalexample>
<para>Be sure to read the next section (<xref
@@ -1897,7 +1897,7 @@
details.</para>
<informalexample>
- <screen>
+ <programlisting>
<Location /svn>
DAV svn
SVNParentPath /var/svn
@@ -1907,7 +1907,7 @@
AuthUserFile /etc/svn-auth-file
Require valid-user
</Location>
-</screen>
+</programlisting>
</informalexample>
<para>If you're looking for maximum security, public key
@@ -1957,7 +1957,7 @@
do anything with the Subversion repository:</para>
<informalexample>
- <screen>
+ <programlisting>
<Location /svn>
DAV svn
SVNParentPath /var/svn
@@ -1970,7 +1970,7 @@
# only authenticated users may access the repository
Require valid-user
</Location>
-</screen>
+</programlisting>
</informalexample>
<para>Sometimes you don't need to run such a tight ship. For
@@ -2002,7 +2002,7 @@
inside the <literal><Location></literal> block.</para>
<informalexample>
- <screen>
+ <programlisting>
<Location /svn>
DAV svn
SVNParentPath /var/svn
@@ -2017,7 +2017,7 @@
Require valid-user
</LimitExcept>
</Location>
-</screen>
+</programlisting>
</informalexample>
<para>These are only a few simple examples. For more in-depth
@@ -2027,7 +2027,6 @@
documentation's tutorials collection at <ulink
url="http://httpd.apache.org/docs-2.0/misc/tutorials.html"/>.</para>
-
</sect3>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-->
@@ -2052,11 +2051,11 @@
<filename>httpd.conf</filename>:</para>
<informalexample>
- <screen>
+ <programlisting>
LoadModule dav_module modules/mod_dav.so
LoadModule dav_svn_module modules/mod_dav_svn.so
LoadModule authz_svn_module modules/mod_authz_svn.so
-</screen>
+</programlisting>
</informalexample>
<para>To activate this module, you need to configure your
@@ -2089,7 +2088,7 @@
# our access control policy
AuthzSVNAccessFile /path/to/access/file
</Location>
- </programlisting>
+</programlisting>
</example>
<para>On the opposite end of the paranoia scale, you can
@@ -2118,7 +2117,7 @@
AuthName "Subversion repository"
AuthUserFile /path/to/users/file
</Location>
- </programlisting>
+</programlisting>
</example>
<para>A third very popular pattern is to allow a combination
@@ -2155,7 +2154,7 @@
AuthName "Subversion repository"
AuthUserFile /path/to/users/file
</Location>
- </programlisting>
+</programlisting>
</example>
<para>Once you've settled on one of these three
@@ -2226,7 +2225,7 @@
SVNPathAuthz off
</Location>
- </programlisting>
+</programlisting>
</example>
<para>The <literal>SVNPathAuthz</literal> directive
@@ -2605,14 +2604,14 @@
reference the XSLT stylesheet of your choice:</para>
<informalexample>
- <screen>
+ <programlisting>
<Location /svn>
DAV svn
SVNParentPath /var/svn
SVNIndexXSLT "/svnindex.xsl"
…
</Location>
-</screen>
+</programlisting>
</informalexample>
<para>Using the <literal>SVNIndexXSLT</literal> directive and
@@ -2639,14 +2638,14 @@
directive:</para>
<informalexample>
- <screen>
+ <programlisting>
<Location /svn>
DAV svn
SVNParentPath /var/svn
SVNListParentPath on
…
</Location>
-</screen>
+</programlisting>
</informalexample>
<para>If a user now points her web browser to the
@@ -2712,14 +2711,14 @@
Subversion <literal>Location</literal> block:</para>
<informalexample>
- <screen>
+ <programlisting>
<Location /svn>
DAV svn
…
</Location>
CustomLog logs/svn_logfile "%t %u %{SVN-ACTION}e" env=SVN-ACTION
-</screen>
+</programlisting>
</informalexample>
<para>In this example, we're asking Apache to create a special
@@ -2828,14 +2827,14 @@
to the block:</para>
<informalexample>
- <screen>
+ <programlisting>
<Location /svn>
DAV svn
SVNPath /var/svn/repos
SVNMasterURI http://master.example.com/svn
…
</Location>
-</screen>
+</programlisting>
</informalexample>
<para>This new directive tells a slave server to redirect
@@ -2866,7 +2865,7 @@
(and only from) the master's IP address:</para>
<informalexample>
- <screen>
+ <programlisting>
<Location /svn-proxy-sync>
DAV svn
SVNPath /var/svn/repos
@@ -2876,7 +2875,7 @@
Allow from 10.20.30.40
…
</Location>
-</screen>
+</programlisting>
</informalexample>
</sect4>
@@ -3190,20 +3189,7 @@
<para>To be more specific: the value of the section names is
either of the form <literal>[repos-name:path]</literal> or of the
- form <literal>[path]</literal>.</para>
-
- <!-- TODO: This was fixed in Subversion 1.7: it does
- case-sensitive comparison against the section headers. -->
- <warning>
- <para>Subversion treats repository names and paths in a
- case-insensitive fashion for the purposes of access control,
- converting them to lower case internally before comparing them
- against the contents of your access file. Use lower case for
- the contents of the section headers in your access
- file.</para>
- </warning>
-
- <para>If you're using the
+ form <literal>[path]</literal>. If you're using the
<literal>SVNParentPath</literal> directive, it's important
to specify the repository names in your sections. If you omit
them, a section such as
@@ -3214,11 +3200,11 @@
sections—after all, there's only one repository.</para>
<informalexample>
- <screen>
+ <programlisting>
[calc:/branches/calc/bug-142]
harry = rw
sally = r
-</screen>
+</programlisting>
</informalexample>
<para>In this first example, the user <literal>harry</literal> has
@@ -3235,12 +3221,12 @@
repository:</para>
<informalexample>
- <screen>
+ <programlisting>
<Location /svn/calc>
SVNPath /var/svn/calc
SVNReposName "Calculator Application"
…
-</screen>
+</programlisting>
</informalexample>
<para>This allows <command>mod_dav_svn</command> to identify the
@@ -3258,7 +3244,7 @@
different access policy for Sally:</para>
<informalexample>
- <screen>
+ <programlisting>
[calc:/branches/calc/bug-142]
harry = rw
sally = r
@@ -3266,7 +3252,7 @@
# give sally write access only to the 'testing' subdir
[calc:/branches/calc/bug-142/testing]
sally = rw
-</screen>
+</programlisting>
</informalexample>
<para>Now Sally can write to the <filename>testing</filename>
@@ -3279,14 +3265,14 @@
nothing:</para>
<informalexample>
- <screen>
+ <programlisting>
[calc:/branches/calc/bug-142]
harry = rw
sally = r
[calc:/branches/calc/bug-142/secret]
harry =
-</screen>
+</programlisting>
</informalexample>
<para>In this example, Harry has read/write access to the
@@ -3311,10 +3297,10 @@
users</quote>:</para>
<informalexample>
- <screen>
+ <programlisting>
[/]
* = r
-</screen>
+</programlisting>
</informalexample>
<para>This is a common setup; notice that no repository
@@ -3339,12 +3325,12 @@
file:</para>
<informalexample>
- <screen>
+ <programlisting>
[groups]
calc-developers = harry, sally, joe
paint-developers = frank, sally, jane
everyone = harry, sally, joe, frank, jane
-</screen>
+</programlisting>
</informalexample>
<para>Groups can be granted access control just like users.
@@ -3352,14 +3338,14 @@
(<literal>@</literal>) prefix:</para>
<informalexample>
- <screen>
+ <programlisting>
[calc:/projects/calc]
@calc-developers = rw
[paint:/projects/paint]
jane = r
@paint-developers = rw
-</screen>
+</programlisting>
</informalexample>
<para>Another important fact is that group permissions are not
@@ -3375,12 +3361,12 @@
<para>Groups can also be defined to contain other groups:</para>
<informalexample>
- <screen>
+ <programlisting>
[groups]
calc-developers = harry, sally, joe
paint-developers = frank, sally, jane
everyone = @calc-developers, @paint-developers
-</screen>
+</programlisting>
</informalexample>
<para>Subversion 1.5 brought several useful features to the access
@@ -3405,13 +3391,13 @@
it a more easily digestable alias.</para>
<informalexample>
- <screen>
+ <programlisting>
[aliases]
harry = CN=Harold Hacker,OU=Engineers,DC=red-bean,DC=com
sally = CN=Sally Swatterbug,OU=Engineers,DC=red-bean,DC=com
joe = CN=Gerald I. Joseph,OU=Engineers,DC=red-bean,DC=com
…
-</screen>
+</programlisting>
</informalexample>
<para>Once you've defined a set of aliases, you can refer to the
@@ -3421,12 +3407,12 @@
a regular username:</para>
<informalexample>
- <screen>
+ <programlisting>
[groups]
calc-developers = &harry, &sally, &joe
paint-developers = &frank, &sally, &jane
everyone = @calc-developers, @paint-developers
-</screen>
+</programlisting>
</informalexample>
<para>You might also choose to use aliases if your users'
@@ -3447,11 +3433,11 @@
<emphasis>not</emphasis> authenticated with a username.</para>
<informalexample>
- <screen>
+ <programlisting>
[calendar:/projects/calendar]
$anonymous = r
$authenticated = rw
-</screen>
+</programlisting>
</informalexample>
<para>Finally, another handy bit of access file syntax magic is
@@ -3464,17 +3450,17 @@
equivalent to the one in the previous example:</para>
<informalexample>
- <screen>
+ <programlisting>
[calendar:/projects/calendar]
~$authenticated = r
~$anonymous = rw
-</screen>
+</programlisting>
</informalexample>
<para>A less obvious example might be as follows:</para>
<informalexample>
- <screen>
+ <programlisting>
[groups]
calc-developers = &harry, &sally, &joe
calc-owners = &hewlett, &packard
@@ -3487,7 +3473,7 @@
# ...but only allow the owners to make and modify release tags.
[calc:/projects/calc/tags]
~@calc-owners = r
-</screen>
+</programlisting>
</informalexample>
<!-- TODO(sussman): Once serf becomes officially support, this
More information about the svnbook-dev
mailing list