Removed config/database.yml before I put anything sensitive into it.

diff --git a/.gitignore b/.gitignore
index 1506817ba940cda24c131ac6105f4a6f58a5278c..37dfd83038b093cdcdf820876fb5136fcfe60847 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,9 @@ pickle-email-*.html
 config/initializers/secret_token.rb
 config/secrets.yml
 
+config/database.yml
+config/deploy.rb
+
 ## Environment normalisation:
 /.bundle
 /vendor/bundle

diff --git a/README.rdoc b/README.rdoc
index 6bd3af8588d9ba0736323c66216d808a26f6a50a..0cf3c2a99d804011f0694e57f4dcf0f03a58b215 100644 (file)
--- a/README.rdoc
+++ b/README.rdoc
@@ -8,7 +8,7 @@ Feel free to clone and modify this application. Let me know what you do with it!
 == Installation
 Feedcatcher is written in Rails 4.0.2 and runs on Ruby 2.1.0. 
 
-You'll need to update the create the +database.yml+ and +deploy.rb+ files for your installation. You can use the +database.sample.yml+ and +deploy.sample.rb+ files as templates. In particular, +deploy.sample.rb+ still refers to when feedcatcher was stored in a Subversion repository.
+You'll need to update the create the +database.yml+ and +deploy.rb+ files for your installation. You can use the +database.sample.yml+ and +deploy.sample.rb+ files as templates. 
 
 == Instructions
 Visiting http://feedcatcher.example.com in a browser will give you an HTML view of the feeds available.  

diff --git a/config/database-sample.yml b/config/database-sample.yml
new file mode 100644 (file)
index 0000000..9124652
--- /dev/null
+++ b/config/database-sample.yml
@@ -0,0 +1,62 @@
+# PostgreSQL. Versions 8.2 and up are supported.
+#
+# Install the pg driver:
+#   gem install pg
+# On OS X with Homebrew:
+#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
+# On OS X with MacPorts:
+#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
+# On Windows:
+#   gem install pg
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
+#
+# Configure Using Gemfile
+# gem 'pg'
+#
+development:
+  adapter: postgresql
+  encoding: unicode
+  database: feedcatcher_development
+  host: localhost
+  pool: 5
+  username: feedcatcher
+  password: development_password_here
+
+  # 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
+
+  # The TCP port the server listens on. Defaults to 5432.
+  # If your server runs on a different port number, change accordingly.
+  #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
+  # Defaults to warning.
+  #min_messages: notice
+
+# 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: feedcatcher_test
+  host: localhost
+  pool: 5
+  username: feedcatcher
+  password: test_password_here
+
+production:
+  adapter: postgresql
+  encoding: unicode
+  database: feedcatcher_production
+  pool: 5
+  username: feedcatcher
+  password: production_password_here