summaryrefslogtreecommitdiff
path: root/per-service
diff options
context:
space:
mode:
authorAndy Doan <andy.doan@linaro.org>2016-11-14 13:14:02 -0600
committerAndy Doan <andy.doan@linaro.org>2016-11-18 15:35:05 +0000
commit3369475830e757db33eea4a507e05e77ee1d700b (patch)
tree00bce52419c3e6d5477f6e15e0c5a5d41609b189 /per-service
parent7204706e626fbc1827255b4d9131fa163f6f3e0b (diff)
downloadansible-playbooks-3369475830e757db33eea4a507e05e77ee1d700b.tar.gz
git: update references to grokmirror manifest file
Part of the cgit changes required us to make manifest.js.gz accessible via /srv/repositories. I hacked around that at the time by placing a symlink from /srv/repositories/manifest.js.gz -> /var/www/git.linar.org/manifest.js.gz. With cgit in place on all grok master's we now need to update code references from the old location to the new one so we can get rid of this symlink hack. Change-Id: I67744f6fa2d8476ac605c7b39d919c3f3fbe0c9d Reviewed-on: https://review.linaro.org/15525 Reviewed-by: Ben Copeland <ben.copeland@linaro.org>
Diffstat (limited to 'per-service')
-rw-r--r--per-service/git-servers/roles/grokmirror/templates/gerrit-ref-updated2
-rw-r--r--per-service/git-servers/roles/grokmirror/templates/grokmirror.cron.d2
-rw-r--r--per-service/git-servers/roles/mirroring-gerrit/files/android-git-us.linaro.org.conf4
-rw-r--r--per-service/git-servers/roles/mirroring-gerrit/files/git-us.linaro.org.conf4
4 files changed, 6 insertions, 6 deletions
diff --git a/per-service/git-servers/roles/grokmirror/templates/gerrit-ref-updated b/per-service/git-servers/roles/grokmirror/templates/gerrit-ref-updated
index 9a33e54..ba2f3cb 100644
--- a/per-service/git-servers/roles/grokmirror/templates/gerrit-ref-updated
+++ b/per-service/git-servers/roles/grokmirror/templates/gerrit-ref-updated
@@ -11,7 +11,7 @@ GROK_MANIFEST_BIN=/usr/local/bin/grok-manifest
GROK_MANIFEST_LOG=${GERRIT_HOME}/logs/grok-manifest.log
# You'll need to place this where you can serve it with httpd
# Make sure the gerrit process can write to this location
-GROK_MANIFEST={{apache_root}}/{{git_host}}/manifest.js.gz
+GROK_MANIFEST=${GERRIT_GIT}/manifest.js.gz
# force all output to log file
exec >>${GROK_MANIFEST_LOG} 2>&1
diff --git a/per-service/git-servers/roles/grokmirror/templates/grokmirror.cron.d b/per-service/git-servers/roles/grokmirror/templates/grokmirror.cron.d
index 8c82042..3aebff7 100644
--- a/per-service/git-servers/roles/grokmirror/templates/grokmirror.cron.d
+++ b/per-service/git-servers/roles/grokmirror/templates/grokmirror.cron.d
@@ -6,5 +6,5 @@
0 * * * * git {{tools_checkout_dir}}/linaro-git-tools/grok-slave-keys
{% endif %}
{% if grokmirror_master %}
-*/5 * * * * git {{tools_checkout_dir}}/linaro-git-tools/grok-cron.py -m {{apache_root}}/{{git_host}}/manifest.js.gz -t {{repo_root}}{% if not grokmirror_master_check_export %} --no-check-export{% endif %}
+*/5 * * * * git {{tools_checkout_dir}}/linaro-git-tools/grok-cron.py -m {{repo_root}}/manifest.js.gz -t {{repo_root}}{% if not grokmirror_master_check_export %} --no-check-export{% endif %}
{% endif %}
diff --git a/per-service/git-servers/roles/mirroring-gerrit/files/android-git-us.linaro.org.conf b/per-service/git-servers/roles/mirroring-gerrit/files/android-git-us.linaro.org.conf
index 0109ef7..af59dfc 100644
--- a/per-service/git-servers/roles/mirroring-gerrit/files/android-git-us.linaro.org.conf
+++ b/per-service/git-servers/roles/mirroring-gerrit/files/android-git-us.linaro.org.conf
@@ -3,7 +3,7 @@
$repo_root = ssh://linaro-aosp-sync-bot@gerrit-git:29418
$gerrit_host = linaro-aosp-sync-bot@gerrit-git
$gerrit_port = 29418
-$grok_manifest = /var/www/android-git.linaro.org/manifest.js.gz
+$grok_manifest = /srv/repositories/manifest.js.gz
$grok_repo_root = /srv/repositories/
[DESTINATION-admin]
@@ -23,7 +23,7 @@ $repo_root = ssh://somewhere.org/git
[DESTINATION-local]
# Usecase 3: target is a local tree (for improved performance or for testing)
$repo_root = /srv/repositories
-$grok_manifest = /var/www/android-git.linaro.org/manifest.js.gz
+$grok_manifest = /srv/repositories/manifest.js.gz
$grok_repo_root = /srv/repositories/
#[git://another-android-tree.org]
diff --git a/per-service/git-servers/roles/mirroring-gerrit/files/git-us.linaro.org.conf b/per-service/git-servers/roles/mirroring-gerrit/files/git-us.linaro.org.conf
index 918daed..d4d31d4 100644
--- a/per-service/git-servers/roles/mirroring-gerrit/files/git-us.linaro.org.conf
+++ b/per-service/git-servers/roles/mirroring-gerrit/files/git-us.linaro.org.conf
@@ -3,13 +3,13 @@
$repo_root = ssh://linaro-gerrit-bot@linaro-review:29418
$gerrit_host = linaro-gerrit-bot@linaro-review
$gerrit_port = 29418
-$grok_manifest = /var/www/git.linaro.org/manifest.js.gz
+$grok_manifest = /srv/repositories/manifest.js.gz
$grok_repo_root = /srv/repositories/
[DESTINATION-local]
# For direct filesystem pushing
$repo_root = /srv/repositories
-$grok_manifest = /var/www/git.linaro.org/manifest.js.gz
+$grok_manifest = /srv/repositories/manifest.js.gz
$grok_repo_root = /srv/repositories/
[http://llvm.org]