Permalink
Browse files

Merge conflict resolution.

  • Loading branch information...
wayneeseguin committed Aug 5, 2012
2 parents cf1c3db + 115c4d7 commit 913aebc01ab25f1a93777630aaf842b870b6f10d
Showing with 22 additions and 29 deletions.
  1. +2 −9 thin/bin/restart
  2. +2 −9 thin/bin/start
  3. +2 −9 thin/bin/stop
  4. +1 −0 thin/shell/includes
  5. +13 −0 thin/shell/initialize
  6. +1 −1 unicorn/bin/restart
  7. +1 −1 unicorn/bin/setup
View
@@ -1,18 +1,11 @@
#!/bin/sh
-if user is root
-then
- log error "Thin ${action} may be run only as a non-root user."
-fi
-
-source "$HOME/.env" # This file should load the ruby environment & define 'port'
-
exec thin restart \
--address 0.0.0.0 \
--environment ${environment} \
--chdir "$HOME/active/${project}" \
--log "$HOME/shared/log/${environment}.log" \
--tag ${project}:${environment} \
- --port ${port} -s2 \
- --pid /var/run/${project}/thin.pid
+ --port ${port} -s${thin_worker} \
+ --pid "$HOME/shared/pids/${project}.pid"
View
@@ -1,18 +1,11 @@
#!/bin/sh
-if user is root
-then
- log error "Thin ${action} may be run only as a non-root user."
-fi
-
-source "$HOME/.env" # This file should load the ruby environment & define 'port'
-
exec thin start \
--address 0.0.0.0 \
--environment ${environment} \
--chdir "$HOME/active/${project}" \
--log "$HOME/shared/log/${environment}.log" \
--tag ${project}:${environment} \
- --port ${port} -s2 \
- --pid /var/run/${project}/thin.pid
+ --port ${port} -s${thin_worker} \
+ --pid "$HOME/shared/pids/${project}.pid"
View
@@ -1,18 +1,11 @@
#!/bin/sh
-if user is root
-then
- log error "Thin ${action} may be run only as a non-root user."
-fi
-
-source "$HOME/.env" # This file should load the ruby environment & define 'port'
-
exec thin stop \
--address 0.0.0.0 \
--environment ${environment} \
--chdir "$HOME/active/${project}" \
--log "$HOME/shared/log/${environment}.log" \
--tag ${project}:${environment} \
- --port ${port} -s2 \
- --pid /var/run/${project}/thin.pid
+ --port ${port} -s${thin_worker} \
+ --pid "$HOME/shared/pids/${project}.pid"
View
@@ -1 +1,2 @@
api/user
+api/variables
View
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if user is root
+then
+ log error "Thin ${action} may be run only as a non-root user."
+fi
+
+if variable is empty thin_worker
+then
+ export thin_worker=2
+fi
+
+source "$HOME/.env" # This file should load the ruby environment & define 'port'
View
@@ -9,7 +9,7 @@ then
if files are nonempty "$release_path/config/unicorn.rb"
then
log "Unicorn herd master not found running for $project $environment, starting."
- unicorn_start
+ sm unicorn start
else
log fail "config/unicorn.rb not found, aborting start."
fi
View
@@ -6,7 +6,7 @@ if templates exist "unicorn/unicorn.rb"
then
paths create "$shared_path/config"
- templates install "unicorn/unicorn.rb" to "${shared_path}/config/"
+ templates install "unicorn/unicorn.rb" to "${shared_path}/config/unicorn.rb"
log succeed "Setup complete."
else

0 comments on commit 913aebc

Please sign in to comment.