subspace 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97810da82feed7d91e5e2e6c4bceab27812c3217
-  data.tar.gz: 389446d27e1246762e691ca5582879577a4218a9
+  metadata.gz: 4e35039968f4f4c30192435228ac3e8318c05b64
+  data.tar.gz: 83c7e2fce5c595d4176ee05b4ff599266204d60a
 SHA512:
-  metadata.gz: 88dc66c1cfe739d3d6cc2ff7049fa74dac314d8af1f2e2599ec576c70d075189d63b07be321e9c6a013873263dd85750fa1daed33a82a36b7752c7af1dfe7e9d
-  data.tar.gz: bc0e6a036626de95bc4519890e562a499732780581f7cf73dddac58f8601be84b0eed8b8d93b3e0f8ea8e50ef0b993111670fc886f9b9ae9dc965e5add2e71b2
+  metadata.gz: 0e45bb40c5d7fa5efa67bc499b14b9ed0492f1f2850e9a15ed59ad06d119e417712736084b97f031e095c63c6f0b811664979edef6040be5998d835f9e8eb2a6
+  data.tar.gz: 5f934dff61c1f5c05147f4b191d5c7429e75ae3eecb2ed17fb0af2666f67ce5901b8da6dfdbef595f1b90e4f3263c16bbb1410bbbfab074885b312f4f50b9c1a

data/README.md

@@ -135,13 +135,23 @@ Aside from basic statistics like free memory, disk, load averages, etc, we have
 
 ## delayed_job
 
-Install monitoring and automatic startup for delayed job workers via monit. You MUST set the job queues as follows:
+Install monitoring and automatic startup for delayed job workers via monit. You MUST set the `job_queues` variable as follows:
 
     job_queues:
       - default
       - mailers
       - exports
 
+If you want to have multiple workers for a single queue, just add the queue name
+multiple times:
+
+    job_queues:
+      - default
+      - mailers
+      - exports
+      - exports
+      - exports
+
 Please note that by default, delayed job does not set a queue (eg it uses the "null" queue). You MUST also add an initializer to your rails app where you set the default queue name to "default" (or some other queue).  Otherwise, the named queue workers managed by this role will not process the "null" queue.
 
     # config/initializers/delayed_job.rb
@@ -284,7 +294,13 @@ Contains the template files that get copied over when `subspace init` is ran.
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version:
+
+  1. update the version number in `version.rb`
+  2. update the version number in motds
+  3. run `bundle exec rake release`
+
+This will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/ansible/roles/common/templates/motd

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

data/ansible/roles/delayed_job/templates/delayed-job-monit-rc

@@ -9,8 +9,9 @@
 #   include /var/www/apps/{app_name}/shared/delayed_job.monitrc
 
 {% for queue in job_queues %}
-check process delayed_job_{{queue}}
-  with pidfile /u/apps/{{project_name}}/shared/tmp/pids/delayed_job.{{queue}}.pid
-  start program = "/bin/su - deploy -c 'cd /u/apps/{{project_name}}/current; RAILS_ENV={{rails_env}} bundle exec {{delayed_job_command}} --identifier={{queue}} --queue={{queue}} start'"
-  stop program  = "/bin/su - deploy -c 'cd /u/apps/{{project_name}}/current; RAILS_ENV={{rails_env}} bundle exec {{delayed_job_command}} --identifier={{queue}} --queue={{queue}} stop'"
+check process delayed_job_{{queue}}{{loop.index}}
+  with pidfile /u/apps/{{project_name}}/shared/tmp/pids/delayed_job.{{queue}}{{loop.index}}.pid
+  start program = "/bin/su - deploy -c 'cd /u/apps/{{project_name}}/current; RAILS_ENV={{rails_env}} bundle exec {{delayed_job_command}} --identifier={{queue}}{{loop.index}} --queue={{queue}} start'"
+  stop program  = "/bin/su - deploy -c 'cd /u/apps/{{project_name}}/current; RAILS_ENV={{rails_env}} bundle exec {{delayed_job_command}} --identifier={{queue}}{{loop.index}} --queue={{queue}} stop'"
+  group delayed_job
 {% endfor %}

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

