tvd-unicorn 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/cookbooks/unicorn/recipes/default.rb

@@ -16,17 +16,7 @@ template "#{node[:release_dir]}/libexec/server" do
   mode 0755
 end
 
-template "#{node[:release_dir]}/libexec/unicorn_redeploy" do
-  source "unicorn_redeploy.erb"
-  mode 0755
-end
-
-template "#{node[:release_dir]}/libexec/unicorn_root" do
-  source "unicorn_root.erb"
-  mode 0755
-end
-
-template "#{node[:release_dir]}/libexec/#{node[:app_name]}" do
-  source "init.erb"
+template "#{node[:release_dir]}/libexec/unicorn_#{node[:app_name]}" do
+  source "deploy.erb"
   mode 0755
 end

data/cookbooks/unicorn/templates/default/config.erb

@@ -1,4 +1,4 @@
-Unicorn::HttpServer::START_CTX[0] = "<%= File.join(node[:project_dir], node[:app_dir], "libexec", "unicorn_redeploy") %>"
+Unicorn::HttpServer::START_CTX[0] = "<%= File.join(node[:project_dir], node[:app_dir], "libexec", "unicorn_#{node[:app_name]}") %>"
 
 working_directory "<%= File.join(node[:project_dir], node[:app_dir]) %>"
 pid "<%= File.join(node[:project_dir], node[:run_dir], "unicorn.pid") %>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tvd-unicorn
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: microwave
@@ -36,10 +36,8 @@ files:
 - cookbooks/unicorn/attributes/default.rb
 - cookbooks/unicorn/recipes/default.rb
 - cookbooks/unicorn/templates/default/config.erb
-- cookbooks/unicorn/templates/default/init.erb
+- cookbooks/unicorn/templates/default/deploy.erb
 - cookbooks/unicorn/templates/default/server.erb
-- cookbooks/unicorn/templates/default/unicorn_redeploy.erb
-- cookbooks/unicorn/templates/default/unicorn_root.erb
 - lib/development.rb
 - lib/tvd-unicorn.rb
 - lib/tvd-unicorn/version.rb

data/cookbooks/unicorn/templates/default/init.erb

@@ -1,60 +0,0 @@
-#! /bin/sh
-
-### BEGIN INIT INFO
-# Provides:          <%= node[:app_name] %>
-# Required-Start:    $all
-# Required-Stop:     $all
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: starts the unicorn server for <%= node[:app_name] %>
-# Description:       starts unicorn server for <%= node[:app_name] %> using start-stop-daemon
-### END INIT INFO
-
-NAME="<%= node[:app_name] %>"
-DESC="unicorn for $NAME"
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON="<%= File.join(node[:project_dir], node[:app_dir], "libexec", "unicorn_root") %>"
-PIDFILE="<%= File.join(node[:project_dir], node[:run_dir], "unicorn.pid") %>"
-
-set -e
-
-. /lib/lsb/init-functions
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		--exec $DAEMON start || true
-	echo "$NAME."
-	;;
-
-  stop)
-	echo -n "Stopping $DESC: "
-    kill -TERM $(cat $PIDFILE) || true
-	echo "$NAME."
-	;;
-
-  restart|force-reload)
-	echo -n "Restarting $DESC: "
-    kill -TERM $(cat $PIDFILE) || true
-	sleep 1
-	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-        --exec $DAEMON start || true
-	echo "$NAME."
-	;;
-  reload)
-      echo -n "Reloading $DESC configuration: "
-      kill -USR2 $(cat $PIDFILE) || true
-      echo "$NAME."
-      ;;
-  status)
-      status_of_proc -p $PIDFILE "$DAEMON" $NAME && exit 0 || exit $?
-      ;;
-  *)
-	N=/etc/init.d/$NAME
-	echo "Usage: $N {start|stop|restart|reload|force-reload|status}" >&2
-	exit 1
-	;;
-esac
-
-exit 0

data/cookbooks/unicorn/templates/default/unicorn_root.erb

@@ -1,4 +0,0 @@
-#!/bin/bash -e
-
-cd "<%= File.join(node[:project_dir], node[:app_dir]) %>"
-exec sudo -u <%= node[:app_user] %> libexec/server unicorn start