From ccf686315522f422f4777c1285198839dd33226b Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Mon, 5 Aug 2013 08:56:51 -0300
Subject: [PATCH] Adding nginx configs for colab

---
 puppet/modules/colab/templates/nginx/extra_conf.erb   |  8 ++++++++
 puppet/modules/colab/templates/nginx/site_default.erb | 31 +++++++++++++++++++++++++++++++
 puppet/modules/nginx                                  |  1 +
 3 files changed, 40 insertions(+), 0 deletions(-)
 create mode 100644 puppet/modules/colab/templates/nginx/extra_conf.erb
 create mode 100644 puppet/modules/colab/templates/nginx/site_default.erb
 create mode 160000 puppet/modules/nginx

diff --git a/puppet/modules/colab/templates/nginx/extra_conf.erb b/puppet/modules/colab/templates/nginx/extra_conf.erb
new file mode 100644
index 0000000..1827a22
--- /dev/null
+++ b/puppet/modules/colab/templates/nginx/extra_conf.erb
@@ -0,0 +1,8 @@
+add_header Vary Accept-Encoding;
+add_header Cache-control public;
+
+log_format proxy '$remote_addr $http_x_forwarded_for '
+                 '$remote_user [$time_local] "$request" '
+                 '$upstream_status "$http_referer" '
+                 'response_time: $upstream_response_time '
+                 'cache_status: $upstream_cache_status';
\ No newline at end of file
diff --git a/puppet/modules/colab/templates/nginx/site_default.erb b/puppet/modules/colab/templates/nginx/site_default.erb
new file mode 100644
index 0000000..a2d06f6
--- /dev/null
+++ b/puppet/modules/colab/templates/nginx/site_default.erb
@@ -0,0 +1,31 @@
+upstream django {
+    server 127.0.0.1:8000;
+}
+
+server {
+    listen 80 default_server;
+
+    root /;
+    server_name localhost colab.interlegis.leg.br colab.interlegis.gov.br;
+    
+    location @django {
+        proxy_hide_header Vary;
+        proxy_read_timeout 300s;
+        proxy_connect_timeout 300s;
+        proxy_pass_header Server;
+        proxy_set_header Host $http_host;
+        proxy_redirect off;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Scheme $scheme;
+        proxy_pass http://django;
+        access_log /var/log/nginx/proxy-access.log proxy;
+    }
+
+    location / {
+        try_files /home/colab/colab/www$uri @django;
+    }
+    
+    location /static {
+      try_files /home/colab/colab/www$uri @django;
+    }
+}
\ No newline at end of file
diff --git a/puppet/modules/nginx b/puppet/modules/nginx
new file mode 160000
index 0000000..154e8cb
--- /dev/null
+++ b/puppet/modules/nginx
@@ -0,0 +1 @@
+Subproject commit 154e8cb9f34495e10d107c77bce7b44187d8ce1a
--
libgit2 0.21.2