From 53e9e514d598e80ab4e3e32103f4e1232c1b19e0 Mon Sep 17 00:00:00 2001
From: Jimmy Zelinskie <jimmy.zelinskie@coreos.com>
Date: Tue, 13 Jan 2015 15:19:42 -0500
Subject: [PATCH] Add vim nginx ft to nginx config files

---
 conf/hosted-http-base.conf | 2 ++
 conf/http-base.conf        | 4 +++-
 conf/nginx-nossl.conf      | 2 ++
 conf/nginx.conf            | 4 ++++
 conf/root-base.conf        | 2 ++
 conf/server-base.conf      | 2 ++
 6 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/conf/hosted-http-base.conf b/conf/hosted-http-base.conf
index c3e910e8f..fa5994e6f 100644
--- a/conf/hosted-http-base.conf
+++ b/conf/hosted-http-base.conf
@@ -1,3 +1,5 @@
+# vim: ft=nginx
+
 server {
     listen 80 default_server;
     server_name _;
diff --git a/conf/http-base.conf b/conf/http-base.conf
index 1eb0b6170..d525b3dd3 100644
--- a/conf/http-base.conf
+++ b/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;
-}
\ No newline at end of file
+}
diff --git a/conf/nginx-nossl.conf b/conf/nginx-nossl.conf
index cc985906a..f980ba7a9 100644
--- a/conf/nginx-nossl.conf
+++ b/conf/nginx-nossl.conf
@@ -1,3 +1,5 @@
+# vim: ft=nginx
+
 include root-base.conf;
 
 http {
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 01d554ae2..234839e53 100644
--- a/conf/nginx.conf
+++ b/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;
 
diff --git a/conf/root-base.conf b/conf/root-base.conf
index dc8685c34..02c004564 100644
--- a/conf/root-base.conf
+++ b/conf/root-base.conf
@@ -1,3 +1,5 @@
+# vim: ft=nginx
+
 pid /tmp/nginx.pid;
 error_log /var/log/nginx/nginx.error.log;
 
diff --git a/conf/server-base.conf b/conf/server-base.conf
index 5b06b76c5..d5b211c52 100644
--- a/conf/server-base.conf
+++ b/conf/server-base.conf
@@ -1,3 +1,5 @@
+# vim: ft=nginx
+
 client_body_temp_path /var/log/nginx/client_body 1 2;
 server_name _;