ansible/roles/nginx-rails/templates/_rails.conf in subspace-0.4.8 vs ansible/roles/nginx-rails/templates/_rails.conf in subspace-0.4.9

- old
+ new

@@ -1,23 +1,30 @@ -root /u/apps/{{project_name}}/current/public; -try_files $uri/index.html $uri @app; + root /u/apps/{{project_name}}/current/public; + try_files $uri/index.html $uri @app; -location @app { + location @app { proxy_pass http://app; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $app_proto; proxy_set_header Host $http_host; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; proxy_redirect off; -} + } -location /cable { + location /cable { proxy_pass http://app; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; -} + } -error_page 500 502 503 504 /500.html; -client_max_body_size {{client_max_body_size}}; -keepalive_timeout 10; + {% if asset_cors_allow_origin is defined %} + location /assets { + add_header 'Access-Control-Allow-Origin' "{{asset_cors_allow_origin}}"; + } + {% endif %} + + error_page 500 502 503 504 /500.html; + client_max_body_size {{client_max_body_size}}; + keepalive_timeout 10; +