diff --git a/puppet/modules/colab/templates/nginx/extra_conf.erb b/puppet/modules/colab/templates/nginx/extra_conf.erb deleted file mode 100644 index 1827a22..0000000 --- a/puppet/modules/colab/templates/nginx/extra_conf.erb +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index fbd7383..0000000 --- a/puppet/modules/colab/templates/nginx/site_default.erb +++ /dev/null @@ -1,58 +0,0 @@ -upstream django { - server 127.0.0.1:8000; -} - -server { - listen 80 default_server; - server_name _; - return 444; -} - -server { - listen 80; - - root /; - server_name colab.interlegis.leg.br colab01a.interlegis.leg.br colab01b.interlegis.leg.br colab.interlegis.gov.br colab-demo.tracy.com.br localhost; - - 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_set_header X-Forwarded-Protocol https; - proxy_pass http://django; - access_log /var/log/nginx/proxy-access.log proxy; - } - - location /http-bind { - proxy_pass http://127.0.0.1:5280; - } - - location /chrome { - proxy_pass http://10.1.2.81; - } - - location /raw-attachment { - proxy_pass http://10.1.2.81; - } - - location /ci/static { - proxy_pass http://10.1.2.171:8080; - } - - location /ci/adjuncts { - proxy_pass http://10.1.2.171:8080; - } - - location / { - try_files /home/colab/colab/www$uri @django; - } - - location /static { - try_files /home/colab/colab/www$uri @django; - } -} -- libgit2 0.21.2