changing the vars to match basic recipe

fagiani · Jan 21, 2012 · abd0ab8 · abd0ab8
1 parent ad6ffd1
commit abd0ab8
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/recipes/rails b/recipes/rails
@@ -14,10 +14,6 @@ function defaults_rails {
   R_ENV="production"
   RUBY_RELEASE="p290"
   REDIS_VERSION="2.2.4"
-  DEPLOY_USER="app"
-  DEPLOY_PASSWORD="myd3pl0ypwd"
-  DEPLOY_SSHKEY="ucm081u3c4083muc408312muc40832m1cu40832cmu40mcu41cm018cmu40218m"
-  NEW_HOSTNAME="appserver"
   BLUEPILL_CONFIG="/home/app/production/current/config/bluepill/production.pill"
 }
 
@@ -34,18 +30,14 @@ function install_rails {
 	install_redis
         case "$DATABASE_TYPE" in
           mysql)
-            install_mysql $DATABASE_PASSWORD
+            install_mysql $DATABASE_PASSWORD && tune_mysql 40
-            tune_mysql 40
             ;;
           pgsql)
-            install_pgsql $DATABASE_PASSWORD
+            install_pgsql $DATABASE_PASSWORD && tune_pgsql 30
-            tune_pgsql 30
             ;;
           *)
-            install_mysql $DATABASE_PASSWORD
+            install_mysql $DATABASE_PASSWORD && tune_mysql 40
-            tune_mysql 40
+            install_postgresql $DATABASE_PASSWORD && tune_postgresql 30
-            install_postgresql $DATABASE_PASSWORD
-            tune_postgresql 30
             ;;
         esac
 }