[ARVADOS] updated: 1de4f2fbc12c840726bc340792a73814818f3faa

[git at public.curoverse.com]

Summary of changes:
 doc/install/install-arv-git-httpd.html.textile.liquid | 2 --
 services/arv-git-httpd/server.go                      | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

  discards  9b9528c5dd1f506e6aed8b8de4f2d63c8922f392 (commit)
  discards  7f8f29dee43c14ab768d64b7831df8daeda86b21 (commit)
       via  1de4f2fbc12c840726bc340792a73814818f3faa (commit)
       via  b20aa99b4356a2afa092bb355a0db78b0b8f711f (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (9b9528c5dd1f506e6aed8b8de4f2d63c8922f392)
            \
             N -- N -- N (1de4f2fbc12c840726bc340792a73814818f3faa)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 1de4f2fbc12c840726bc340792a73814818f3faa
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Aug 20 02:11:02 2015 -0400

    6263: Set flag to skip gitolite permission checks, and set SERVER_ADDR so gitolite doesn't complain.

diff --git a/doc/install/install-arv-git-httpd.html.textile.liquid b/doc/install/install-arv-git-httpd.html.textile.liquid
index 7279670..d337239 100644
--- a/doc/install/install-arv-git-httpd.html.textile.liquid
+++ b/doc/install/install-arv-git-httpd.html.textile.liquid
@@ -291,8 +291,9 @@ EOF</span>
 #!/bin/sh
 export ARVADOS_API_HOST=<b>uuid_prefix.your.domain</b>
 export GITOLITE_HTTP_HOME=/var/lib/arvados/git
+export GL_BYPASS_ACCESS_CHECKS=1
 export PATH="$PATH:/var/lib/arvados/git/bin"
-exec chpst -u git:git arvados-git-httpd -address=:9001 -git-command="$(which git)" -repo-root=<b>/var/lib/arvados/git/repositories</b> 2>&1
+exec chpst -u git:git arvados-git-httpd -address=:9001 -git-command=/var/lib/arvados/git/gitolite/src/gitolite-shell -repo-root=<b>/var/lib/arvados/git</b>/repositories 2>&1
 EOF</span>
 /etc/sv/arvados-git-httpd$ <span class="userinput">sudo chmod +x run log/run</span>
 </code></pre>
@@ -304,8 +305,9 @@ If you are using a different daemon supervisor, or if you want to test the daemo
 <pre><code>sudo -u git \
   ARVADOS_API_HOST=<span class="userinput">uuid_prefix.your.domain</span> \
   GITOLITE_HTTP_HOME=/var/lib/arvados/git \
+  GL_BYPASS_ACCESS_CHECKS=1 \
   PATH="$PATH:/var/lib/arvados/git/bin" \
-  arvados-git-httpd -address=:9001 -git-command="$(which git)" -repo-root=<span class="userinput">/var/lib/arvados/git/repositories</span> 2>&1
+  arvados-git-httpd -address=:9001 -git-command=/var/lib/arvados/git/gitolite/src/gitolite-shell -repo-root=/var/lib/arvados/git/repositories 2>&1
 </code></pre>
 </notextile>
 

commit b20aa99b4356a2afa092bb355a0db78b0b8f711f
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Aug 20 01:51:17 2015 -0400

    6263: Pass through environment variables needed by gitolite-shell.

diff --git a/services/arv-git-httpd/main.go b/services/arv-git-httpd/main.go
index 452390c..98695c9 100644
--- a/services/arv-git-httpd/main.go
+++ b/services/arv-git-httpd/main.go
@@ -19,7 +19,7 @@ func init() {
 	flag.StringVar(&theConfig.Addr, "address", "0.0.0.0:80",
 		"Address to listen on, \"host:port\".")
 	flag.StringVar(&theConfig.GitCommand, "git-command", "/usr/bin/git",
-		"Path to git executable. Each authenticated request will execute this program with a single argument, \"http-backend\".")
+		"Path to git or gitolite-shell executable. Each authenticated request will execute this program with a single argument, \"http-backend\".")
 	cwd, err := os.Getwd()
 	if err != nil {
 		log.Fatalln("Getwd():", err)
diff --git a/services/arv-git-httpd/server.go b/services/arv-git-httpd/server.go
index c3c36da..e3cd582 100644
--- a/services/arv-git-httpd/server.go
+++ b/services/arv-git-httpd/server.go
@@ -18,8 +18,14 @@ func (srv *server) Start() error {
 		Env: []string{
 			"GIT_PROJECT_ROOT=" + theConfig.Root,
 			"GIT_HTTP_EXPORT_ALL=",
+			"SERVER_ADDR=" + theConfig.Addr,
+		},
+		InheritEnv: []string{
+			"PATH",
+			// Needed if GitCommand is gitolite-shell:
+			"GITOLITE_HTTP_HOME",
+			"GL_BYPASS_ACCESS_CHECKS",
 		},
-		InheritEnv: []string{"PATH"},
 		Args:       []string{"http-backend"},
 	}
 	mux := http.NewServeMux()

-----------------------------------------------------------------------


hooks/post-receive
--