In mconf-web-conf: separated the deploy action from the checkout acti…

…on. Almost 100%.

.gitignore

@@ -21,3 +21,4 @@ db/*.sqlite3*
 tmp/*
 .redcar
 db/data.yml
+pids/*

Gemfile

@@ -61,6 +61,7 @@ group :development, :test do
 end
 
 group :production do
-  gem 'god'
+  gem 'god', '0.11.0'
+  gem 'passenger', '3.0.7'
   gem 'exception_notification'
 end

Gemfile.lock

@@ -98,6 +98,7 @@ GEM
     configatron (2.8.0)
       yamler (>= 0.1.0)
     crack (0.1.8)
+    daemon_controller (0.2.6)
     daemons (1.1.4)
     delayed_job (2.1.4)
       activesupport (~> 3.0)
@@ -109,6 +110,7 @@ GEM
     exception_notification (2.4.1)
     exception_notification_rails3 (1.2.0)
     factory_girl (1.3.3)
+    fastthread (1.0.7)
     fckeditor (0.1.0)
     feed-normalizer (1.5.2)
       hpricot (>= 0.6)
@@ -121,6 +123,7 @@ GEM
     garb (0.9.1)
       activesupport (>= 2.2.0)
       crack (>= 0.1.6)
+    god (0.11.0)
     highline (1.6.2)
     hoe (2.9.4)
       rake (>= 0.8.7)
@@ -147,6 +150,11 @@ GEM
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     nokogiri (1.4.1)
+    passenger (3.0.7)
+      daemon_controller (>= 0.2.5)
+      fastthread (>= 1.0.1)
+      rack
+      rake (>= 0.8.1)
     pdf-writer (1.1.8)
       color (>= 1.4.0)
       transaction-simple (~> 1.3)
@@ -241,13 +249,15 @@ DEPENDENCIES
   ffaker
   fuubar
   garb
+  god (= 0.11.0)
   hoe
   hpricot
   htmlentities
   httparty
   jquery-rails (>= 0.2.6)
   mysql2 (~> 0.2.0)
   nokogiri (= 1.4.1)
+  passenger (= 3.0.7)
   pdf-writer
   populator
   prism

config/database.yml.example

@@ -16,6 +16,6 @@ test:
 production:
   adapter: mysql2
   database: mconf_production           # MySQL database name
-  username: mconf                      # MySQL database user
+  username: root                       # MySQL database user
   password: mysecretpass               # MySQL database password
   socket: /var/run/mysqld/mysqld.sock

config/database.yml.mysql.example

@@ -4,7 +4,7 @@ development:
   adapter: mysql2
   database: mconf_development         # mysql database name
   username: root                      # mysql database user
-  password:                           # mysql database password
+  password: secret-pass               # mysql database password
   socket: /var/run/mysqld/mysqld.sock
 
 # Warning: The database defined as 'test' will be erased and
@@ -14,12 +14,12 @@ test:
   adapter: mysql2
   database: mconf_test                # mysql database name
   username: root                      # mysql database user
-  password:                           # mysql database password
+  password: secret-pass               # mysql database password
   socket: /var/run/mysqld/mysqld.sock
 
 production:
   adapter: mysql2
   database: mconf_production          # mysql database name
   username: root                      # mysql database user
-  password:                           # mysql database password
+  password: secret-pass               # mysql database password
   socket: /var/run/mysqld/mysqld.sock

config/deploy.rb

@@ -18,7 +18,7 @@
 # RVM bootstrap
 $:.unshift(File.expand_path('./lib', ENV['rvm_path'])) # Add RVM's lib directory to the load path.
 require "rvm/capistrano"
-set :rvm_ruby_string, '1.9.2@mconf'
+set :rvm_ruby_string, '1.9.2-p290@mconf'
 set :rvm_type, :user
 
 # bundler bootstrap

config/god/delayed_job.god

@@ -10,7 +10,7 @@ RAILS_ENV = "production"
     w.log = "#{RAILS_ROOT}/log/god_delayed_job.log"
     w.start_grace = 30.seconds
     w.restart_grace = 30.seconds
-    # w.pid_file = "#{RAILS_ROOT}/shared/pids/delayed_job.pid"
+    w.pid_file = "#{RAILS_ROOT}/pids/delayed_job.pid"
 
     w.behavior(:clean_pid_file)
 

config/god/init_script

@@ -35,7 +35,7 @@ RETVAL=0
 case "$1" in
   start)
     echo -n "Starting $DESC: "
-    $GOD_BIN -c $GOD_CONFIG -l $GOD_LOG
+    $GOD_BIN -c $GOD_CONFIG -l $GOD_LOG --no-syslog --log-level warn
     RETVAL=$?
     echo "$NAME."
     ;;
@@ -48,7 +48,7 @@ case "$1" in
   restart)
     echo -n "Restarting $DESC: "
     $GOD_BIN quit
-    $GOD_BIN -c $GOD_CONFIG -l $GOD_LOG
+    $GOD_BIN -c $GOD_CONFIG -l $GOD_LOG --no-syslog --log-level warn
     RETVAL=$?
     echo "$NAME."
     ;;