summaryrefslogtreecommitdiff
path: root/per-service
diff options
context:
space:
mode:
authorAndy Doan <andy.doan@linaro.org>2016-10-21 10:15:31 -0500
committerAndy Doan <andy.doan@linaro.org>2016-10-21 17:28:17 +0000
commitb27e462a3b3a9ac306fa550b1d521b54a397e1cb (patch)
tree31fa1aced6b68af41a42ed07a48ebc15c0073fda /per-service
parent9f505c8c7413cbaa773f3e14db052474b7659ef7 (diff)
downloadansible-playbooks-b27e462a3b3a9ac306fa550b1d521b54a397e1cb.tar.gz
lhg-review: update apache config
The configuration for this was using some old caching logic we've known doesn't work well. I've removed all of it to make it more in-line with the configuration of dev-private-review.linaro.org. Change-Id: I8dcd689c0e1af4fa02f17103c478ae9c64344894 Reviewed-on: https://review.linaro.org/14964 Reviewed-by: Ben Copeland <ben.copeland@linaro.org>
Diffstat (limited to 'per-service')
-rw-r--r--per-service/git-servers/files/lhg-review.linaro.org.conf61
1 files changed, 2 insertions, 59 deletions
diff --git a/per-service/git-servers/files/lhg-review.linaro.org.conf b/per-service/git-servers/files/lhg-review.linaro.org.conf
index 7fef8d1..9a242a6 100644
--- a/per-service/git-servers/files/lhg-review.linaro.org.conf
+++ b/per-service/git-servers/files/lhg-review.linaro.org.conf
@@ -5,7 +5,7 @@ ServerTokens Prod
Suexec On
SuexecUserGroup {{ git_user }} {{ git_user }}
-LDAPCacheEntries 1024
+LDAPCacheEntries 2048
LDAPCacheTTL 36000
LDAPOpCacheEntries 1024
LDAPOpCacheTTL 36000
@@ -41,61 +41,7 @@ LDAPOpCacheTTL 36000
DocumentRoot {{ apache_root }}/{{ gerrit_host }}
- ExpiresActive On
- ExpiresDefault "access plus 0 seconds"
-
- ExpiresByType image/png "access plus 1 month"
- ExpiresByType image/jpg "access plus 1 month"
- ExpiresByType image/jpeg "access plus 1 month"
- ExpiresByType image/x-icon "access plus 1 month"
-
- Header always set Strict-Transport-Security "max-age=63072000"
- Header append Cache-Control "no-transform"
-
- <FilesMatch "\.(html|htm)$">
- Header add Cache-Control "must-revalidate"
- SetOutputFilter DEFLATE
-
- BrowserMatch ^Mozilla/4 gzip-only-text/html
- BrowserMatch ^Mozilla/4\.0[678] no-gzip
- BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
-
- Header append Vary User-Agent env=!dont-vary
- </FilesMatch>
-
- <FilesMatch "\.(js|css)$">
- Header add Cache-Control "max-age=5356800"
- SetOutputFilter DEFLATE
-
- BrowserMatch ^Mozilla/4 gzip-only-text/html
- BrowserMatch ^Mozilla/4\.0[678] no-gzip
- BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
-
- Header append Vary User-Agent env=!dont-vary
- </FilesMatch>
-
- KeepAlive On
- KeepAliveTimeout 10
- MaxKeepAliveRequests 150
-
- EnableSendfile On
-
- RewriteEngine On
-
- RewriteCond %{HTTP_HOST} !{{ gerrit_host }} [NC]
- RewriteCond %{HTTP_HOST} !^$
- RewriteRule ^/(.*) https://{{ gerrit_host }}/$1 [L,R]
-
DefineExternalGroup linaro-groups pipe /usr/local/bin/grpcheck.cgi
-
- <FilesMatch "\.(jpeg|css|html|htm|png|js)$">
- Satisfy any
- </FilesMatch>
-
- <Files "robots.txt">
- Satisfy any
- </Files>
-
<Location "/">
AuthType Basic
@@ -119,8 +65,5 @@ LDAPOpCacheTTL 36000
Require all granted
</Proxy>
AllowEncodedSlashes On
-
- ProxyPass /robots.txt !
- ProxyPass /errors !
- ProxyPass / http://127.0.0.1:8081/ nocanon
+ ProxyPass / http://127.0.0.1:8080/ nocanon
</VirtualHost>