Permalink
Browse files

moved contrib stuff into contrib/, fixed up license text

(TODO: add license info for Thomas Hager's stuff when he responds; the
other two have responded and their license choices updated)
  • Loading branch information...
1 parent 7494ac1 commit 1f8600f70eb9ed50e4ece75747d6429f725440ed @sitaramc committed Jun 26, 2012
Showing with 108 additions and 94 deletions.
  1. +3 −0 {extras → contrib}/putty.mkd
  2. +90 −0 contrib/ssh-and-http.mkd
  3. +3 −0 { → contrib}/sskm.mkd
  4. +2 −86 http.mkd
  5. +10 −8 index.mkd
@@ -1,5 +1,8 @@
# putty and msysgit
+Copyright: Thomas Berezansky (tsbere (at) mvlc (dot) org). Licensed under
+CC-BY-SA unported 3.0, http://creativecommons.org/licenses/by-sa/3.0/
+
This document is intended for those who wish to use Putty/Plink with msysgit.
If you need more help with putty or component programs I suggest looking at [the official putty documentation](http://the.earth.li/~sgtatham/putty/latest/htmldoc/).
View
@@ -0,0 +1,90 @@
+# Making repositories available to both ssh and http mode clients
+
+Copyright Thomas Hager (duke at sigsegv dot at). Licensed under (to be
+added).
+
+Assumptions:
+
+ * Apache 2.x with CGI and Suexec support installed.
+ * Git and Gitolite installed with user "git" and group "git", and pubkey SSH
+ access configured and working.
+ * Git plumbing installed to /usr/libexec/git-core
+ * Gitolite base located at /opt/git
+ * Apache `DOCUMENT_ROOT` set to /var/www
+ * Apache runs with user www and group www
+
+Please adjust the instructions below to reflect your setup (users and paths).
+
+Edit your .gitolite.rc and add
+
+ $ENV{PATH} .= ":/opt/git/bin";
+
+at the very top (as described in `t/smart-http.root-setup`).
+
+Next, check which document root your Apache's suexec accepts:
+
+ # suexec -V
+ -D AP_DOC_ROOT="/var/www"
+ -D AP_GID_MIN=100
+ -D AP_HTTPD_USER="www"
+ -D AP_LOG_EXEC="/var/log/apache/suexec.log"
+ -D AP_SAFE_PATH="/usr/local/bin:/usr/bin:/bin"
+ -D AP_UID_MIN=100
+ -D AP_USERDIR_SUFFIX="public_html"
+
+We're interested in `AP_DOC_ROOT`, which is set to `/var/www` in our case.
+
+Create a `bin` and a `git` directory in `AP_DOC_ROOT`:
+
+ install -d -m 0755 -o git -g git /var/www/bin
+ install -d -m 0755 -o www -g www /var/www/git
+
+`/var/www/git` is just a dummy directory used as Apache's document root (see below).
+
+Next, create a shell script inside `/var/www/bin` named `gitolite-suexec-wrapper.sh`,
+with mode **0700** and owned by user and group **git**. Add the following content:
+
+ #!/bin/bash
+ #
+ # Suexec wrapper for gitolite-shell
+ #
+
+ export GIT_PROJECT_ROOT="/opt/git/repositories"
+ export GITOLITE_HTTP_HOME="/opt/git"
+
+ exec ${GITOLITE_HTTP_HOME}/gitolite-source/src/gitolite-shell
+
+Edit your Apache's config to add http pull/push support, preferably in
+a dedicated `VirtualHost` section:
+
+ <VirtualHost *:80>
+ ServerName git.example.com
+ ServerAlias git
+ ServerAdmin you@example.com
+
+ DocumentRoot /var/www/git
+ <Directory /var/www/git>
+ Options None
+ AllowOverride none
+ Order allow,deny
+ Allow from all
+ </Directory>
+
+ SuexecUserGroup git git
+ ScriptAlias /git/ /var/www/bin/gitolite-suexec-wrapper.sh/
+ ScriptAlias /gitmob/ /var/www/bin/gitolite-suexec-wrapper.sh/
+
+ <Location /git>
+ AuthType Basic
+ AuthName "Git Access"
+ Require valid-user
+ AuthUserFile /etc/apache/git.passwd
+ </Location>
+ </VirtualHost>
+
+This Apache config is just an example, you probably should adapt the authentication
+section and use https instead of http!
+
+Finally, add an `R = daemon` access rule to all repositories you want to
+make available via http.
+
@@ -1,5 +1,8 @@
# changing keys -- self service key management
+Copyright: Jeff Mitchell (jmitchell@kde.org). Licensed under CC-BY-NC-SA
+unported 3.0, http://creativecommons.org/licenses/by-nc-sa/3.0/
+
[Note on g3 version: this has been manually spot-tested; there is no test suite. Changes from g2 version are minimal so it should all work fine but please report errors!]
Follow this guide to add keys to or remove keys from your account. Note that you cannot use this method to add your *first* key to the account; you must still email your initial key to your admin.
View
@@ -36,92 +36,8 @@ outside apache's `DOCUMENT_ROOT`.</font>
## Making repositories available to both ssh and http mode clients
-This section has been contributed by Thomas Hager (duke at sigsegv dot at).
-
-Assumptions:
-
- * Apache 2.x with CGI and Suexec support installed.
- * Git and Gitolite installed with user "git" and group "git", and pubkey SSH
- access configured and working.
- * Git plumbing installed to /usr/libexec/git-core
- * Gitolite base located at /opt/git
- * Apache `DOCUMENT_ROOT` set to /var/www
- * Apache runs with user www and group www
-
-Please adjust the instructions below to reflect your setup (users and paths).
-
-Edit your .gitolite.rc and add
-
- $ENV{PATH} .= ":/opt/git/bin";
-
-at the very top (as described in `t/smart-http.root-setup`).
-
-Next, check which document root your Apache's suexec accepts:
-
- # suexec -V
- -D AP_DOC_ROOT="/var/www"
- -D AP_GID_MIN=100
- -D AP_HTTPD_USER="www"
- -D AP_LOG_EXEC="/var/log/apache/suexec.log"
- -D AP_SAFE_PATH="/usr/local/bin:/usr/bin:/bin"
- -D AP_UID_MIN=100
- -D AP_USERDIR_SUFFIX="public_html"
-
-We're interested in `AP_DOC_ROOT`, which is set to `/var/www` in our case.
-
-Create a `bin` and a `git` directory in `AP_DOC_ROOT`:
-
- install -d -m 0755 -o git -g git /var/www/bin
- install -d -m 0755 -o www -g www /var/www/git
-
-`/var/www/git` is just a dummy directory used as Apache's document root (see below).
-
-Next, create a shell script inside `/var/www/bin` named `gitolite-suexec-wrapper.sh`,
-with mode **0700** and owned by user and group **git**. Add the following content:
-
- #!/bin/bash
- #
- # Suexec wrapper for gitolite-shell
- #
-
- export GIT_PROJECT_ROOT="/opt/git/repositories"
- export GITOLITE_HTTP_HOME="/opt/git"
-
- exec ${GITOLITE_HTTP_HOME}/gitolite-source/src/gitolite-shell
-
-Edit your Apache's config to add http pull/push support, preferably in
-a dedicated `VirtualHost` section:
-
- <VirtualHost *:80>
- ServerName git.example.com
- ServerAlias git
- ServerAdmin you@example.com
-
- DocumentRoot /var/www/git
- <Directory /var/www/git>
- Options None
- AllowOverride none
- Order allow,deny
- Allow from all
- </Directory>
-
- SuexecUserGroup git git
- ScriptAlias /git/ /var/www/bin/gitolite-suexec-wrapper.sh/
- ScriptAlias /gitmob/ /var/www/bin/gitolite-suexec-wrapper.sh/
-
- <Location /git>
- AuthType Basic
- AuthName "Git Access"
- Require valid-user
- AuthUserFile /etc/apache/git.passwd
- </Location>
- </VirtualHost>
-
-This Apache config is just an example, you probably should adapt the authentication
-section and use https instead of http!
-
-Finally, add an `R = daemon` access rule to all repositories you want to
-make available via http.
+This section has been contributed by Thomas Hager (duke at sigsegv dot at),
+and is available [here][ssh-and-http].
## usage
View
@@ -60,17 +60,19 @@ most people see:
## #license license
This documentation, which is maintained separately from the main gitolite
-source code, is provided under a [Creative Commons
-Attribution-NonCommercial-ShareAlike 3.0 Unported
+source code, is copyright Sitaram Chamarty and is provided under a [Creative
+Commons Attribution-NonCommercial-ShareAlike 3.0 Unported
License](http://creativecommons.org/licenses/by-nc-sa/3.0/).
-However, of necessity, there are code examples within those documents. I
+However, certain parts are contributed by others who may have chosen other
+licenses; their names and license will be mentioned in the respective files.
+
+Documentation for a software product will naturally contain code examples. I
believe that the principle of fair use should cover use of those snippets; see
especially factors 3 and 4 in the list of factors
[here](http://en.wikipedia.org/wiki/Fair_use#Fair_use_under_United_States_law).
-However, if you're not convinced that it would be fair use, then you may
-consider those code snippets, as well as associated "comments" if any, to be
-under the GPLv2 license. Licensing is about intent, and the intent of these
-examples is that you use them wherever and however you can use gitolite
-itself.
+If you're not convinced that it would be fair use, then you may consider those
+code snippets, as well as associated "comments" if any, to be under the GPLv2
+license. Licensing is about intent, and the intent of these examples is that
+you use them wherever and however you can use gitolite itself.

0 comments on commit 1f8600f

Please sign in to comment.