subspace 0.4.11 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4233f9ea5bf7ba7bde4e47d04327fd2551af7a6
-  data.tar.gz: ec62afca667788e4a95c6c855f8a6e34b64e6cd0
+  metadata.gz: e871a91295786359532725b3d6bdc522698368c0
+  data.tar.gz: 448e4c04278d8338fd0994f8c813e260edeccdf2
 SHA512:
-  metadata.gz: c5bd1ad8486199a50244edda4a9830af81d91fb6b6c01791948918976c27ed1f2cf686941d90d2664d6f99cf7384cad120598f38e3b270918155181ef137cffd
-  data.tar.gz: 613d808a2a064affe9c075d01182f44ccc2ffd4f6101b9ce017bde618b41a8d008eb9b977fdbeaaf8b7bfc46801cc17568069f59f8d29fb966396ed88d1c314d
+  metadata.gz: f200b1a04f5ed3454109d09d4e17e68a33f984f4b874c5fb2ebc6309d07c230ee4cf67eb7ca6002f53910d51939cedaf9386bfcf73eb48266b137c7d33b9907d
+  data.tar.gz: f5417afbf761ca16b6095da766881dcfedf5d024c0d5a3b6ce7a119dcad5761dd6f0e8a937245f9dea9969f7cfe88b2f3d646f869427ded0d538ecde1c8225f8

data/.ruby-version

@@ -1 +1 @@
-2.2.5
+2.4.2

data/README.md

@@ -258,6 +258,13 @@ Customize:
 
 ## redis
 
+Installs redis on the server.
+
+    # Change to * if you want tthis available everywhere.
+    redis_bind: 127.0.0.1
+
+
+
 ## ruby-common
 
 Installs ruby on the machine.  YOu can set a version by picking off the download url and sha hash from ruby-lang.org
@@ -269,6 +276,16 @@ Installs ruby on the machine.  YOu can set a version by picking off the download
 
 ## sidekiq
 
+This will install a monit script that keeps sidekiq running.  We spawn one sidekiq instance that manages as many queues as you need.  Varaibles of note:
+
+    job_queues:
+      - default
+      - mailers
+
+* Note that as of v0.4.13, we now also add a unique job queue for each host with its hostname.  This is handy if you need to assign a job to a specific host.  In general you should use named queues, but occasionally this is useful and there's no harm in having it there unused.
+
+Sidekiq uses redis by default, and rails connects to a redis running on localhost by default.  However, this role does not depend on redis since in production it's likely redis will be running elsewhere.  If you're provisioning a standalone server, make sure to include the redis role.
+
 
 ## Other Internal Roles
 

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

@@ -43,12 +43,12 @@
     template:
       src: server_status.conf
       dest: /etc/apache2/conf-available/server_status.conf
-    sudo: true
+    become: true
 
   - name: enable server-status conf
     file:
       src: /etc/apache2/conf-available/server_status.conf
       dest: /etc/apache2/conf-enabled/server_status.conf
       state: link
-    sudo: true
+    become: true
     notify: apache restart

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

@@ -45,7 +45,7 @@
     template:
       src: apache2.conf
       dest: /etc/collectd/collectd.conf.d/apache2.conf
-    sudo: true
+    become: true
     notify: restart collectd
     when: "'apache' in role_names"
 
@@ -53,7 +53,7 @@
     template:
       src: puma-process.conf
       dest: /etc/collectd/collectd.conf.d/puma-process.conf
-    sudo: true
+    become: true
     notify: restart collectd
     when: puma_installed is defined
 
@@ -61,14 +61,14 @@
     template:
       src: nodejs-process.conf
       dest: /etc/collectd/collectd.conf.d/nodejs-process.conf
-    sudo: true
+    become: true
     notify: restart collectd
 
   - name: create nginx config
     template:
       src: nginx.conf
       dest: /etc/collectd/collectd.conf.d/nginx.conf
-    sudo: true
+    become: true
     notify: restart collectd
     when: "'nginx' in role_names"
 
@@ -76,7 +76,7 @@
     template:
       src: rails_lograge.conf
       dest: /etc/collectd/collectd.conf.d/rails_lograge.conf
-    sudo: true
+    become: true
     notify: restart collectd
     when: rails_lograge is defined
 

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

@@ -91,4 +91,4 @@
       state: directory
     become: true
 
-  - include: swap.yml
+  - import_tasks: swap.yml

data/ansible/roles/delayed_job/handlers/main.yml

@@ -1,4 +1,4 @@
 ---
   - name: monit reload
     command: monit reload
-    sudo: true
+    become: true

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

@@ -5,17 +5,17 @@
     template:
       src: delayed-job-monit-rc
       dest: /etc/monit/conf.d/delayed_job_{{project_name}}_{{rails_env}}
-    sudo: true
+    become: true
     notify: reload_monit
 
   - name: Remove old upstart files
     file:
       path: /etc/init/delayed-job.conf
       state: absent
-    sudo: true
+    become: true
 
   - name: Remove old monit files
     file:
       path: /etc/monit/conf.d/delayed_job
       state: absent
-    sudo: true
+    become: true

data/ansible/roles/mtpereira.passenger/tasks/main.yml

@@ -1,8 +1,8 @@
 ---
-- include: apt.yml
+- import_tasks: apt.yml
   tags: passenger_apt
