diff options
| author | Andy Doan <andy.doan@linaro.org> | 2015-04-13 11:01:31 -0500 |
|---|---|---|
| committer | Linaro Code Review <review@review.linaro.org> | 2015-04-13 19:46:06 +0000 |
| commit | 99064a8a40954f466e8db9f5320bc3fde60c9e01 (patch) | |
| tree | a4d98558d21d643b4192678e3795aad8333bc4d2 | |
| parent | 91d79af7e297e098be19d17f0b92fa08d2170631 (diff) | |
android/git: document root apache config not in playbook
android.git.linaro.org has the following doc-root configured:
<Directory "/var/www/android.git.linaro.org">
AllowOverride None
Order deny,allow
Allow from all
ExpiresActive Off
FileEtag None
Header set Cache-Control "no-cache, no-store, no-transform"
Header unset Last-Modified
#<FilesMatch "\.(bundle)$">
# FileEtag MTime
# Header set Cache-Control "no-transform, must-revalidate, max-age=518400"
#</FilesMatch>
</Directory>
There are 2 problems:
1) its not in our playbook
2) we are applying odd caching logic (not the same as git-us.linaro.org)
specifically - i'm seeing an error because we don't provide the
"last-modified" header.
This commit changes our document root settings to better match what
we have for git-us.linaro.org.
NOTE: this is pretty safe because we actually weren't serving anything
in our document root, until I put the grokmirror manifest.js.gz file
there last week.
A quick way to test this:
# shows dumb-git still provides no-cache
curl -I https://android-us.git.linaro.org/git-http/All-Projects.git/HEAD
# shows last-modified header
curl -I https://android-us.git.linaro.org/manifest.js.gz
Change-Id: Ic1803dd96dabffadb3aed8269b857101ebf05bab
| -rw-r--r-- | per-service/git-servers/files/android.git.linaro.org.conf | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/per-service/git-servers/files/android.git.linaro.org.conf b/per-service/git-servers/files/android.git.linaro.org.conf index c03389b8..1c2b4951 100644 --- a/per-service/git-servers/files/android.git.linaro.org.conf +++ b/per-service/git-servers/files/android.git.linaro.org.conf @@ -124,4 +124,15 @@ Mutex default rewrite-map Header set Cache-Control "no-transform, must-revalidate, max-age=518400" </FilesMatch> </Directory> + + <Directory "{{ apache_root }}/{{ git_host }}/"> + AllowOverride None + <IfVersion < 2.3 > + Order allow,deny + Allow from all + </IfVersion> + <IfVersion >= 2.3> + Require all granted + </IfVersion> + </Directory> </VirtualHost> |