standup 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/scripts/delayed_job/delayed_job_monit.conf

@@ -0,0 +1,4 @@
+check process delayed_job
+    with pidfile /opt/webapp/tmp/pids/delayed_job.pid
+    start program = "/usr/bin/env PATH=$PATH:/usr/local/bin RAILS_ENV=production /opt/webapp/script/delayed_job start"
+    stop  program = "/usr/bin/env PATH=$PATH:/usr/local/bin RAILS_ENV=production /opt/webapp/script/delayed_job stop"

data/scripts/delayed_job.rb

@@ -0,0 +1,9 @@
+Standup.script do
+  def run
+    scripts.monit.add_watch script_file('delayed_job_monit.conf')
+  end
+  
+  def restart
+    scripts.monit.restart_watch 'delayed_job'
+  end
+end

data/scripts/monit/monit

@@ -0,0 +1,11 @@
+# Defaults for monit initscript
+# sourced by /etc/init.d/monit
+# installed at /etc/default/monit by maintainer scripts
+# Stefan Alfredsson <alfs@debian.org>
+
+# You must set this variable to for monit to start
+startup=1
+
+# To change the intervals which monit should run,
+# edit the configuration file /etc/monit/monitrc
+# It can no longer be configured here.

data/scripts/monit/monitrc

