You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/09/23 18:37:18 UTC

[6/6] allura git commit: [#8128] comments

[#8128] comments


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/755eb4f2
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/755eb4f2
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/755eb4f2

Branch: refs/heads/master
Commit: 755eb4f200211a2b0293444cf7c41ab900656c15
Parents: b6d1c2f
Author: Dave Brondsema <da...@brondsema.net>
Authored: Tue Sep 20 11:58:16 2016 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Sep 23 14:37:00 2016 -0400

----------------------------------------------------------------------
 scm_config/git-http/git-http.conf | 2 +-
 scripts/ApacheAccessHandler.py    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/755eb4f2/scm_config/git-http/git-http.conf
----------------------------------------------------------------------
diff --git a/scm_config/git-http/git-http.conf b/scm_config/git-http/git-http.conf
index 40cbfef..f6f059e 100644
--- a/scm_config/git-http/git-http.conf
+++ b/scm_config/git-http/git-http.conf
@@ -45,7 +45,7 @@ ErrorLog /dev/stderr
         AuthBasicAuthoritative off
         PythonOption ALLURA_PERM_URL http://web:8080/auth/repo_permissions
         PythonOption ALLURA_AUTH_URL http://web:8080/auth/do_login
-        # for 'requests' lib only
+        # for 'requests' lib only, doesn't have to be full allura venv
         PythonOption ALLURA_VIRTUALENV /allura-data/virtualenv
     </Location>
 

http://git-wip-us.apache.org/repos/asf/allura/blob/755eb4f2/scripts/ApacheAccessHandler.py
----------------------------------------------------------------------
diff --git a/scripts/ApacheAccessHandler.py b/scripts/ApacheAccessHandler.py
index 89654c5..b8fc2fe 100644
--- a/scripts/ApacheAccessHandler.py
+++ b/scripts/ApacheAccessHandler.py
@@ -41,9 +41,13 @@ Here is a quick example for your apache settings (assuming ProxyPass)
         AuthBasicAuthoritative off
         PythonOption ALLURA_PERM_URL https://127.0.0.1/auth/repo_permissions
         PythonOption ALLURA_AUTH_URL https://127.0.0.1/auth/do_login
+        # for 'requests' lib only, doesn't have to be full allura venv
         PythonOption ALLURA_VIRTUALENV /var/local/env-allura
     </Location>
 
+
+This could also use the Allura code and authorize directly, but it's useful to be able to run
+this authorization code without Allura set up and configured on the git host.
 """