taperole 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5016d666bbe3fbbbc52aec031ee02ea2ae60433e
-  data.tar.gz: b388a0c99b4f8f13e7ba4611d2624c03358bb460
+  metadata.gz: 381889ad9f30af9db293aa6ce5399f4978349b1c
+  data.tar.gz: e5f37142b7d22ac0529bc676b6686b1ff14d4f3d
 SHA512:
-  metadata.gz: e2a631378f974d3a66310aed8ed344dfd273eb720b1dd85c815099ba649f6b7125803e70a119197ca46bef21c322ad2b72adedaf6c9073401b0e139476c022d9
-  data.tar.gz: 48dc9509d3ea930189935328a01f0ad573e840ce5aa7014dcc26d61657e1802dab9d93ed53a7da141aab8fbb19a329bad6647d6d8d1837c7fa49f0478572ab08
+  metadata.gz: aba42bab23247d0624fc0b9d03d3bb2e89007129bdf8e05d687b0d0efee9a38996226e6856f02f10457a69927eeadb4cb175ae68ff335e3948883d1ee6150788
+  data.tar.gz: 04b19dd30374fe2323c2bd4fb198a9ef96fd634728b1e121623f8dbf26c0caac61c4ab284078a23f37d2e8ca054f19aee48078056a056a762feeec328574e36c

data/roles/backend_config/tasks/main.yml

@@ -7,7 +7,7 @@
   remote_user: "{{ deployer_user.name }}"
   command: chdir={{ be_app_path }}
            bash -lc "RAILS_ENV={{be_app_env}} bundle install
-             --without test development contests_development --deployment"
+             --without test development --deployment"
   tags: [be_deploy, bundle]
 
 - name: Ensure env_config.yml file present

data/roles/database_load/tasks/main.yml

@@ -10,12 +10,3 @@
   when: (app_checkout is defined and app_checkout.changed)
         or rake.force_migrate 
         or (db_reset is defined and db_reset.changed)
-
-- name: Seed DB
-  remote_user: "{{ deployer_user.name }}"
-  command: chdir={{ be_app_path }}
-           bash -lc "bundle exec rake db:seed RAILS_ENV={{be_app_env}}"
-  tags: [be_deploy,seed,db_reset]
-  when: (app_checkout is defined and app_checkout.changed)
-        or rake.force_seed
-        or (db_reset is defined and db_reset.changed)

data/roles/delayed_job/defaults/main.yml

@@ -1,2 +1 @@
----
-force_dj_runner_restart: false
+dj_runners: 2

data/roles/delayed_job/meta/main.yml

@@ -0,0 +1,3 @@
+---
+dependencies:
+  - role: zzet.rbenv

data/roles/delayed_job/tasks/main.yml

@@ -1,35 +1,24 @@
-- name: Install upstart job
-  template: src=dj_runner_upstart.j2
-            dest=/etc/init/dj_runner_{{app_name}}.conf
-  tags: [configure_dj_runner]
-  register: dj_runner_installation
-  when: enabled_delayed_job
+- name: Install DJ monit bin command
+  template: src=dj_monit_runner.j2
+            dest=/usr/bin/dj_monit_runner
+            mode=u=rwx,g=rwx,o=r
 
-- name: register unicorn upstart script
-  command: initctl reload-configuration
-  when: dj_runner_installation.changed and
-        enabled_delayed_job
-  tags: [configure_dj_runner]
+- name: Install DJ monit config
+  template: src=dj_monit_config.j2
+            dest=/etc/monit/conf.d/delayed_jobs
+            mode=u=rw,g=r,o=r
+  register: dj_monit_config
 
-- name: Give deployer user access to DJ upstart jobs
-  lineinfile: 'dest=/etc/sudoers
-               state=present
-               line="{{ deployer_user.name }} ALL = (root) NOPASSWD: /sbin/{{item}} dj_runner_{{app_name}}"'
-  with_items:
-    - start
-    - stop
-    - restart
-    - status
-    - reload
-  tags: [configure_dj_runner]
-  when: enabled_delayed_job
+- name: Reload Monit
+  command: bash -lc "monit reload"
+  when: dj_monit_config.changed
 
-- name: restart delayed job runner
-  sudo_upstart: name=dj_runner_{{app_name}} state=restarted
+- name: Restart Delayed Job
   remote_user: "{{ deployer_user.name }}"
-  when: force_dj_runner_restart or
-        (dj_runner_installation is defined and dj_runner_installation.changed) or
-        force_db_reset or
-        (app_checkout is defined and app_checkout.changed) and
-        enabled_delayed_job
-  tags: [configure_dj_runner, be_deploy, reset_db]
+  command: bash -lc "sudo monit stop delayed_job"
+  tags: [be_deploy]
+
+- name: Restart Delayed Job
+  remote_user: "{{ deployer_user.name }}"
+  command: bash -lc "sudo monit start delayed_job"
+  tags: [be_deploy]

data/roles/delayed_job/templates/dj_monit_config.j2

