subspace 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16fdeb6665189ad86b0afed09a135d46d09ab3ce3a7fb50965d4aa739cc18fc6
-  data.tar.gz: 28bc69bf843488eeb522f7eda442acd82c7c6c42deeb3ee235488d0d89f2a37f
+  metadata.gz: c0e42019d70233576032d1c5d3213507c81dd80e1915ddba0ec58f25cff414c6
+  data.tar.gz: 63a927ef5899ad64f6b8bd268705bab328082f6ebd7ee8c5a9b087e51fe2275b
 SHA512:
-  metadata.gz: 2faf2f488e2db5b407ee49e70195ab9989cdb4ebdc58cb02082eba0d36105db900f8af5a1fb5337832ca4d1db99c887baa993bc4e02a02eef343e8465a1e3e46
-  data.tar.gz: 56207ff0a0483b70baf34bbe7f131be492c8f9bf730a2d1da378ad543da782ef54221902864e3f494cfb4b2ba6c3bbbfe9951db0420491ceedc0212bac22b692
+  metadata.gz: 2ab07d182cb0454831ffc2ab02549859779b95dc013aff308ed592ab1117feca26d0128d3e08e387c1649f5f90924c58648fb46ec7a5697404c52eb0e880052a
+  data.tar.gz: 1ce04e587f1313a9dc62f79405ac28ad63490a506054f12e990cfa6f2a4e464100482a1e18d921888a6d5cb62a89c51d083b568fa882d7265bf24b98a1777290

data/README.md

@@ -63,7 +63,8 @@ e.g. To run only the alienvault tasks (all of which have been tagged with the
 Role       | Tags                      | Comment
 ---------- | ----                      | -------
 alienvault | alienvault                | All tasks in the alienvault role have been tagged 'alienvault'
-common     | upgrade, authorized\_keys | upgrade runs apt-get update and apt-get upgrade; authorized\_keys updates the authorized\_keys file for the deploy user
+common     | upgrade                   | runs apt-get update and apt-get upgrade
+common     | authorized\_keys          | updates the authorized\_keys file for the deploy user
 rails      | appyml                    |
 monit      | monit                     | All tasks in the monit role have been tagged 'monit'
 
@@ -98,7 +99,7 @@ Further, you can use the extremely command to create a local copy of `config/app
     # Create a local copy of config/application.yml with the secrets encrypted in vars/development.yml
     $ subspace vars development --create
 
-This can get you up and running in development securely, the only thing you need to distribute to new team members is the vault password.
+This can get you up and running in development securely, the only thing you need to distribute to new team members is the vault password.  Grab it from a teammate and put it into `config/provision/.vault_pass`
 
 NOTE: application.yml should be in the `.gitignore`, since subspace creates a new version on the server and symlinks it on top of whatever is checked in.
 
@@ -275,6 +276,8 @@ Optional variables:
 
     nginx_proxy_read_timeout: Set [proxy_read_timeout](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_read_timeout). This is in seconds. You probably only want to change this if using rack-timeout (although I may be wrong). If using rack-timeout, it should be slightly higher than the rack-timeout timeout. I'm doing 5 seconds higher, but that was arbitrarily chosen.
 
+    ssl_force_redirect: redirect all HTTP traffic to HTTPS on the same host.  Defaults to true and only applies if ssl_enabled is also true.
+
 ## nodejs
 
 Used to install recent version of NodeJS. Must set `nodejs_version`. e.g. `nodejs_version: "8.x"`
@@ -393,4 +396,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/tenfor
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
 # Roles and Variables
-

data/ansible/roles/collectd/templates/delayed_job_postgres.conf

@@ -1,11 +1,12 @@
 LoadPlugin postgresql
 <Plugin postgresql>
   <Query dj_count>
-    Statement "SELECT count(*) as count FROM delayed_jobs"
+    Statement "SELECT count(*) as count, queue FROM delayed_jobs GROUP BY queue"
     <Result>
       Type gauge
       InstancePrefix "dj_count"
-      ValuesFrom count
+      InstancesFrom "queue"
+      ValuesFrom "count"
     </Result>
   </Query>
 

data/ansible/roles/nginx/tasks/main.yml

@@ -9,7 +9,7 @@
   become: true
 
 - name: "Configure rails projects"
-  include_role:
+  import_role:
     name: nginx-rails
 
 - name: create nginx status config

data/ansible/roles/nginx-rails/defaults/main.yml

@@ -1,2 +1,3 @@
 ---
   client_max_body_size: 4G
+  ssl_force_redirect: true

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

@@ -5,7 +5,12 @@ server {
   listen 80 default_server;
   listen [::]:80 default_server;
   server_name {{server_name}} {{server_aliases | join(" ")}};
+
+  {% if ssl_force_redirect == "true" %}
   return 301 https://$host$request_uri;
+  {% else %}
+  {% include "_rails.conf" %}
+  {% endif %}
 }
 
 server {

data/lib/subspace/version.rb

@@ -1,3 +1,3 @@
 module Subspace
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subspace
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2019-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -298,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Ansible-based server provisioning for rails projects