@@ -0,0 +1,9 @@
+set daemon 60
+    with start delay 60
+
+set logfile /var/log/monit.log
+
+set httpd port 2812
+    allow localhost
+
+include /etc/monit/conf.d/*

data/scripts/monit/sshd.conf

@@ -0,0 +1,5 @@
+check process sshd with pidfile /var/run/sshd.pid
+    start program  "/etc/init.d/ssh start"
+    stop  program  "/etc/init.d/ssh stop"
+    if failed port 22 protocol ssh then restart
+    if 5 restarts within 5 cycles then timeout

data/scripts/monit.rb

@@ -0,0 +1,26 @@
+Standup.script do
+  def run
+    install_package 'monit'
+    
+    upload script_file('monitrc'),
+           :to => '/etc/monit',
+           :sudo => true
+    upload script_file('monit'),
+           :to => '/etc/default/monit',
+           :sudo => true
+    
+    add_watch script_file('sshd.conf')
+  end
+  
+  def add_watch file, name = File.basename(file), restart = true
+    upload file,
+           :to => "/etc/monit/conf.d/#{name}",
+           :sudo => true
+    
+    sudo '/etc/init.d/monit restart' if restart
+  end
+  
+  def restart_watch name
+    sudo "monit restart #{name}"
+  end
+end

data/scripts/passenger/nginx

@@ -0,0 +1,254 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          nginx
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: nginx init.d script for Ubuntu 8.10 and lesser versions.
+# Description:       nginx init.d script for Ubuntu 8.10 and lesser versions.
+### END INIT INFO
+#------------------------------------------------------------------------------
+# nginx - this script, which starts and stops the nginx daemon for ubuntu.
+#
+# description:  Nginx is an HTTP(S) server, HTTP(S) reverse \
+#               proxy and IMAP/POP3 proxy server.  This \
+#		script will manage the initiation of the \
+#		server and it's process state.
+#
+# processname: nginx
+# config:      /usr/local/nginx/conf/nginx.conf
+# pidfile:     /acronymlabs/server/nginx.pid
+# Provides:    nginx
+#
+# Author:  Jason Giedymin
+#          <jason.giedymin AT acronymlabs.com>.
+#
+# Version: 1.0 01-Apr-2009 jason.giedymin AT gmail.com
+# Notes: nginx init.d script for Ubuntu 8.10 and lesser versions.
+#
+#------------------------------------------------------------------------------
+#                               MIT X11 License
+#------------------------------------------------------------------------------
+#
+# Copyright (c) 2009 Jason Giedymin, http://AcronymLabs.com
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#------------------------------------------------------------------------------
+
+#------------------------------------------------------------------------------
+#                               Functions
+#------------------------------------------------------------------------------
+. /lib/lsb/init-functions
+
+#------------------------------------------------------------------------------
+#                               Consts
+#------------------------------------------------------------------------------
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/opt/nginx/sbin/nginx
+
+PS="nginx"
+PIDNAME="nginx"				#Lets you do $PS-Master or $PS-Slave
+PIDFILE=$PIDNAME.pid                    #pid file
+PIDSPATH=/var/run
+DESCRIPTION="Nginx Server..."
+
+RUNAS=root				#user to run as
+
+SCRIPT_OK=0				#ala error codes
+SCRIPT_ERROR=1				#ala error codes
+TRUE=1					#boolean
+FALSE=0					#boolean
+
+lockfile=/var/lock/subsys/nginx
+NGINX_CONF_FILE="/opt/nginx/conf/nginx.conf"
+
+#------------------------------------------------------------------------------
+#                               Simple Tests
+#------------------------------------------------------------------------------
+
+#test if nginx is a file and executable
+test -x $DAEMON || exit 0
+
+# Include nginx defaults if available
+if [ -f /etc/default/nginx ] ; then
+        . /etc/default/nginx
+fi
+
+#set exit condition
+#set -e
+
+#------------------------------------------------------------------------------
+#                               Functions
+#------------------------------------------------------------------------------
+
+setFilePerms(){
+
+        if [ -f $PIDSPATH/$PIDFILE ]; then
+                chmod -f 400 $PIDSPATH/$PIDFILE
+        fi
+}
+
+configtest() {
+	$DAEMON -t -c $NGINX_CONF_FILE
+}
+
+getPSCount() {
+	return `pgrep -f $PS | wc -l`
+}
+
+isRunning(){
+	pidof_daemon
+	PID=$?
+
+	if [ $PID -gt 0 ]; then
+		return 1
+        else
+                return 0
+        fi
+}
+
+status(){
+	isRunning
+	isAlive=$?
+
+	if [ "${isAlive}" -eq $TRUE ]; then
+                echo "$PIDNAME found running with processes:  `pidof $PS`"
+        else
+                echo "$PIDNAME is NOT running."
+        fi
+
+
+}
+
+removePIDFile(){
+	if [ -f $PIDSPATH/PIDFILE ]; then
+        	rm -f $PIDSPATH/$PIDFILE
+        fi
+}
+
+start() {
+        log_daemon_msg "Starting $DESCRIPTION"
+	
+	isRunning
+	isAlive=$?
+	
+        if [ "${isAlive}" -eq $TRUE ]; then
+                log_end_msg $SCRIPT_ERROR
+        else
+                start-stop-daemon --start --quiet --chuid $RUNAS --pidfile $PIDSPATH/$PIDFILE --exec $DAEMON
+                setFilePerms
+		log_end_msg $SCRIPT_OK
+        fi
+}
+
+stop() {
+	log_daemon_msg "Stopping $DESCRIPTION"
+	
+	isRunning
+	isAlive=$?
+        if [ "${isAlive}" -eq $TRUE ]; then
+                start-stop-daemon --stop --quiet --pidfile $PIDSPATH/$PIDFILE
+
+		removePIDFile
+
+                log_end_msg $SCRIPT_OK
+        else
+                log_end_msg $SCRIPT_ERROR
+        fi
+}
+
+reload() {
+	configtest || return $?
+
+	log_daemon_msg "Reloading (via HUP) $DESCRIPTION"
+
+        isRunning
+        if [ $? -eq $TRUE ]; then
+		`killall -HUP $PS` #to be safe
+
+                log_end_msg $SCRIPT_OK
+        else
+                log_end_msg $SCRIPT_ERROR
+        fi
+}
+
+terminate() {
+        log_daemon_msg "Force terminating (via KILL) $DESCRIPTION"
+        
+	PIDS=`pidof $PS` || true
+
+	[ -e $PIDSPATH/$PIDFILE ] && PIDS2=`cat $PIDSPATH/$PIDFILE`
+
+	for i in $PIDS; do
+		if [ "$i" = "$PIDS2" ]; then
+	        	kill $i
+			removePIDFile
+		fi
+	done
+
+	log_end_msg $SCRIPT_OK
+
+}
+
+pidof_daemon() {
+    PIDS=`pidof $PS` || true
+
+    [ -e $PIDSPATH/$PIDFILE ] && PIDS2=`cat $PIDSPATH/$PIDFILE`
+
+    for i in $PIDS; do
+        if [ "$i" = "$PIDS2" ]; then
+            return 1
+        fi
+    done
+    return 0
+}
+
+case "$1" in
+  start)
+	start
+        ;;
+  stop)
+	stop
+        ;;
+  restart|force-reload)
+	stop
+	start
+        ;;
+  reload)
+	$1
+	;;
+  status)
+	status
+	;;
+  configtest)
+        $1
+        ;;
+  terminate)
+	$1
+	;;
+  *)
+	FULLPATH=/etc/init.d/$PIDNAME
+	echo "Usage: $FULLPATH {start|stop|restart|force-reload|status|configtest|terminate}"
+	exit 1
+	;;
+esac
+
+exit 0

data/scripts/passenger/nginx.conf

@@ -1,6 +1,8 @@
 #user  nobody;
 worker_processes  1;
 
+pid /var/run/nginx.pid;
+
 events {
     worker_connections  1024;
 }

data/scripts/passenger/nginx_monit.conf

@@ -0,0 +1,4 @@
+check process nginx with pidfile /var/run/nginx.pid
+    start program = "/etc/init.d/nginx start"
+    stop  program = "/etc/init.d/nginx stop"
+    if 5 restarts within 5 cycles then timeout

data/scripts/passenger.rb

@@ -13,19 +13,19 @@ Standup.script do
            :to =>'/opt/nginx/conf/nginx.conf',
            :sudo => true
     
-    upload script_file('upstart.conf'),
-           :to =>'/etc/init/nginx.conf',
+    upload script_file('nginx'),
+           :to =>'/etc/init.d/nginx',
            :sudo => true
-    sudo 'initctl reload-configuration'
+    
+    sudo 'chmod +x /etc/init.d/nginx'
+    sudo '/usr/sbin/update-rc.d -f nginx defaults'
+    
+    scripts.monit.add_watch script_file('nginx_monit.conf')
     
     restart_nginx
   end
   
   def restart_nginx
-    if exec('initctl status nginx') =~ /running/i
-      sudo 'initctl restart nginx'
-    else
-      sudo 'initctl start nginx'
-    end
+    scripts.monit.restart_watch 'nginx'
   end
 end

data/scripts/setup.rb

@@ -1,11 +1,15 @@
 Standup.script do
   self.description = 'Do all setup from scratch and/or incrementally'
   
-  self.default_params =  'ec2 basics ruby postgresql passenger webapp update'
+  self.default_params =  'ec2 basics monit ruby postgresql passenger webapp update'
   
   def run
     params.strip.split.each do |name|
       scripts[name].titled_run
     end
   end
+  
+  def has_script? name
+    params.strip.split.include? name
+  end
 end

data/scripts/update.rb

@@ -10,6 +10,7 @@ Standup.script do
       sudo 'mkdir -p tmp'
       sudo 'chown -R nobody:nogroup /opt/webapp'
       sudo 'touch tmp/restart.txt'
+      scripts.delayed_job.restart if scripts.setup.has_script? 'delayed_job'
     end
   end
 end

data/standup.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{standup}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilia Ablamonov", "Cloud Castle Inc."]
@@ -39,15 +39,22 @@ Gem::Specification.new do |s|
      "scripts/allocate_ip.rb",
      "scripts/appconsole.rb",
      "scripts/basics.rb",
+     "scripts/delayed_job.rb",
+     "scripts/delayed_job/delayed_job_monit.conf",
      "scripts/ec2.rb",
      "scripts/generate.rb",
      "scripts/generate/script.rb",
      "scripts/init.rb",
      "scripts/init/standup.yml",
      "scripts/localize.rb",
+     "scripts/monit.rb",
+     "scripts/monit/monit",
+     "scripts/monit/monitrc",
+     "scripts/monit/sshd.conf",
      "scripts/passenger.rb",
+     "scripts/passenger/nginx",
      "scripts/passenger/nginx.conf",
-     "scripts/passenger/upstart.conf",
+     "scripts/passenger/nginx_monit.conf",
      "scripts/postgresql.rb",
      "scripts/postgresql/postgresql.conf",
      "scripts/ruby.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: standup
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Ilia Ablamonov
@@ -156,15 +156,22 @@ files:
 - scripts/allocate_ip.rb
 - scripts/appconsole.rb
 - scripts/basics.rb
+- scripts/delayed_job.rb
+- scripts/delayed_job/delayed_job_monit.conf
 - scripts/ec2.rb
 - scripts/generate.rb
 - scripts/generate/script.rb
 - scripts/init.rb
 - scripts/init/standup.yml
 - scripts/localize.rb
+- scripts/monit.rb
+- scripts/monit/monit
+- scripts/monit/monitrc
+- scripts/monit/sshd.conf
 - scripts/passenger.rb
+- scripts/passenger/nginx
 - scripts/passenger/nginx.conf
-- scripts/passenger/upstart.conf
+- scripts/passenger/nginx_monit.conf
 - scripts/postgresql.rb
 - scripts/postgresql/postgresql.conf
 - scripts/ruby.rb

data/scripts/passenger/upstart.conf

@@ -1,10 +0,0 @@
-description "nginx http daemon"
-
-start on runlevel [2]
-stop on runlevel [016]
-
-console output
-
-exec /opt/nginx/sbin/nginx -c /opt/nginx/conf/nginx.conf -g "daemon off;"
-
-respawn