pvcglue 0.1.25 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d8e13eb849237295d92d5608720ebac8aa8d285
-  data.tar.gz: c33ef05585ffdda58c213a6bf38bea055804ca83
+  metadata.gz: 04b3f92f71e7038cd74f78ac832f0d93604cd2dc
+  data.tar.gz: e4cf248f20b858e705e2f81496f59f1557c0d428
 SHA512:
-  metadata.gz: 94387410ece82c63f531436d92e7616a43403a1d33d8a5cb6e3842dd8d14160718321862f3ab378e6cc510b16fd2a78712f2cee3ba72efc534ae99f74f9add78
-  data.tar.gz: 6ccf6339855e66c432a13d09084d0f3abc934f0fc55b75141b40291878f33017d8232567febb939724bd38b7a716c869379c050fa9f3e2941c6a82829aa66248
+  metadata.gz: ad1bd550284cb3b4e7d59e980b7e14b4845d7d8a1185afdd832723914fe12cce6dd1a666e74bb4d6852cadc11e1ddf355cae17963c057291ec760b5cfa233da1
+  data.tar.gz: 71422b3c7ae4b4396b61018d4bdbb2ca57b1e59072bd3a2289b29523584be371808a0285d04b65bf63ecff05a803d7f1735221ca1a52284a55375a9d1de177e0

data/lib/pvcglue.rb

@@ -11,8 +11,10 @@ require "pvcglue/deploy"
 require "pvcglue/capistrano"
 require "pvcglue/ssl"
 require "pvcglue/db"
-require "pvcglue/toml_pvc_dumper.rb"
-require "pvcglue/local.rb"
+require "pvcglue/toml_pvc_dumper"
+require "pvcglue/local"
+require "pvcglue/monit"
+require "pvcglue/pvcify"
 require "tilt"
 
 # puts File.join(File.dirname(__FILE__), 'pvcglue', 'packages', '*.rb')

data/lib/pvcglue/cli.rb

@@ -59,7 +59,7 @@ module Pvcglue
       # puts node.inspect
       puts "Connection to #{node_name} (#{node_data[:public_ip]}) as user 'deploy'..."
       working_dir = Pvcglue.cloud.deploy_to_app_current_dir
