aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2013-06-13 22:46:32 +0200
committerHarald Eilertsen <haraldei@anduin.net>2013-06-13 22:48:20 +0200
commit5d91fe446f1aab0bb71db537305dde9496574944 (patch)
tree5d8767e941603c9898938b6e49bfb73f88d15fb9 /config
parentadaed6db74ee721e6a987454addb6b2e4c13b1e5 (diff)
downloadhmnoweb-5d91fe446f1aab0bb71db537305dde9496574944.tar.gz
hmnoweb-5d91fe446f1aab0bb71db537305dde9496574944.tar.bz2
hmnoweb-5d91fe446f1aab0bb71db537305dde9496574944.zip
Add generic database template.
Diffstat (limited to 'config')
-rw-r--r--config/deploy/database.rb2
-rw-r--r--config/deploy/database.yml.erb44
-rw-r--r--config/deploy/database.yml.mysql21
3 files changed, 45 insertions, 22 deletions
diff --git a/config/deploy/database.rb b/config/deploy/database.rb
index 68236d1..a42e6e6 100644
--- a/config/deploy/database.rb
+++ b/config/deploy/database.rb
@@ -131,7 +131,7 @@ Capistrano::Configuration.instance.load do
<<: *base
EOF
- location = fetch(:template_dir, "config/deploy") + '/database.yml.mysql'
+ location = fetch(:template_dir, "config/deploy") + '/database.yml.erb'
template = File.file?(location) ? File.read(location) : default_template
config = ERB.new(template)
diff --git a/config/deploy/database.yml.erb b/config/deploy/database.yml.erb
new file mode 100644
index 0000000..372b0d4
--- /dev/null
+++ b/config/deploy/database.yml.erb
@@ -0,0 +1,44 @@
+development:
+ adapter: postgresql
+ encoding: unicode
+ database:
+ pool: 5
+ username:
+ password:
+ min_messages: warning
+
+ # Connect on a TCP socket. Omitted by default since the client uses a
+ # domain socket that doesn't need configuration. Windows does not have
+ # domain sockets, so uncomment these lines.
+ #host: localhost
+ #port: 5432
+
+ # Schema search path. The server defaults to $user,public
+ #schema_search_path: myapp,sharedapp,public
+
+ # Minimum log levels, in increasing order:
+ # debug5, debug4, debug3, debug2, debug1,
+ # log, notice, warning, error, fatal, and panic
+ # The server defaults to notice.
+ #min_messages: warning
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+ adapter: postgresql
+ encoding: unicode
+ database:
+ pool: 5
+ username:
+ password:
+ min_messages: warning
+
+production:
+ adapter: postgresql
+ encoding: unicode
+ database: hmno_main
+ pool: 5
+ username: <%= Capistrano::CLI.ui.ask("Enter Database username: ") %>
+ password: <%= Capistrano::CLI.ui.ask("Enter Database password: ") %>
+ min_messages: warning
diff --git a/config/deploy/database.yml.mysql b/config/deploy/database.yml.mysql
deleted file mode 100644
index 389a9b2..0000000
--- a/config/deploy/database.yml.mysql
+++ /dev/null
@@ -1,21 +0,0 @@
-development: &development
- adapter: mysql2
- host: localhost
- username: root
- password:
- database: your_local_database
-
-test: &test
- adapter: mysql2
- host: localhost
- username: root
- password:
- database: your_test_database
-
-production: &production
- adapter: mysql2
- host: localhost
- database: your_production_database
- username: your_db_admin
- password: <%= Capistrano::CLI.ui.ask("Enter MySQL password: ") %>
- encoding: utf8