Merge pull request #702 from johnhar/master

Fixes #312

Author: ben

book/04-git-server/sections/git-daemon.asc

@@ -13,7 +13,7 @@ Basically, you need to run this command in a daemonized manner:(((git commands,
 
 [source,console]
 ----
-$ git daemon --reuseaddr --base-path=/opt/git/ /opt/git/
+$ git daemon --reuseaddr --base-path=/srv/git/ /srv/git/
 ----
 
 `--reuseaddr` allows the server to restart without waiting for old connections to time out, the `--base-path` option allows people to clone projects without specifying the entire path, and the path at the end tells the Git daemon where to look for repositories to export.
@@ -37,8 +37,8 @@ stop on shutdown
 exec /usr/bin/git daemon \
     --user=git --group=git \
     --reuseaddr \
-    --base-path=/opt/git/ \
-    /opt/git/
+    --base-path=/srv/git/ \
+    /srv/git/
 respawn
 ----
 

book/04-git-server/sections/gitweb.asc

@@ -38,7 +38,7 @@ First, you need to get the Git source code, which GitWeb comes with, and generat
 ----
 $ git clone git://git.kernel.org/pub/scm/git/git.git
 $ cd git/
-$ make GITWEB_PROJECTROOT="/opt/git" prefix=/usr gitweb
+$ make GITWEB_PROJECTROOT="/srv/git" prefix=/usr gitweb
     SUBDIR gitweb
     SUBDIR ../
 make[2]: `GIT-VERSION-FILE' is up to date.

book/04-git-server/sections/protocols.asc

@@ -16,14 +16,14 @@ For example, to clone a local repository, you can run something like this:
 
 [source,console]
 ----
-$ git clone /opt/git/project.git
+$ git clone /srv/git/project.git
 ----
 
 Or you can do this:
 
 [source,console]
 ----
-$ git clone file:///opt/git/project.git
+$ git clone file:///srv/git/project.git
 ----
 
 Git operates slightly differently if you explicitly specify `file://` at the beginning of the URL.
@@ -36,7 +36,7 @@ To add a local repository to an existing Git project, you can run something like
 
 [source,console]
 ----
-$ git remote add local_proj /opt/git/project.git
+$ git remote add local_proj /srv/git/project.git
 ----
 
 Then, you can push to and pull from that remote as though you were doing so over a network.

book/04-git-server/sections/setting-up-server.asc

@@ -43,11 +43,11 @@ Now, you can set up an empty repository for them by running `git init` with the
 
 [source,console]
 ----
-$ cd /opt/git
+$ cd /srv/git
 $ mkdir project.git
 $ cd project.git
 $ git init --bare
-Initialized empty Git repository in /opt/git/project.git/
+Initialized empty Git repository in /srv/git/project.git/
 ----
 
 Then, John, Josie, or Jessica can push the first version of their project into that repository by adding it as a remote and pushing up a branch.
@@ -62,15 +62,15 @@ $ cd myproject
 $ git init
 $ git add .
 $ git commit -m 'initial commit'
-$ git remote add origin git@gitserver:/opt/git/project.git
+$ git remote add origin git@gitserver:/srv/git/project.git
 $ git push origin master
 ----
 
 At this point, the others can clone it down and push changes back up just as easily:
 
 [source,console]
 ----
-$ git clone git@gitserver:/opt/git/project.git
+$ git clone git@gitserver:/srv/git/project.git
 $ cd project
 $ vim README
 $ git commit -am 'fix for the README file'

book/04-git-server/sections/smart-http.asc

@@ -18,18 +18,18 @@ $ a2enmod cgi alias env rewrite
 
 This also enables the `mod_cgi`, `mod_alias`, `mod_env`, and `mod_rewrite` modules, which are all needed for this to work properly.
 
-You’ll also need to set the Unix user group of the `/opt/git` directories to `www-data` so your web server can read- and write-access the repositories, because the Apache instance running the CGI script will (by default) be running as that user:
+You’ll also need to set the Unix user group of the `/srv/git` directories to `www-data` so your web server can read- and write-access the repositories, because the Apache instance running the CGI script will (by default) be running as that user:
 
 [source,console]
 ----
-$ chgrp -R www-data /opt/git
+$ chgrp -R www-data /srv/git
 ----
 
 Next we need to add some things to the Apache configuration to run the `git-http-backend` as the handler for anything coming into the `/git` path of your web server.
 
 [source,console]
 ----
-SetEnv GIT_PROJECT_ROOT /opt/git
+SetEnv GIT_PROJECT_ROOT /srv/git
 SetEnv GIT_HTTP_EXPORT_ALL
 ScriptAlias /git/ /usr/lib/git-core/git-http-backend/
 ----
@@ -48,7 +48,7 @@ RewriteRule ^/git/ - [E=AUTHREQUIRED]
 <Files "git-http-backend">
     AuthType Basic
     AuthName "Git Access"
-    AuthUserFile /opt/git/.htpasswd
+    AuthUserFile /srv/git/.htpasswd
     Require valid-user
     Order deny,allow
     Deny from env=AUTHREQUIRED
@@ -61,7 +61,7 @@ Here is an example of adding a ``schacon'' user to the file:
 
 [source,console]
 ----
-$ htpasswd -c /opt/git/.htpasswd schacon
+$ htpasswd -c /srv/git/.htpasswd schacon
 ----
 
 There are tons of ways to have Apache authenticate users, you'll have to choose and implement one of them.