-      system(%(ssh -t deploy@#{node_data[:public_ip]} "cd #{working_dir} && echo 'Starting #{options[:stage].upcase} Rails console in #{working_dir}' && RAILS_ENV=#{options[:stage].downcase} script/rails c"))
+      system(%(ssh -t deploy@#{node_data[:public_ip]} "cd #{working_dir} && echo 'Starting #{options[:stage].upcase} Rails console in #{working_dir}' && bundle exec rails c #{options[:stage].downcase}"))
 
     end
 
@@ -170,8 +170,7 @@ module Pvcglue
     method_option :stage, :required => true, :aliases => "-s"
 
     def pvcify
-      Pvcglue::Capistrano.capify
-      Pvcglue::Db.configure_database_yml
+      Pvcglue::Pvcify.run
     end
 
     desc "start", "start local virtual machines (build first, if required)"

data/lib/pvcglue/cloud.rb

@@ -27,6 +27,11 @@ module Pvcglue
       @current_node
     end
 
+    def current_node_data
+      current_node.values.first
+    end
+
+
     def current_hostname
       raise "Current current_hostname not set." if @current_hostname.nil?
       @current_hostname
@@ -122,6 +127,10 @@ module Pvcglue
       File.join(deploy_to_app_dir, 'shared')
     end
 
+    def deploy_to_app_shared_pids_dir
+      File.join(deploy_to_app_shared_dir, 'pids')
+    end
+
     def env_file_name
       File.join(deploy_to_app_shared_dir, ".env.#{stage_name_validated}")
     end
@@ -130,6 +139,10 @@ module Pvcglue
       File.join(deploy_to_app_current_dir, 'public')
     end
 
+    def deploy_to_app_current_bin_dir
+      File.join(deploy_to_app_current_dir, Pvcglue.configuration.rails_bin_dir)
+    end
+
     def maintenance_files_dir
       File.join(deploy_to_app_dir, 'maintenance')
     end
@@ -301,6 +314,16 @@ module Pvcglue
       puts "Setting port_in_node_context to #{@port_in_node_context}"
       @port_in_node_context
     end
+
+    def delayed_job_worker_count
+      return 0 unless gems[:delayed_job]
+      (stage[:delayed_job_workers] || 1).to_i
+    end
+
+    def resque_worker_count
+      return 0 unless gems[:resque]
+      (stage[:resque_workers] || 1).to_i
+    end
   end
 
   def self.cloud

data/lib/pvcglue/configuration.rb

@@ -170,6 +170,24 @@ module Pvcglue
         File.read(ruby_version_file_name).strip
       end
 
+      def rails_version
+        @rails_version ||= begin
+          `bundle exec rails -v`.sub('Rails ', '').strip
+        end
+      end
+
+      def rails_version_major
+        rails_version.split('.').first
+      end
+
+      def rails_bin_dir
+        if rails_version_major.to_i >= 4
+          'bin'
+        else
+          'script'
+        end
+      end
+
       def web_app_base_dir
         '/sites'
       end

data/lib/pvcglue/local.rb

@@ -253,7 +253,7 @@ module Pvcglue
         end
         raise "Public IP not found" unless machines[machine][:public_ip]
         raise "Private IP not found" unless machines[machine][:private_ip]
-        puts "Adding you public key to the root user for #{machine_name}..."
+        puts "Adding your public key to the root user for #{machine_name}..."
         # cat ~/.ssh/id_rsa.pub | vagrant ssh manager -c 'sudo tee /root/.ssh/authorized_keys'
         raise $? unless system %Q(cat ~/.ssh/id_rsa.pub | vagrant ssh #{machine_name} -c 'sudo tee /root/.ssh/authorized_keys')
       end

data/lib/pvcglue/monit.rb

@@ -0,0 +1,32 @@
+module Pvcglue
+  class Monit
+    def self.monitify
+      Pvcglue.render_template('monit.app.monitrc.erb', monitrc_file_name)
+    end
+
+    def self.monitrc_file_name
+      File.join(Pvcglue.configuration.application_dir, 'monitrc')
+    end
+
+    def self.worker_control_name
+      "#{Pvcglue.cloud.app_and_stage_name}_worker_control"
+    end
+
+    def self.delayed_job_queue_name(n)
+      "#{Pvcglue.cloud.app_and_stage_name}_delayed_job.#{n}"
+    end
+
+    def self.resque_queue_name(n)
+      "#{Pvcglue.cloud.app_and_stage_name}_resque_worker.#{n}"
+    end
+
+    def self.resque_pid_file_name(n)
+      "#{Pvcglue.cloud.deploy_to_app_shared_pids_dir}/resque_worker.#{n}.pid"
+    end
+
+    def self.safe_name(s)
+      s.gsub(/\W/, '_')
+    end
+
+  end
+end

data/lib/pvcglue/nodes.rb

@@ -21,7 +21,7 @@ module Pvcglue
         end
       end
 
-      Pvcglue::Capistrano.capify
+      Pvcglue::Pvcify.run
 
     end
 

data/lib/pvcglue/packages/monit-bootstrap.rb

@@ -0,0 +1,117 @@
+# check process delayed_job.0
+#   with pidfile /sites/pvcglue_dev_box/local/shared/pids/delayed_job.0.pid
+#   start program = "/home/deploy/.rvm/bin/rvm-shell -c 'cd /sites/pvcglue_dev_box/local/current && RAILS_ENV=local /sites/pvcglue_dev_box/local/current/bin/delayed_job start -i 0 --pid-dir=/sites/pvcglue_dev_box/local/shared/pids/'" as uid deploy and gid deploy
+#   stop program = "/home/deploy/.rvm/bin/rvm-shell -c 'cd /sites/pvcglue_dev_box/local/current && RAILS_ENV=local /sites/pvcglue_dev_box/local/current/bin/delayed_job stop -i 0 --pid-dir=/sites/pvcglue_dev_box/local/shared/pids/'" as uid deploy and gid deploy
+#   group delayed
+#   depends on deploy_in_progress
+#
+# check file deploy_in_progress with path /sites/pvcglue_dev_box/local/shared/pids/deploying
+#   if does not exist then exec "/bin/echo Does not exist" else if succeeded then exec "/bin/echo Exists"
+# #  group delayed
+# #  if changed timestamp then exec "/bin/echo"
+#
+# check process monit
+#   with pidfile /var/run/monit.pid
+#   restart program = "/usr/bin/monit reload"
+
+# curl http://localhost:2812/monit -d "action=restart"
+
+# curl http://localhost:2812/deploy_in_progress -d "action=start"
+
+# For development
+#
+#  Stop the service:
+#    sudo service monit stop
+#
+#  Run it manually:
+#    sudo monit -Iv
+#
+#
+package 'monit-bootstrap' do
+  depends_on 'monit-install'
+  depends_on 'monit-upstart'
+end
+
+package 'monit-install' do
+  depends_on 'monit-config-files'
+
+  validate do
+    # next:  thanks to http://stackoverflow.com/questions/2325471/using-return-in-a-ruby-block
+    next false unless run('monit -V') =~ /5\.14/
+    next false unless sudo('monit -t') =~ /Control file syntax OK/
+    sudo('monit status') =~ /status\s*Running/
+  end
+
+  apply do
+    # Thanks to https://rtcamp.com/tutorials/monitoring/monit/
+    sudo 'rm monit-5.14-linux-x64.tar.gz'
+    sudo 'wget https://mmonit.com/monit/dist/binary/5.14/monit-5.14-linux-x64.tar.gz'
+    sudo 'tar zxvf monit-5.14-linux-x64.tar.gz'
+    sudo 'cp ~/monit-5.14/bin/monit /usr/bin/monit'
+    sudo 'ln -s /etc/monit/monitrc /etc/monitrc'
+    sudo 'mkdir -p /var/lib/monit/'
+    sudo 'mkdir -p /etc/monit/conf.d/'
+    sudo 'monit quit' # quit 'manually' and then start it as a service (or service monit stop, doesn't)
+    sudo 'service monit start'
+  end
+
+  remove do
+    raise "removing monit not supported, yet."
+  end
+end
+
+package 'monit-config-files' do
+  file({
+           :template => Pvcglue.template_file_name('monit.init.d.erb'),
+           :destination => '/etc/init.d/monit',
+           :permissions => 0755,
+           :user => 'root',
+           :group => 'root'
+       }) { sudo('service monit restart') }
+
+  file({
+           :template => Pvcglue.template_file_name('monit.monitrc.erb'),
+           :destination => '/etc/monit/monitrc',
+           :create_dirs => true,
+           :permissions => 0700,
+           :user => 'root',
+           :group => 'root'
+       }) { sudo('service monit restart') }
+
+  file({
+           :template => Pvcglue.template_file_name('monit.etc-default.erb'),
+           :destination => '/etc/default/monit',
+           :permissions => 0644,
+           :user => 'root',
+           :group => 'root'
+       }) {}
+end
+
+package 'monit-upstart' do
+  depends_on 'monit-upstart-files'
+
+  validate do
+    sudo('initctl status monit') =~ /monit start\/running/
+  end
+
+  apply do
+    sudo 'service monit start'
+  end
+
+  remove do
+    raise "removing monit not supported, yet."
+  end
+end
+
+package 'monit-upstart-files' do
+  file({
+           :template => Pvcglue.template_file_name('monit.upstart-conf.erb'),
+           :destination => '/etc/init/monit.conf',
+           :permissions => 0644,
+           :user => 'root',
+           :group => 'root'
+       }) { sudo 'initctl reload-configuration' }
+
+end
+
+

data/lib/pvcglue/packages/monit-web.rb

@@ -0,0 +1,10 @@
+package 'monit-web' do
+  depends_on 'monit-bootstrap'
+
+  apply do
+    #include /etc/monit/conf.d/*
+    sudo "ln -s #{Pvcglue.cloud.deploy_to_app_current_dir}/monitrc /etc/monit/conf.d/#{Pvcglue.cloud.app_name}_#{Pvcglue.cloud.stage_name}.conf"
+    # sudo 'service monit restart'
+  end
+end
+

data/lib/pvcglue/packages/role_web.rb

@@ -17,6 +17,7 @@ package 'web' do
   depends_on 'imagemagick' # TODO:  app specific--will need to make system to include extra packages
   depends_on 'libpq-dev' # for pg gem
   depends_on 'nodejs'
+  depends_on 'monit-web'
 end
 
 

data/lib/pvcglue/packages/rvm.rb

@@ -8,6 +8,8 @@ package 'rvm' do
 
   apply do
     run 'gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3'
+    run 'gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3' # Do it again, the first time only sets things up, and does not import the keys
+    # run 'curl -sSL https://rvm.io/mpapis.asc | gpg --import -'
     run '\curl -sSL https://get.rvm.io | bash -s stable --with-default-gems="bundler"'
     run "rvm requirements"
   end

data/lib/pvcglue/pvcify.rb

@@ -0,0 +1,9 @@
+module Pvcglue
+  class Pvcify
+    def self.run
+      Pvcglue::Monit.monitify
+      Pvcglue::Capistrano.capify
+      Pvcglue::Db.configure_database_yml
+    end
+  end
+end

data/lib/pvcglue/templates/deploy.rb.erb

@@ -23,48 +23,77 @@ task :invoke, [:command] => 'deploy:set_rails_env' do |task, args|
 end
 
 namespace :deploy do
-<% if Pvcglue.cloud.gems[:delayed_job] %>
-  def args
-    fetch(:delayed_job_args, "")
-  end
-
-  def delayed_job_roles
-    fetch(:delayed_job_server_role, :app)
-  end
+<% if Pvcglue.cloud.gems[:delayed_job] || Pvcglue.cloud.gems[:resque] %>
 
-  desc 'Stop the delayed_job process'
-  task :delayed_job_stop do
-    on roles(delayed_job_roles) do
-      within release_path do
-        with rails_env: fetch(:rails_env) do
-          execute :'script/delayed_job', :stop
-        end
-      end
+  desc 'Stop the workers'
+  task :stop_workers do
+    on roles(:app) do
+      execute :'curl -sS http://localhost:2812/<%= Pvcglue::Monit.worker_control_name %> -d "action=stop"'
     end
   end
 
-  desc 'Start the delayed_job process'
-  task :delayed_job_start do
-    on roles(delayed_job_roles) do
-      within release_path do
-        with rails_env: fetch(:rails_env) do
-          execute :'script/delayed_job', args, :start
-        end
-      end
+  desc 'Start the workers'
+  task :start_workers do
+    on roles(:app) do
+      execute :'curl -sS http://localhost:2812/monit_reload -d "action=restart"'
+      execute :'sleep 5' # must wait for reload
+      execute :'curl -sS http://localhost:2812/<%= Pvcglue::Monit.worker_control_name %> -d "action=start"'
     end
   end
 
-  desc 'Restart the delayed_job process'
-  task :delayed_job_restart do
-    on roles(delayed_job_roles) do
-      within release_path do
-        with rails_env: fetch(:rails_env) do
-          execute :'script/delayed_job', args, :restart
-        end
-      end
+  desc 'Restart the workers'
+  task :restart_workers do
+    on roles(:app) do
+      execute :'curl -sS http://localhost:2812/monit_reload -d "action=restart"'
+      execute :'sleep 5' # must wait for reload
+      execute :'curl -sS http://localhost:2812/<%= Pvcglue::Monit.worker_control_name %> -d "action=restart"'
     end
   end
 
+  after :started, :stop_workers
+  after :publishing, :start_workers
+
+  # def args
+  #   fetch(:delayed_job_args, "")
+  # end
+  #
+  # def delayed_job_roles
+  #   fetch(:delayed_job_server_role, :app)
+  # end
+  #
+  # desc 'Stop the delayed_job process'
+  # task :delayed_job_stop do
+  #   on roles(delayed_job_roles) do
+  #     within release_path do
+  #       with rails_env: fetch(:rails_env) do
+  #         execute :'<%= Pvcglue.configuration.rails_bin_dir %>/delayed_job', :stop
+  #       end
+  #     end
+  #   end
+  # end
+  #
+  # desc 'Start the delayed_job process'
+  # task :delayed_job_start do
+  #   on roles(delayed_job_roles) do
+  #     within release_path do
+  #       with rails_env: fetch(:rails_env) do
+  #         execute :'<%= Pvcglue.configuration.rails_bin_dir %>/delayed_job', args, :start
+  #       end
+  #     end
+  #   end
+  # end
+  #
+  # desc 'Restart the delayed_job process'
+  # task :delayed_job_restart do
+  #   on roles(delayed_job_roles) do
+  #     within release_path do
+  #       with rails_env: fetch(:rails_env) do
+  #         execute :'<%= Pvcglue.configuration.rails_bin_dir %>/delayed_job', args, :restart
+  #       end
+  #     end
+  #   end
+  # end
+
   #desc 'Restart Delayed Job'
   #task :restart_delayed_job do
   #  on roles(:app), in: :sequence, wait: 5 do
@@ -77,7 +106,7 @@ namespace :deploy do
   #end
 
 
-  after :publishing, :delayed_job_restart # calling this directly is a work-around due to "NoMethodError: undefined method `verbosity'" error when calling task from a task in capistrano 3.1.0 and SSHKit 1.3.0
+  # after :publishing, :delayed_job_restart # calling this directly is a work-around due to "NoMethodError: undefined method `verbosity'" error when calling task from a task in capistrano 3.1.0 and SSHKit 1.3.0
 <% end %>
 
   desc 'Restart passenger app'

data/lib/pvcglue/templates/monit.app.monitrc.erb

@@ -0,0 +1,33 @@
+# Used to control the all of the workers that depend on it.
+# Allows workers to be started/stopped without needing root, using the web interface
+#
+#  Example
+#    curl http://localhost:2812/pvcglue_dev_box_local_control -d "action=start"
+#
+
+check file <%= Pvcglue::Monit.worker_control_name %> with path <%= "#{Pvcglue.cloud.deploy_to_app_shared_dir}/worker_control" %>
+  # this is a "no-op" so that the default monit actions do not execute
+  if does not exist then exec "/bin/true" else if succeeded then exec "/bin/true"
+
+<% Pvcglue.cloud.delayed_job_worker_count.times do |n| %>
+  check process <%= Pvcglue::Monit.safe_name(Pvcglue::Monit.delayed_job_queue_name(n)) %>
+  with pidfile <%= Pvcglue.cloud.deploy_to_app_shared_pids_dir %>/delayed_job.<%= n %>.pid
+  start program = "/home/deploy/.rvm/bin/rvm-shell -c 'cd <%= Pvcglue.cloud.deploy_to_app_current_dir %> && RAILS_ENV=<%= Pvcglue.cloud.stage_name %> <%= Pvcglue.cloud.deploy_to_app_current_bin_dir %>/delayed_job start -i <%= n %> --pid-dir=<%= Pvcglue.cloud.deploy_to_app_shared_pids_dir %>'" as uid deploy and gid deploy
+  stop program = "/home/deploy/.rvm/bin/rvm-shell -c 'cd <%= Pvcglue.cloud.deploy_to_app_current_dir %> && RAILS_ENV=<%= Pvcglue.cloud.stage_name %> <%= Pvcglue.cloud.deploy_to_app_current_bin_dir %>/delayed_job stop -i <%= n %> --pid-dir=<%= Pvcglue.cloud.deploy_to_app_shared_pids_dir %>'" as uid deploy and gid deploy
+  group <%= "#{Pvcglue.cloud.app_and_stage_name}_delayed_job" %>
+  group <%= "#{Pvcglue.cloud.app_and_stage_name}_workers" %>
+  depends on <%= Pvcglue::Monit.worker_control_name %>
+
+<% end %>
+
+<% Pvcglue.cloud.resque_worker_count.times do |n| %>
+# Based on https://github.com/resque/resque/blob/master/examples/monit/resque.monit
+check process <%= Pvcglue::Monit.safe_name(Pvcglue::Monit.resque_queue_name(n)) %>
+  with pidfile <%= Pvcglue::Monit.resque_pid_file_name(n) %>
+  start program = "/home/deploy/.rvm/bin/rvm-shell -c 'cd <%= Pvcglue.cloud.deploy_to_app_current_dir %> && nohup bundle exec rake environment resque:work RAILS_ENV=<%= Pvcglue.cloud.stage_name %> QUEUE=* VERBOSE=1 PIDFILE=<%= Pvcglue::Monit.resque_pid_file_name(n) %> >> log/resque_worker.log 2>&1'" as uid deploy and gid deploy
+  stop program = "/bin/sh -c 'kill -9 $(cat <%= Pvcglue::Monit.resque_pid_file_name(n) %>) && rm -f <%= Pvcglue::Monit.resque_pid_file_name(n) %>; exit 0;'" as uid deploy and gid deploy
+  group <%= "#{Pvcglue.cloud.app_and_stage_name}_resque" %>
+  group <%= "#{Pvcglue.cloud.app_and_stage_name}_workers" %>
+  depends on <%= Pvcglue::Monit.worker_control_name %>
+
+<% end %>

data/lib/pvcglue/templates/monit.etc-default.erb

@@ -0,0 +1 @@
+START=yes

data/lib/pvcglue/templates/monit.init.d.erb

@@ -0,0 +1,105 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          monit
+# Required-Start:    $remote_fs
+# Required-Stop:     $remote_fs
+# Should-Start:      $all
+# Should-Stop:       $all
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: service and resource monitoring daemon
+# Description:       monit is a utility for managing and monitoring
+#                    processes, programs, files, directories and filesystems
+#                    on a Unix system. Monit conducts automatic maintenance
+#                    and repair and can execute meaningful causal actions
+#                    in error situations.
+### END INIT INFO
+
+set -e
+
+. /lib/lsb/init-functions
+
+DAEMON=/usr/bin/monit
+CONFIG=/etc/monit/monitrc
+NAME=monit
+DESC="daemon monitor"
+MONIT_OPTS=
+PID="/run/$NAME.pid"
+
+# Check if DAEMON binary exist
+[ -f $DAEMON ] || exit 0
+
+[ -f "/etc/default/$NAME" ] && . /etc/default/$NAME
+
+MONIT_OPTS="-c $CONFIG $MONIT_OPTS"
+
+monit_not_configured () {
+  if [ "$1" != "stop" ]
+  then
+    printf "\tplease configure $NAME and then edit /etc/default/$NAME\n"
+    printf "\tand set the \"START\" variable to \"yes\" in order to allow\n"
+    printf "\t$NAME to start\n"
+  fi
+  exit 0
+}
+
+monit_checks () {
+  # Check if START variable is set to "yes", if not we exit.
+  if [ "$START" != "yes" ]
+  then
+    monit_not_configured $1
+  fi
+}
+
+case "$1" in
+  start)
+    log_daemon_msg "Starting $DESC" "$NAME"
+    monit_checks $1
+    if start-stop-daemon --start --quiet --oknodo --pidfile $PID --exec $DAEMON -- $MONIT_OPTS 1>/dev/null
+    then
+      log_end_msg 0
+    else
+      log_end_msg 1
+    fi
+    ;;
+  stop)
+    log_daemon_msg "Stopping $DESC" "$NAME"
+    if start-stop-daemon --retry TERM/5/KILL/5 --oknodo --stop --quiet --pidfile $PID 1>/dev/null
+    then
+      log_end_msg 0
+    else
+      log_end_msg 1
+    fi
+    ;;
+  reload)
+    log_daemon_msg "Reloading $DESC configuration" "$NAME"
+    if start-stop-daemon --stop --signal HUP --quiet --oknodo --pidfile $PID --exec $DAEMON -- $MONIT_OPTS 1>/dev/null
+    then
+      log_end_msg 0
+    else
+      log_end_msg 1
+	fi
+    ;;
+  restart|force-reload)
+    log_daemon_msg "Restarting $DESC" "$NAME"
+    start-stop-daemon --retry TERM/5/KILL/5 --oknodo --stop --quiet --pidfile $PID 1>/dev/null
+    if start-stop-daemon --start --quiet --oknodo --pidfile $PID --exec $DAEMON -- $MONIT_OPTS 1>/dev/null
+    then
+      log_end_msg 0
+    else
+      log_end_msg 1
+    fi
+    ;;
+  syntax)
+    $DAEMON $MONIT_OPTS -t
+    ;;
+  status)
+    status_of_proc -p $PID $DAEMON $NAME
+    ;;
+  *)
+    log_action_msg "Usage: /etc/init.d/$NAME {start|stop|reload|restart|force-reload|syntax|status}"
+    ;;
+esac
+
+exit 0

