aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilo Casagrande <milo.casagrande@linaro.org>2015-05-13 10:18:31 +0200
committerMilo Casagrande <milo.casagrande@linaro.org>2015-05-13 10:18:31 +0200
commita7fe94335ef0422633eab06d426d760f9b1eb26d (patch)
treecc81cffc9573a372ac882793d56476fa38659149
parentb9865561e0a6c6e3108f2905c4091a4bdf22ce4f (diff)
Revert "ansible: Fix nginx config."
This reverts commit b9865561e0a6c6e3108f2905c4091a4bdf22ce4f.
-rw-r--r--ansible/roles/configure-nginx/templates/backend-nginx.conf34
1 files changed, 17 insertions, 17 deletions
diff --git a/ansible/roles/configure-nginx/templates/backend-nginx.conf b/ansible/roles/configure-nginx/templates/backend-nginx.conf
index 3c62506..9504de4 100644
--- a/ansible/roles/configure-nginx/templates/backend-nginx.conf
+++ b/ansible/roles/configure-nginx/templates/backend-nginx.conf
@@ -27,11 +27,28 @@ server {
index index.html;
}
+ location /json-schema {
+ alias {{ web_root }}/{{ hostname }}/schema/;
+
+ fancyindex on;
+ fancyindex_exact_size off;
+
+ expires 15d;
+ add_header Pragma public;
+ add_header Cache-Control "public";
+ }
+
error_page 503 @maintenance;
location @maintenance {
rewrite ^(.*)$ /maintenance.html break;
}
+ location ~* \.(?:ico|css|js|gif|jpe?g|png|svg)$ {
+ expires 150d;
+ add_header Pragma public;
+ add_header Cache-Control "public";
+ }
+
location ~* /(?:(count|jobs?|defconfigs?|boots?|tokens?|batch|bisect|labs?|version|reports?|send|upload|tests?|trigger)(.*)(?!(\.(html?|json|css|js|png|jpe?g|ico|svg))))$ {
if (-f $document_root/maintenance.html) {
@@ -63,21 +80,4 @@ server {
proxy_read_timeout 9s;
proxy_pass http://backends;
}
-
- location /json-schema {
- alias {{ web_root }}/{{ hostname }}/schema/;
-
- fancyindex on;
- fancyindex_exact_size off;
-
- expires 15d;
- add_header Pragma public;
- add_header Cache-Control "public";
- }
-
- location ~* \.(?:ico|css|js|gif|jpe?g|png|svg)$ {
- expires 150d;
- add_header Pragma public;
- add_header Cache-Control "public";
- }
}