add nginx stub_status for internal network, fall back to localhost

pypi · Nov 28, 2013 · a932bad · a932bad
1 parent 4b3ebf2
commit a932bad
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...g/salt/roots/salt/nginx/config/nginx.conf → .../roots/salt/nginx/config/nginx.conf.jinja b/...g/salt/roots/salt/nginx/config/nginx.conf → .../roots/salt/nginx/config/nginx.conf.jinja
@@ -22,4 +22,13 @@ http {
 
     include /etc/nginx/conf.d/*.conf;
 
+    server {
+        listen 80 default;
+        location /nginx_status {
+            stub_status on;
+            access_log off;
+            allow {{ salt['pillar.get']('pypi_internal_network', '127.0.0.1') }};
+            deny all;
+        }
+    }
 }
diff --git a/provisioning/salt/roots/salt/nginx/init.sls b/provisioning/salt/roots/salt/nginx/init.sls
@@ -26,7 +26,8 @@ nginx:
 
 /etc/nginx/nginx.conf:
   file.managed:
-    - source: salt://nginx/config/nginx.conf
+    - source: salt://nginx/config/nginx.conf.jinja
+    - template: jinja
     - user: root
     - group: root
     - mode: 644