summaryrefslogtreecommitdiff
path: root/per-service
diff options
context:
space:
mode:
authorAndy Doan <andy.doan@linaro.org>2016-10-28 12:04:05 -0500
committerAndy Doan <andy.doan@linaro.org>2016-10-28 17:30:07 +0000
commit744933a48e756f311d9d2880b37be6e69d4f3b7b (patch)
tree1f7addf520db555cf9f4f56a5eff10cb7c34ea1b /per-service
parentced55980f10f4f305be13539485d1aaeace23915 (diff)
downloadansible-playbooks-744933a48e756f311d9d2880b37be6e69d4f3b7b.tar.gz
cgit/grok: enable manifest.js.gz link
Now that we don't server /var/www/git.l.o we need to make the link to our grok manifest http://git.l.o/manifest.js.gz accessible. This is actually a 2 part change. This is the simple part that stops the bleeding. It actually required me to put an adhoc symlink from /srv/reposistories/manifest.js.gz to the file under /var/www/git.l.o The next part is the more complex one, where I have to actually update all grokmirror hooks to use this new file location and not require the symlink. Change-Id: Iefa94c3151d100d07d63044995e74bcd0d15cd74 Reviewed-on: https://review.linaro.org/15100 Reviewed-by: Ben Copeland <ben.copeland@linaro.org>
Diffstat (limited to 'per-service')
-rw-r--r--per-service/git-servers/files/git.linaro.org.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/per-service/git-servers/files/git.linaro.org.conf b/per-service/git-servers/files/git.linaro.org.conf
index 6d697eb..aea1cca 100644
--- a/per-service/git-servers/files/git.linaro.org.conf
+++ b/per-service/git-servers/files/git.linaro.org.conf
@@ -84,6 +84,7 @@ ServerTokens Prod
AliasMatch ^/git/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$ {{ repo_root }}/$1
AliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ {{ repo_root }}/$1
+ Alias /manifest.js.gz {{ repo_root }}/manifest.js.gz
ScriptAliasMatch "(?x)^/git/(.*/(HEAD | info/refs | objects/info/[^/]+ | git-(upload|receive)-pack))$" {{ apache_root }}/cgit/git-http-backend.cgi
@@ -208,6 +209,7 @@ ServerTokens Prod
AliasMatch ^/git-ro/(.*)/clone.bundle$ {{ repo_root }}/$1/clone.bundle
AliasMatch ^/git-http/(.*)/clone.bundle$ {{ repo_root }}/$1/clone.bundle
AliasMatch ^/git/(.*)/clone.bundle$ {{ repo_root }}/$1/clone.bundle
+ Alias /manifest.js.gz {{ repo_root }}/manifest.js.gz
SetEnvIf User-Agent "Amazon Route 53 Health Check" dontlog