Merge branch 'grunt-js-folder' of https://github.com/coreos-inc/quay into ackbar

conf/hosted-http-base.conf

@@ -1,3 +1,5 @@
+# vim: ft=nginx
+
 server {
     listen 80 default_server;
     server_name _;

conf/http-base.conf

@@ -1,3 +1,5 @@
+# vim: ft=nginx
+
 types_hash_max_size 2048;
 include /usr/local/nginx/conf/mime.types.default;
 
@@ -30,4 +32,4 @@ upstream build_manager_controller_server {
 
 upstream build_manager_websocket_server {
     server localhost:8787;
-}
+}

conf/nginx-nossl.conf

@@ -1,8 +1,12 @@
+# vim: ft=nginx
+
 include root-base.conf;
 
 http {
     include http-base.conf;
 
+    include rate-limiting.conf;
+
     server {
         include server-base.conf;
 

conf/nginx.conf

@@ -1,3 +1,5 @@
+# vim: ft=nginx
+
 include root-base.conf;
 
 http {
@@ -5,6 +7,8 @@ http {
 
     include hosted-http-base.conf;
 
+    include rate-limiting.conf;
+
     server {
         include server-base.conf;
 

conf/rate-limiting.conf

@@ -0,0 +1,6 @@
+# vim: ft=nginx
+
+limit_req_zone $binary_remote_addr zone=webapp:10m rate=10r/s;
+limit_req_zone $binary_remote_addr zone=api:10m rate=1r/s;
+limit_req_status 429;
+limit_req_log_level warn;

conf/root-base.conf

@@ -1,3 +1,5 @@
+# vim: ft=nginx
+
 pid /tmp/nginx.pid;
 error_log /var/log/nginx/nginx.error.log;
 

conf/server-base.conf

@@ -1,3 +1,5 @@
+# vim: ft=nginx
+
 client_body_temp_path /var/log/nginx/client_body 1 2;
 server_name _;
 
@@ -19,6 +21,8 @@ proxy_set_header Transfer-Encoding $http_transfer_encoding;
 
 location / {
     proxy_pass   http://web_app_server;
+
+    #limit_req zone=webapp burst=10 nodelay;
 }
 
 location /realtime {
@@ -37,6 +41,8 @@ location /v1/ {
     proxy_temp_path /var/log/nginx/proxy_temp 1 2;
 
     client_max_body_size 20G;
+
+    #limit_req zone=api burst=5 nodelay;
 }
 
 location /c1/ {
@@ -47,6 +53,8 @@ location /c1/ {
     proxy_pass   http://verbs_app_server;
     proxy_read_timeout 2000;
     proxy_temp_path /var/log/nginx/proxy_temp 1 2;
+
+    #limit_req zone=api burst=5 nodelay;
 }
 
 location /static/ {