Repository: allura Updated Branches: refs/heads/db/8128 3b8a27364 -> 6ac5a2c26 (forced update)
[#8128] make repo refresh work Project: http://git-wip-us.apache.org/repos/asf/allura/repo Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/6ac5a2c2 Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/6ac5a2c2 Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/6ac5a2c2 Branch: refs/heads/db/8128 Commit: 6ac5a2c2655fec4f6c86645211312bfc3a7d6255 Parents: 1b603f5 Author: Dave Brondsema <d...@brondsema.net> Authored: Tue Sep 20 14:24:31 2016 -0400 Committer: Dave Brondsema <d...@brondsema.net> Committed: Tue Sep 20 14:52:10 2016 -0400 ---------------------------------------------------------------------- Allura/allura/model/repository.py | 3 ++- Allura/development.ini | 3 +++ Allura/docker-dev.ini | 9 +++++++-- scm_config/git-http/Dockerfile | 3 ++- 4 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/allura/blob/6ac5a2c2/Allura/allura/model/repository.py ---------------------------------------------------------------------- diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py index 8ee52b5..2f265fd 100644 --- a/Allura/allura/model/repository.py +++ b/Allura/allura/model/repository.py @@ -575,8 +575,9 @@ class Repository(Artifact, ActivityObject): return self.app_config.url() def refresh_url(self): + refresh_base_url = tg.config.get('scm.repos.refresh_base_url') or tg.config.get('base_url', 'http://localhost:8080') return '/'.join([ - tg.config.get('base_url', 'http://localhost:8080').rstrip('/'), + refresh_base_url.rstrip('/'), 'auth/refresh_repo', self.url().lstrip('/'), ]) http://git-wip-us.apache.org/repos/asf/allura/blob/6ac5a2c2/Allura/development.ini ---------------------------------------------------------------------- diff --git a/Allura/development.ini b/Allura/development.ini index b160ef6..6e9c1d3 100644 --- a/Allura/development.ini +++ b/Allura/development.ini @@ -346,6 +346,9 @@ scm.clone.ro.svn = svn checkout $source_url $dest_path scm.clone.https_anon.svn = svn checkout $source_url $dest_path scm.clone.svn = svn checkout --username=$username $source_url $dest_path +; Only needed if different than "base_url" (e.g. if "base_url" isn't reachable from SCM hosts and you need an internal hostname) +;scm.repos.refresh_base_url = http://localhost:8080 + scm.repos.root = /srv scm.repos.tarball.enable = false scm.repos.tarball.root = /usr/share/nginx/www/ http://git-wip-us.apache.org/repos/asf/allura/blob/6ac5a2c2/Allura/docker-dev.ini ---------------------------------------------------------------------- diff --git a/Allura/docker-dev.ini b/Allura/docker-dev.ini index dacc99c..eb4d8f7 100644 --- a/Allura/docker-dev.ini +++ b/Allura/docker-dev.ini @@ -29,9 +29,14 @@ ming.main.uri = mongodb://mongo:27017/allura ming.project.uri = mongodb://mongo:27017/project-data ming.task.uri = mongodb://mongo:27017/task +scm.repos.refresh_base_url = http://web:8080 + scm.repos.root = /allura-data/scm -scm.host.ro.git = /allura-data/scm/git$path -scm.host.rw.git = /allura-data/scm/git$path +; may need to change "localhost" to your remote host name, or docker-machine IP address +scm.host.ro.git = http://localhost:8081/git$path +scm.host.rw.git = http://localhost:8081/git$path +scm.host.https.git = http://localhost:8081/git$path +scm.host.https_anon.git = http://localhost:8081/git$path scm.host.ro.hg = /allura-data/scm/hg$path scm.host.rw.hg = /allura-data/scm/hg$path scm.host.ro.svn = file:///allura-data/scm/svn$path/ http://git-wip-us.apache.org/repos/asf/allura/blob/6ac5a2c2/scm_config/git-http/Dockerfile ---------------------------------------------------------------------- diff --git a/scm_config/git-http/Dockerfile b/scm_config/git-http/Dockerfile index 3479632..8f5650f 100644 --- a/scm_config/git-http/Dockerfile +++ b/scm_config/git-http/Dockerfile @@ -25,7 +25,8 @@ FROM ubuntu:14.04 RUN apt-get update && apt-get install -y \ apache2 \ libapache2-mod-python \ - git + git \ + curl ENV APACHE_RUN_USER www-data