-- include: pkg.yml
+- import_tasks: pkg.yml
   tags: passenger_pkg
-- include: service.yml
+- import_tasks: service.yml
   tags: passenger_service
   when: passenger_webserver != "standalone"

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

@@ -16,7 +16,16 @@
 - name: Install puma monit script
   template:
     src: puma-monit-rc
-    dest: /etc/monit/conf.d/puma_{{project_name}}_{{rails_env}}
-  sudo: true
-  notify: restart_monit
+    dest: /etc/monit/conf-available/puma_{{project_name}}_{{rails_env}}
+
+- name: Clean up old puma monit scripts
+  shell: rm -f /etc/monit/conf.d/puma_*
+
+- name: Enable puma monit script
+  file:
+    src: /etc/monit/conf-available/puma_{{project_name}}_{{rails_env}}
+    dest: /etc/monit/conf-enabled/puma_{{project_name}}_{{rails_env}}
+    state: link
+  notify:
+    - restart_monit
 

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

@@ -1,4 +1,14 @@
 ---
+  - name: Add yarn apt key
+    apt_key:
+      url: https://dl.yarnpkg.com/debian/pubkey.gpg
+      state: present
+
+  - name: Add yarn apt repo
+    apt_repository:
+      repo: deb https://dl.yarnpkg.com/debian/ stable main
+      state: present
+
   - name: Install rails apt dependencies
     apt:
       name: "{{item}}"
@@ -12,6 +22,7 @@
       - libxslt-dev
       - nodejs
       - zlib1g-dev
+      - yarn
     become: true
 
   - name: Create /u/apps/{{project_name}}/shared/config

data/ansible/roles/sidekiq/defaults/main.yml

@@ -0,0 +1,2 @@
+---
+  sidekiq_concurrency: 5

data/ansible/roles/sidekiq/meta/main.yml

@@ -1,8 +1,5 @@
 ---
   dependencies:
-    - {
-      role: redis
-    }
     - {
       role: monit
     }

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

@@ -2,6 +2,17 @@
   - name: Install sidekiq monit script
     template:
       src: sidekiq-monit-rc
-      dest: /etc/monit/conf.d/sidekiq_{{project_name}}_{{rails_env}}
-    sudo: true
-    notify: validate_monit
+      dest: /etc/monit/conf-available/sidekiq_{{project_name}}_{{rails_env}}
+    become: true
+
+  - name: Clean up old sidekiq monit scripts
+    shell: rm -f /etc/monit/conf.d/sidekiq_*
+
+  - name: Enable sidekiq monit script
+    file:
+      src: /etc/monit/conf-available/sidekiq_{{project_name}}_{{rails_env}}
+      dest: /etc/monit/conf-enabled/sidekiq_{{project_name}}_{{rails_env}}
+      state: link
+    notify:
+      - restart_monit
+

data/ansible/roles/sidekiq/templates/sidekiq-monit-rc

@@ -1,6 +1,4 @@
-{% for queue in job_queues %}
-check process sidekiq_{{queue}}
-  with pidfile /u/apps/{{project_name}}/shared/tmp/pids/sidekiq.{{queue}}.pid
-  start program = "/bin/su - deploy -c 'cd /u/apps/{{project_name}}/current && bundle exec sidekiq --queue {{queue}} --pidfile /u/apps/{{project_name}}/shared/tmp/pids/sidekiq.{{queue}}.pid --environment {{rails_env}} --logfile /u/apps/{{project_name}}/shared/log/sidekiq.{{queue}}.log --daemon'" with timeout 30 seconds
-  stop program = "/bin/su - deploy -c 'kill -s TERM `cat /u/apps/{{project_name}}/shared/tmp/pids/sidekiq.{{queue}}.pid`'" with timeout 30 seconds
-{% endfor %}
+check process sidekiq
+  with pidfile /u/apps/{{project_name}}/shared/tmp/pids/sidekiq.pid
+  start program = "/bin/su - deploy -c 'cd /u/apps/{{project_name}}/current && bundle exec sidekiq --queue {{hostname}} {{ job_queues | map('regex_replace',  '^(.*)$', '--queue \\1') | join(' ') }} --pidfile /u/apps/{{project_name}}/shared/tmp/pids/sidekiq.pid --environment {{rails_env}} --logfile /u/apps/{{project_name}}/shared/log/sidekiq.log --daemon'" with timeout 30 seconds
+  stop program = "/bin/su - deploy -c 'kill -s TERM `cat /u/apps/{{project_name}}/shared/tmp/pids/sidekiq.pid`'" with timeout 30 seconds

data/lib/subspace/version.rb

@@ -1,3 +1,3 @@
 module Subspace
-  VERSION = "0.4.11"
+  VERSION = "0.4.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subspace
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.13
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -219,6 +219,7 @@ files:
 - ansible/roles/ruby-common/templates/ruby-gc-wrapper.j2
 - ansible/roles/ruby-common/vars/main.yml
 - ansible/roles/sidekiq/README.md
+- ansible/roles/sidekiq/defaults/main.yml
 - ansible/roles/sidekiq/meta/main.yml
 - ansible/roles/sidekiq/tasks/main.yml
 - ansible/roles/sidekiq/templates/sidekiq-monit-rc
@@ -292,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Ansible-based server provisioning for rails projects