@@ -0,0 +1,6 @@
+check process delayed_job
+  with pidfile {{be_app_path}}/tmp/pids/delayed_job.pid
+    start program "/usr/bin/dj_monit_runner start {{dj_runners}}" as uid {{deployer_user.name}} and gid {{deployer_user.name}}
+    stop program "/usr/bin/dj_monit_runner stop" as uid {{deployer_user.name}} and gid {{deployer_user.name}}
+    if 5 restarts within 5 cycles then timeout
+    if totalmemory > 5 GB for 5 cycles then restart

data/roles/delayed_job/templates/dj_monit_runner.j2

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+USER={{deployer_user.name}}
+APP_PATH={{be_app_path}}
+PATH={{rbenv_root}}/bin:{{rbenv_root}}/shims:$PATH
+RAILS_ENV={{be_app_env}}
+
+cd $APP_PATH
+RAILS_ENV=$RAILS_ENV bin/delayed_job $1 -n $2

data/taperole.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = "taperole"
-  spec.version = '1.0.1'
+  spec.version = '1.1.0'
   spec.authors = ['Jack Forrest', 'Smashing Boxes', 'Brandon Mathis']
   spec.email = ['jack@smashingboxes.com', 'brandon@sbox.es']
   spec.summary = 'A tool for provisioning and deploying boxes for hosting Rails apps'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taperole
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jack Forrest
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -49,9 +49,10 @@ files:
 - roles/database_load/tasks/db_reset.yml
 - roles/database_load/tasks/main.yml
 - roles/delayed_job/defaults/main.yml
-- roles/delayed_job/library/sudo_upstart
+- roles/delayed_job/meta/main.yml
 - roles/delayed_job/tasks/main.yml
-- roles/delayed_job/templates/dj_runner_upstart.j2
+- roles/delayed_job/templates/dj_monit_config.j2
+- roles/delayed_job/templates/dj_monit_runner.j2
 - roles/deployer_user/files/id_rsa_digital_ocean.pub
 - roles/deployer_user/tasks/keys.yml
 - roles/deployer_user/tasks/main.yml
@@ -219,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A tool for provisioning and deploying boxes for hosting Rails apps

data/roles/delayed_job/library/sudo_upstart

@@ -1,101 +0,0 @@
-#!/bin/sh
-
-# This ansible module runs upstart tasks with sudo.
-# This is necessary when specific jobs are allowed with
-# the sudoers file, as using the ansible service module will
-# attempt to execute the entire service module as root instead
-# of just the /sbin/{start,stop,...} jobs
-#
-# This module also wraps restart and reload, ensuring the service
-# is started
-
-# Ansible provides its module opts in a file that needs to be sourced
-# to get the env we run in
-. $1
-
-# Avoid stalling on password prompts
-sudocmd="echo '' | sudo -S"
-
-# holds the result of our operations for reporting state changes
-res=none
-
-sudoex() { eval "$sudocmd $@ >/dev/null";}
-
-# Failure JSON that ansible expects
-fail() {
-  echo '{"failed": true, "msg": "' $1 '", "status": "'`us_status $name`'"}'
-  exit 1
-}
-
-# Make sure certain vars are set when sourcing $1
-require_opt() {
-  eval val=\$$1
-  if [ ! -n "$val" ]; then
-    fail "Opt: $1 is required!"
-  fi
-}
-
-# All we need for now is name and state
-require_opt name
-require_opt state
-
-if ! status $name; then
-  fail "Invalid service: $name"
-fi
-
-reload() {
-  if sudoex /sbin/reload $name; then
-    res=reloaded
-  else
-    sudoex /sbin/start $name || fail "Could not reload or start! $name"
-    res=started
-  fi
-}
-
-restart() {
-  if sudoex /sbin/restart $name; then
-    res=restarted
-  else
-    sudoex /sbin/start $name || fail "Could not restart or start! $name"
-    res=started
-  fi
-}
-
-stopit() {
-  if [ "`us_status $name`" = "stop/waiting" ]; then
-    res=none
-  else
-    sudoex /sbin/stop $name || fail "Could not stop $name"
-    res=stopped
-  fi
-}
-
-start() {
-  if [ "`us_status $name`" = "start/running" ]; then
-    res=none
-  else
-    sudoex /sbin/start $name || fail "Could not start $name"
-    res=started
-  fi
-}
-
-# Return status string for the given service
-us_status() {
-  status $1 | cut -f 2 -d ' ' | tr -d ','
-}
-
-res=''
-case $state in
-reloaded) reload;;
-restarted) restart;;
-stopped) stopit;;
-started) start;;
-*) fail "Invalid state: $state";;
-esac
-
-# Were there changes applied?
-if [ "$res" = none ]; then
-  echo '{"changed": false}'
-else
-  echo '{"change": "'$res'", "changed": true}'
-fi

data/roles/delayed_job/templates/dj_runner_upstart.j2

@@ -1,17 +0,0 @@
-description "{{app_name}} delayed job runner daemon"
-
-start on virtual-filesystems
-stop on runlevel [06]
-
-env PATH={{ rbenv_root }}/shims:{{ rbenv_root }}/bin:/usr/bin:/sbin:/bin
-env RAILS_ENV={{be_app_env}}
-setuid {{ deployer_user.name }}
-setgid {{ deployer_user.name }}
-
-chdir {{be_app_path}}
-
-respawn limit 5 5
-
-kill timeout 5
-
-exec bundle exec bin/delayed_job run