reorg

srv/salt/nginx/init.sls

@@ -1,9 +0,0 @@
-nginx:
-  pkg:
-    - installed
-  service:
-    - running
-    - enable: True
-    - reload: True
-    - require:
-      - pkg: nginx

srv/salt/nginx/nginx.conf

@@ -1,70 +0,0 @@
-{% from 'config.sls' import root %}
-gzip_proxied any;
-gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
-
-upstream web {
-  fair;
-  server 127.0.0.1:10000;
-}
-
-server {
-  listen 80;
-
-  # Allow file uploads
-  client_max_body_size 50M;
-
-  location ^~ /static/ {
-    root {{ root }};
-    expires max;
-  }
-
-  location = /favicon.ico {
-    rewrite (.*) /static/favicon.ico;
-  }
-
-  location = /robots.txt {
-    rewrite (.*) /static/robots.txt;
-  }
-
-  location / {
-      proxy_pass_header Server;
-      proxy_redirect off;
-      proxy_buffering off;
-      proxy_set_header X-Real-IP $remote_addr;
-      proxy_set_header X-Scheme $scheme;
-      proxy_set_header Host $http_host;
-      proxy_pass http://web;
-    error_page 502 = /maintenance.html;
-  }
-
-  location /maintenance.html {
-    root {{ root }}/templates/;
-    add_header Cache-Control private;
-    expires epoch;
-  }
-}
-
-{% if ssl_certificate %}
-server {
-  listen 443;
-  ssl on;
-  ssl_certificate {{ ssl_certificate }};
-  ssl_certificate_key {{ ssl_certificate_key }};
-
-  location ^~ /static/ {
-    root {{ root }};
-    expires max;
-  }
-
-  location / {
-    proxy_pass_header Server;
-    proxy_redirect off;
-    proxy_buffering off;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Scheme $scheme;
-    proxy_set_header Host $http_host;
-    proxy_pass http://web;
-    error_page 502 = /maintenance.html;
-  }
-}
-{% endif %}