@@ -0,0 +1,11 @@
+set $cors "";
+
+if ($http_origin ~* (.*\.{{asset_cors_domain}})) {
+    set $cors "true";
+}
+
+location /assets {
+  if ($cors = "true") {
+    add_header 'Access-Control-Allow-Origin' "$http_origin";
+  }
+}

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

@@ -4,9 +4,8 @@ try_files $uri/index.html $uri @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 X-Forwarded-Proto $scheme;
-    # pass the upgrade headers so websockets work
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";
     proxy_redirect off;

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

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

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

@@ -5,5 +5,10 @@ server {
     server_name {{server_name}} {{server_aliases | join(" ")}};
 
     {% include "_rails.conf" %}
+
+    {% if asset_cors_domain is defined %}
+    {% include "_asset_cors.conf" %}
+    {% endif %}
+
 }
 

data/ansible/roles/zenoamaro.postgresql/templates/postgresql.conf

@@ -51,7 +51,9 @@ bonjour_name = '{{postgresql_bonjour_name}}' # defaults to the computer name
 authentication_timeout  = {{postgresql_authentication_timeout}}
 ssl                     = {{'on' if postgresql_ssl else 'off'}}
 ssl_ciphers             = '{{postgresql_ssl_ciphers|join(':')}}'
+{% if postgresql_version < 9.5 %}
 ssl_renegotiation_limit = {{postgresql_ssl_renegotiation_limit}}
+{% endif %}
 ssl_cert_file           = '{{postgresql_ssl_cert_file}}'
 ssl_key_file            = '{{postgresql_ssl_key_file}}'
 ssl_ca_file             = '{{postgresql_ssl_ca_file}}'
@@ -152,7 +154,9 @@ wal_writer_delay = {{postgresql_wal_writer_delay}} # 1-10000 milliseconds
 commit_delay     = {{postgresql_commit_delay}} # range 0-100000, in microseconds
 commit_siblings  = {{postgresql_commit_siblings}} # range 1-1000
 
+{% if postgresql_version < 9.5 %}
 checkpoint_segments          = {{postgresql_checkpoint_segments}} # in logfile segments, min 1, 16MB each
+{% endif %}
 checkpoint_timeout           = {{postgresql_checkpoint_timeout}} # range 30s-1h
 checkpoint_completion_target = {{postgresql_checkpoint_completion_target}} # checkpoint target duration, 0.0 - 1.0
 checkpoint_warning           = {{postgresql_checkpoint_warning}} # 0 disables

data/lib/subspace/commands/ssh.rb

@@ -14,8 +14,9 @@ class Subspace::Commands::Ssh < Subspace::Commands::Base
       return
     end
     host_vars = YAML.load_file("config/provision/host_vars/#{@host}")
-    user = @user || host_vars["ansible_ssh_user"]
-    cmd = "ssh #{user}@#{host_vars["ansible_ssh_host"]}"
+    user = @user || host_vars["ansible_ssh_user"] || host_vars["ansible_user"]
+    host = host_vars["ansible_ssh_host"] || host_vars["ansible_host"]
+    cmd = "ssh #{user}@#{host}"
     say cmd
     exec cmd
   end

data/lib/subspace/version.rb

@@ -1,3 +1,3 @@
 module Subspace
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subspace
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,6 +167,7 @@ files:
 - ansible/roles/newrelic/tasks/main.yml
 - ansible/roles/nginx-rails/defaults/main.yml
 - ansible/roles/nginx-rails/tasks/main.yml
+- ansible/roles/nginx-rails/templates/_asset_cors.conf
 - ansible/roles/nginx-rails/templates/_rails.conf
 - ansible/roles/nginx-rails/templates/_upstream.conf
 - ansible/roles/nginx-rails/templates/nginx-project
@@ -288,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ansible-based server provisioning for rails projects