data/lib/pvcglue/templates/monit.monitrc.erb

@@ -0,0 +1,279 @@
+###############################################################################
+## Monit control file
+###############################################################################
+##
+## Comments begin with a '#' and extend through the end of the line. Keywords
+## are case insensitive. All path's MUST BE FULLY QUALIFIED, starting with '/'.
+##
+## Below you will find examples of some frequently used statements. For
+## information about the control file and a complete list of statements and
+## options, please have a look in the Monit manual.
+##
+##
+###############################################################################
+## Global section
+###############################################################################
+##
+## Start Monit in the background (run as a daemon):
+#
+set daemon 15            # check services at 2-minute intervals
+# set daemon 60            # check services at 2-minute intervals
+#   with start delay 240    # optional: delay the first check by 4-minutes (by
+#                           # default Monit check immediately after Monit start)
+#
+#
+## Set syslog logging with the 'daemon' facility. If the FACILITY option is
+## omitted, Monit will use 'user' facility by default. If you want to log to
+## a standalone log file instead, specify the full path to the log file
+#
+# set logfile syslog facility log_daemon
+set logfile /var/log/monit.log
+#
+#
+## Set the location of the Monit id file which stores the unique id for the
+## Monit instance. The id is generated and stored on first Monit start. By
+## default the file is placed in $HOME/.monit.id.
+#
+# set idfile /var/.monit.id
+set idfile /var/lib/monit/id
+#
+## Set the location of the Monit state file which saves monitoring states
+## on each cycle. By default the file is placed in $HOME/.monit.state. If
+## the state file is stored on a persistent filesystem, Monit will recover
+## the monitoring state across reboots. If it is on temporary filesystem, the
+## state will be lost on reboot which may be convenient in some situations.
+#
+set statefile /var/lib/monit/state
+#
+## Set the list of mail servers for alert delivery. Multiple servers may be
+## specified using a comma separator. If the first mail server fails, Monit
+# will use the second mail server in the list and so on. By default Monit uses
+# port 25 - it is possible to override this with the PORT option.
+#
+# set mailserver mail.bar.baz,               # primary mailserver
+#                backup.bar.baz port 10025,  # backup mailserver on port 10025
+#                localhost                   # fallback relay
+#
+#
+## By default Monit will drop alert events if no mail servers are available.
+## If you want to keep the alerts for later delivery retry, you can use the
+## EVENTQUEUE statement. The base directory where undelivered alerts will be
+## stored is specified by the BASEDIR option. You can limit the maximal queue
+## size using the SLOTS option (if omitted, the queue is limited by space
+## available in the back end filesystem).
+#
+set eventqueue
+basedir /var/lib/monit/events # set the base directory where events will be stored
+slots 100                     # optionally limit the queue size
+#
+#
+## Send status and events to M/Monit (for more informations about M/Monit
+## see http://mmonit.com/). By default Monit registers credentials with
+## M/Monit so M/Monit can smoothly communicate back to Monit and you don't
+## have to register Monit credentials manually in M/Monit. It is possible to
+## disable credential registration using the commented out option below.
+## Though, if safety is a concern we recommend instead using https when
+## communicating with M/Monit and send credentials encrypted.
+#
+# set mmonit http://monit:monit@192.168.1.10:8080/collector
+#     # and register without credentials     # Don't register credentials
+#
+#
+## Monit by default uses the following format for alerts if the the mail-format
+## statement is missing::
+## --8<--
+## set mail-format {
+##      from: monit@$HOST
+##   subject: monit alert --  $EVENT $SERVICE
+##   message: $EVENT Service $SERVICE
+##                 Date:        $DATE
+##                 Action:      $ACTION
+##                 Host:        $HOST
+##                 Description: $DESCRIPTION
+##
+##            Your faithful employee,
+##            Monit
+## }
+## --8<--
+##
+## You can override this message format or parts of it, such as subject
+## or sender using the MAIL-FORMAT statement. Macros such as $DATE, etc.
+## are expanded at runtime. For example, to override the sender, use:
+#
+# set mail-format { from: monit@foo.bar }
+#
+#
+## You can set alert recipients whom will receive alerts if/when a
+## service defined in this file has errors. Alerts may be restricted on
+## events by using a filter as in the second example below.
+#
+# set alert sysadm@foo.bar                       # receive all alerts
+## Do not alert when Monit start,stop or perform a user initiated action
+# set alert manager@foo.bar not on { instance, action }
+#
+#
+## Monit has an embedded web server which can be used to view status of
+## services monitored and manage services from a web interface. See the
+## Monit Wiki if you want to enable SSL for the web server.
+#
+set httpd port 2812 and
+use address localhost  # only accept connection from localhost
+allow localhost        # allow localhost to connect to the server and
+#    allow admin:monit      # require user 'admin' with password 'monit'
+#    allow @monit           # allow users of group 'monit' to connect (rw)
+#    allow @users readonly  # allow users of group 'users' to connect readonly
+#
+###############################################################################
+## Services
+###############################################################################
+##
+## Check general system resources such as load average, cpu and memory
+## usage. Each test specifies a resource, conditions and the action to be
+## performed should a test fail.
+#
+#  check system myhost.mydomain.tld
+#    if loadavg (1min) > 4 then alert
+#    if loadavg (5min) > 2 then alert
+#    if memory usage > 75% then alert
+#    if swap usage > 25% then alert
+#    if cpu usage (user) > 70% then alert
+#    if cpu usage (system) > 30% then alert
+#    if cpu usage (wait) > 20% then alert
+#
+#
+## Check if a file exists, checksum, permissions, uid and gid. In addition
+## to alert recipients in the global section, customized alert can be sent to
+## additional recipients by specifying a local alert handler. The service may
+## be grouped using the GROUP option. More than one group can be specified by
+## repeating the 'group name' statement.
+#
+#  check file apache_bin with path /usr/local/apache/bin/httpd
+#    if failed checksum and
+#       expect the sum 8f7f419955cefa0b33a2ba316cba3659 then unmonitor
+#    if failed permission 755 then unmonitor
+#    if failed uid root then unmonitor
+#    if failed gid root then unmonitor
+#    alert security@foo.bar on {
+#           checksum, permission, uid, gid, unmonitor
+#        } with the mail-format { subject: Alarm! }
+#    group server
+#
+#
+## Check that a process is running, in this case Apache, and that it respond
+## to HTTP and HTTPS requests. Check its resource usage such as cpu and memory,
+## and number of children. If the process is not running, Monit will restart
+## it by default. In case the service is restarted very often and the
+## problem remains, it is possible to disable monitoring using the TIMEOUT
+## statement. This service depends on another service (apache_bin) which
+## is defined above.
+#
+#  check process apache with pidfile /usr/local/apache/logs/httpd.pid
+#    start program = "/etc/init.d/httpd start" with timeout 60 seconds
+#    stop program  = "/etc/init.d/httpd stop"
+#    if cpu > 60% for 2 cycles then alert
+#    if cpu > 80% for 5 cycles then restart
+#    if totalmem > 200.0 MB for 5 cycles then restart
+#    if children > 250 then restart
+#    if loadavg(5min) greater than 10 for 8 cycles then stop
+#    if failed host www.tildeslash.com port 80 protocol http
+#       and request "/somefile.html"
+#       then restart
+#    if failed port 443 type tcpssl protocol http
+#       with timeout 15 seconds
+#       then restart
+#    if 3 restarts within 5 cycles then timeout
+#    depends on apache_bin
+#    group server
+#
+#
+## Check filesystem permissions, uid, gid, space and inode usage. Other services,
+## such as databases, may depend on this resource and an automatically graceful
+## stop may be cascaded to them before the filesystem will become full and data
+## lost.
+#
+#  check filesystem datafs with path /dev/sdb1
+#    start program  = "/bin/mount /data"
+#    stop program  = "/bin/umount /data"
+#    if failed permission 660 then unmonitor
+#    if failed uid root then unmonitor
+#    if failed gid disk then unmonitor
+#    if space usage > 80% for 5 times within 15 cycles then alert
+#    if space usage > 99% then stop
+#    if inode usage > 30000 then alert
+#    if inode usage > 99% then stop
+#    group server
+#
+#
+## Check a file's timestamp. In this example, we test if a file is older
+## than 15 minutes and assume something is wrong if its not updated. Also,
+## if the file size exceed a given limit, execute a script
+#
+#  check file database with path /data/mydatabase.db
+#    if failed permission 700 then alert
+#    if failed uid data then alert
+#    if failed gid data then alert
+#    if timestamp > 15 minutes then alert
+#    if size > 100 MB then exec "/my/cleanup/script" as uid dba and gid dba
+#
+#
+## Check directory permission, uid and gid.  An event is triggered if the
+## directory does not belong to the user with uid 0 and gid 0.  In addition,
+## the permissions have to match the octal description of 755 (see chmod(1)).
+#
+#  check directory bin with path /bin
+#    if failed permission 755 then unmonitor
+#    if failed uid 0 then unmonitor
+#    if failed gid 0 then unmonitor
+#
+#
+## Check a remote host availability by issuing a ping test and check the
+## content of a response from a web server. Up to three pings are sent and
+## connection to a port and an application level network check is performed.
+#
+#  check host myserver with address 192.168.1.1
+#    if failed icmp type echo count 3 with timeout 3 seconds then alert
+#    if failed port 3306 protocol mysql with timeout 15 seconds then alert
+#    if failed url http://user:password@www.foo.bar:8080/?querystring
+#       and content == 'action="j_security_check"'
+#       then alert
+#
+#
+###############################################################################
+## Includes
+###############################################################################
+##
+## It is possible to include additional configuration parts from other files or
+## directories.
+#
+include /etc/monit/conf.d/*
+
+###############################################################################
+## Allow monit to be reloaded from the web interface, so that root is not
+## needed when deploying.
+##
+## Example
+##   curl http://localhost:2812/monit_reload -d "action=restart"
+###############################################################################
+check process monit_reload
+  with pidfile /var/run/monit.pid
+  restart program = "/bin/bash -c '/bin/sleep 1 && /usr/bin/monit reload &'"
+  #restart program = "/bin/bash -c '/usr/bin/monit reload &'"
+
+#Nginx
+#check process nginx with pidfile "/var/run/nginx.pid"
+#if cpu > 80% for 2 cycles then alert
+
+#System Monitoring
+#check system PUT_YOUR_HOSTNAME_HERE
+#if memory usage > 80% for 2 cycles then alert
+#if cpu usage (user) > 70% for 2 cycles then alert
+#if cpu usage (system) > 30% then alert
+#if cpu usage (wait) > 20% then alert
+#if loadavg (1min) > 6 for 2 cycles then alert
+#if loadavg (5min) > 4 for 2 cycles then alert
+#if swap usage > 5% then alert
+
+#check filesystem rootfs with path /
+#if space usage > 80% then alert
+#set mailserver localhost
+#set alert you@example.com

data/lib/pvcglue/templates/monit.upstart-conf.erb

@@ -0,0 +1,34 @@
+ # Based on:  https://mmonit.com/wiki/Monit/Upstart
+ #
+ # This is an upstart script to keep monit running.
+ # To install disable the old way of doing things:
+ #
+ #   /etc/init.d/monit stop && update-rc.d -f monit remove
+ #
+ # then put this script here:
+ #
+ #   /etc/init/monit.conf
+ #
+ # and reload upstart configuration:
+ #
+ #   initctl reload-configuration
+ #
+ # You can manually start and stop monit like this:
+ #
+ # start monit
+ # stop monit
+ #
+
+ description "Monit service manager"
+
+ limit core unlimited unlimited
+
+ start on runlevel [2345]
+ stop on starting rc RUNLEVEL=[016]
+
+ expect daemon
+ respawn
+
+ exec /usr/bin/monit -c /etc/monitrc
+
+ pre-stop exec /usr/bin/monit -c /etc/monitrc quit

data/lib/pvcglue/version.rb

@@ -1,3 +1,3 @@
 module Pvcglue
-  VERSION = "0.1.25"
+  VERSION = "0.1.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pvcglue
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Andrew Lyric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -232,12 +232,15 @@ files:
 - lib/pvcglue/env.rb
 - lib/pvcglue/local.rb
 - lib/pvcglue/manager.rb
+- lib/pvcglue/monit.rb
 - lib/pvcglue/nodes.rb
 - lib/pvcglue/packages.rb
 - lib/pvcglue/packages/bootstrap.rb
 - lib/pvcglue/packages/env.rb
 - lib/pvcglue/packages/firewall.rb
 - lib/pvcglue/packages/manager.rb
+- lib/pvcglue/packages/monit-bootstrap.rb
+- lib/pvcglue/packages/monit-web.rb
 - lib/pvcglue/packages/nginx.rb
 - lib/pvcglue/packages/nodejs.rb
 - lib/pvcglue/packages/passenger.rb
@@ -250,6 +253,7 @@ files:
 - lib/pvcglue/packages/rvm.rb
 - lib/pvcglue/packages/timezone.rb
 - lib/pvcglue/packages/ubuntu.rb
+- lib/pvcglue/pvcify.rb
 - lib/pvcglue/railtie.rb
 - lib/pvcglue/ssl.rb
 - lib/pvcglue/templates/20auto-upgrades.erb
@@ -264,6 +268,11 @@ files:
 - lib/pvcglue/templates/lb.sites-enabled.erb
 - lib/pvcglue/templates/maintenance_mode.erb
 - lib/pvcglue/templates/memcached.conf.erb
+- lib/pvcglue/templates/monit.app.monitrc.erb
+- lib/pvcglue/templates/monit.etc-default.erb
+- lib/pvcglue/templates/monit.init.d.erb
+- lib/pvcglue/templates/monit.monitrc.erb
+- lib/pvcglue/templates/monit.upstart-conf.erb
 - lib/pvcglue/templates/passenger.list.erb
 - lib/pvcglue/templates/pg_hba.conf.erb
 - lib/pvcglue/templates/postgresql.conf.erb