subspace 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b574b1c0a65bce5dfd90a01cce2d3c89ff4b4933
-  data.tar.gz: c11018b3833c970bef6ba8b825dcdbf0eb94700c
+  metadata.gz: 3c8133e94234ca95b79e12809a461336eda7563c
+  data.tar.gz: d5aee88949054a65d646228bc718c701fb7ed8e4
 SHA512:
-  metadata.gz: 362568ed4e4e8c419bb1ef24649b9e33785db6b8088b1f7e53647b62869cf9bce7f9744d951b4c9b4433571df675595c0772cb1e2bfc6a41e7d3c0aab21b27a2
-  data.tar.gz: c246daab8b753ba4597528a2d6e55467e14c6136ba5ff80410807e8bc5b8184a67e52d484b7e463b52b020663f6d0fe6ca79815b71d1b173782ca73bd2c31b2b
+  metadata.gz: 5cd807b72efcf4d3f076053de4cecb3593d5dcf35e51fb5319d3eb8468e6646f87b201f09e485b3c31fe88bc1b27970dc1084fb307c8c246b5683b13421a9de3
+  data.tar.gz: a7f444dff5c77db36896dbcb680b598a9dca678e0a9079759c5679c38c2b043c114864c8afce0490d3df7ebee23b40f82e49bedc5b97c49584bb1398db11c85b

data/README.md

@@ -207,7 +207,7 @@ Installs logrotate and lets you configure logs for automatic rotation.  Example
 
 ## nginx-rails
 
-Configurs nginx to look at localhost:9292 for the socket/backend connection.  If you need to do fancy stuff you should simply override this role
+Configures nginx to look at localhost:9292 for the socket/backend connection.  If you need to do fancy stuff you should simply override this role
 
     subspace override nginx-rails
 
@@ -215,6 +215,11 @@ defaults are here, we'll probably add more:
 
     client_max_body_size: 4G
 
+Optional variables:
+
+    asset_cors_allow_origin: Set this to set the Access-Control-Allow-Origin for
+    everything in /assets.
+
 ## papertrail
 
 ## passenger

data/ansible/roles/common/templates/motd

@@ -4,7 +4,7 @@ This server brought to you by:
 \___ \| | | | '_ \___ \| '_ \ / _` |/ __/ _ \
  ___) | |_| | |_) |__) | |_) | (_| | (_|  __/
 |____/ \__,_|_.__/____/| .__/ \__,_|\___\___|
-                       |_|             v0.4.8
+                       |_|             v0.4.9
 ~~~ https://github.com/tenforwardconsulting/subspace ~~~
 
 If you need to make configuration changes to the server, please modify the

data/ansible/roles/nginx-rails/templates/_asset_cors.conf

@@ -1,6 +1,6 @@
 set $cors "";
 
-if ($http_origin ~* (.*\.{{asset_cors_domain}})) {
+if ($http_origin ~* (.*{{asset_cors_domain}})) {
     set $cors "true";
 }
 

data/ansible/roles/nginx-rails/templates/_rails.conf

@@ -1,7 +1,7 @@
-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;
@@ -9,15 +9,22 @@ location @app {
     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";
-}
+  }
+
+  {% 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;
 
-error_page 500 502 503 504 /500.html;
-client_max_body_size {{client_max_body_size}};
-keepalive_timeout 10;

data/ansible/roles/nginx-rails/templates/_upstream.conf

@@ -1,6 +1,6 @@
 upstream app {
-    # Path to Puma socket
-    server localhost:9292;
+  # Path to Puma socket
+  server localhost:9292;
 }
 
 # Send either X-Forwarded for or the actual scheme to the upsteam
@@ -8,3 +8,4 @@ map $http_x_forwarded_proto $app_proto {
   default $http_x_forwarded_proto;
   ''      $scheme;
 }
+

data/ansible/roles/nginx-rails/templates/nginx-project

@@ -1,14 +1,9 @@
+#jinja2: lstrip_blocks: True
 {% include "_upstream.conf" %}
 
 server {
-    listen 80;
-    server_name {{server_name}} {{server_aliases | join(" ")}};
-
-    {% include "_rails.conf" %}
-
-    {% if asset_cors_domain is defined %}
-    {% include "_asset_cors.conf" %}
-    {% endif %}
+  listen 80;
+  server_name {{server_name}} {{server_aliases | join(" ")}};
 
+  {% include "_rails.conf" %}
 }
-

data/ansible/roles/nginx-rails/templates/nginx-project-ssl

@@ -1,3 +1,4 @@
+#jinja2: lstrip_blocks: True
 {% include "_upstream.conf" %}
 
 server {
@@ -12,7 +13,6 @@ server {
   server_name {{server_name}} {{server_aliases | join(" ")}};
 
   {% include "_rails.conf" %}
+
   {{nginx_ssl_config}}
 }
-
-

data/lib/subspace/version.rb

@@ -1,3 +1,3 @@
 module Subspace
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subspace
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler