gistfile1.txt

dan@app05:/nutricate/production/app$ git status
# On branch deploy
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#  modified:   admin/config/email.yml
#	modified:   admin/config/environments/admin.rb
#	modified:   admin/config/initializers/recaptcha.rb
#	modified:   instance/init_scripts/admin
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	admin/public/install
no changes added to commit (use "git add" and/or "git commit -a")

thing.diff

dan@app05:/nutricate/production/app$ git diff
diff --git a/admin/config/email.yml b/admin/config/email.yml
index 018be0d..f0d1ab1 100644
--- a/admin/config/email.yml
+++ b/admin/config/email.yml
@@ -1,39 +1,11 @@
-#  admin
+++ b/admin/config/email.yml
@@ -1,39 +1,11 @@
-#  admin
-#    delivery_method: :smtp
-#    perform_deliveries: true
-#    default_content_type: text/plain
-#    smtp_settings:
-#      address: mail01.nutricateonline.com
-#      port: 25
-#      domain: nutricateonline.com
-#  admin
-#    delivery_method: :smtp
-#    perform_deliveries: true
-#    default_content_type: text/plain
-#    smtp_settings:
-#      address: mail01.nutricateonline.com
-#      port: 25
-#      domain: nutricateonline.com
-#      authentication: plain
-#      user_name: mail@nutricateonline.com
-#      password: nutricate4me
-#      tls: true ????
-
 admin:
-  delivery_method: :test
-  perform_deliveries: false
-  default_content_type: text/plain
-
-test:
-  delivery_method: :test
-  perform_deliveries: false
-  default_content_type: text/plain
-  smtp_settings:
-    address: smtp.server.com
-    port: 25
-    authentication: plain
-    user_name: user
-    password: pass
-
-development:
-  delivery_method: :test
-  perform_deliveries: false
+  delivery_method: :smtp
+  perform_deliveries: true
   default_content_type: text/plain
   smtp_settings:
-    address: smtp.server.com
+#  mail02
+    address: 10.177.219.2
     port: 25
-    authentication: plain
-    user_name: user
-    password: pass
+    authentication: none
+    tls: false
+    domain: www.receipt.com
diff --git a/admin/config/environments/admin.rb b/admin/config/environments/admin.
index d6418a1..9bb63ef 100644
--- a/admin/config/environments/admin.rb
+++ b/admin/config/environments/admin.rb
@@ -1,5 +1,6 @@
 # Settings specified here will take precedence over those in config/environment.r
 config.log_level = :info
+
 # In the development environment your application's code is reloaded on
 # every request.  This slows down response time but is perfect for development
 # since you don't have to restart the webserver when you make code changes.
@@ -24,3 +25,4 @@ config.action_mailer.default_url_options = { :host => "admin.rec

 # Default Spawn to use threading for production mode
 Spawn::default_options(:method => :thread)
+
diff --git a/admin/config/initializers/recaptcha.rb b/admin/config/initializers/re
index e321954..f623608 100644
+
diff --git a/admin/config/initializers/recaptcha.rb b/admin/config/initializers/re
index e321954..f623608 100644
-
-development:
-  delivery_method: :test
-  perform_deliveries: false
+  delivery_method: :smtp
+  perform_deliveries: true
   default_content_type: text/plain
   smtp_settings:
-    address: smtp.server.com
+#  mail02
+    address: 10.177.219.2
     port: 25
-    authentication: plain
-    user_name: user
-    password: pass
+    authentication: none
+    tls: false
+    domain: www.receipt.com
diff --git a/admin/config/environments/admin.rb b/admin/config/environments/admin.
index d6418a1..9bb63ef 100644
--- a/admin/config/environments/admin.rb
+++ b/admin/config/environments/admin.rb
@@ -1,5 +1,6 @@
 # Settings specified here will take precedence over those in config/environment.r
 config.log_level = :info
+
 # In the development environment your application's code is reloaded on
 # every request.  This slows down response time but is perfect for development
 # since you don't have to restart the webserver when you make code changes.
@@ -24,3 +25,4 @@ config.action_mailer.default_url_options = { :host => "admin.rec

 # Default Spawn to use threading for production mode
 Spawn::default_options(:method => :thread)
+
diff --git a/admin/config/initializers/recaptcha.rb b/admin/config/initializers/re
index e321954..f623608 100644
--- a/admin/config/initializers/recaptcha.rb
+++ b/admin/config/initializers/recaptcha.rb
@@ -1,6 +1,4 @@
-# staging
 Recaptcha.configure do |config|
-  config.public_key  = '6Le8dMwSAAAAADbKqy9Swu1_BQVKePLF4vr7d813'
-  config.private_key = '6Le8dMwSAAAAAEGe0MaWwxUepHgfkrI7IXE7BSO9'
+  config.public_key  = '6Lfuc8wSAAAAAKQPDAdgnt2g6Zntk79jAVUAx6Zl'
+  config.private_key = '6Lfuc8wSAAAAACTUbnbHv7AzLVR75pwTP8wVWIr4'
 end
-
diff --git a/instance/init_scripts/admin b/instance/init_scripts/admin
index bdf1577..153ac34 100755
--- a/instance/init_scripts/admin
+++ b/instance/init_scripts/admin
@@ -68,7 +68,7 @@ source_appenv

 # compatibility with dev01
 WWW_MONGREL_RAILS=/www/bin/mongrel_rails
-MONGREL_RAILS=/usr/local/bin/admin_mongrel_rails
+MONGREL_RAILS="rvm 1.8.7 exec mongrel_rails"
 if [ -e ${WWW_MONGREL_RAILS} ]; then
     MONGREL_RAILS=${WWW_MONGREL_RAILS}
 fi;