rubber-postgresql.yml in rubber-1.15.0

- old
+ new

@@ -1,7 +1,7 @@
 
-# REQUIRED: The credentials for creating/accessong your app's database
+# REQUIRED: The credentials for creating/accessing your app's database
 #
 db_user: "#{app_name[0,16]}"
 db_pass:
 db_name: "#{app_name}_#{RUBBER_ENV}"
 
@@ -14,22 +14,22 @@
 
 # REQUIRED: The command to use to restore the database using
 #           "rake rubber:restore_db_s3"
 #           This command will receive the data generated by db_backup_cmd via
 #           its standard input
-db_restore_cmd: "zcat - | psql -Uroot -h %host% %name%"
+db_restore_cmd: "zcat - | psql -U postgres -h %host% %name%"
 
 postgresql_ver: 9.0
 postgresql_conf_dir: "/etc/postgresql/#{postgresql_ver}/main"
-postgresql_data_dir: /mnt/postgresql/data
-postgresql_archive_dir: /mnt/postgresql/archive
+postgresql_data_dir: "/mnt/postgresql/#{postgresql_ver}/data"
+postgresql_archive_dir: "/mnt/postgresql/#{postgresql_ver}/archive"
 postgresql_pid_file: "/var/run/postgresql/#{postgresql_ver}-main.pid"
 postgresql_ctl: "/usr/bin/env service postgresql"
 
 # Capistrano needs db:primary role for migrate to work,
 # so we might as well just make consistent across the board
 role_dependencies:
-  postgresql_master: [db:primary=true]
+  postgresql_master: ["db:primary=true"]
   postgresql_slave: [db]
   db:primary=true: [postgresql_master]
   db: [postgresql_slave]
 
 packages: [postgresql-client, libpq-dev]