Page MenuHomeGRNET
Files F1090441

No OneTemporary
Actions

File Metadata

Created
Wed, Oct 15, 8:00 AM

View Options

diff --git a/.gitignore b/.gitignore
index 6a502e9..e6170cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,18 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'
# Ignore bundler config.
/.bundle
# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal
+/db/*.local
+/db/database.yml
# Ignore all logfiles and tempfiles.
/log/*.log
/tmp
diff --git a/config/database.yml b/config/database.yml
deleted file mode 100644
index 374e854..0000000
--- a/config/database.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-# MySQL. Versions 5.0+ are recommended.
-#
-# Install the MYSQL driver
-# gem install mysql2
-#
-# Ensure the MySQL gem is defined in your Gemfile
-# gem 'mysql2'
-#
-# And be sure to use new-style password hashing:
-# http://dev.mysql.com/doc/refman/5.0/en/old-client.html
-#
-default: &default
- adapter: mysql2
- encoding: utf8
- pool: 5
- username: root
- password:
- host: localhost
-
-development:
- <<: *default
- database: base_development
-
-# 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:
- <<: *default
- database: base_test
-
-# As with config/secrets.yml, you never want to store sensitive information,
-# like your database password, in your source code. If your source code is
-# ever seen by anyone, they now have access to your database.
-#
-# Instead, provide the password as a unix environment variable when you boot
-# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
-# for a full rundown on how to provide these environment variables in a
-# production deployment.
-#
-# On Heroku and other platform providers, you may have a full connection URL
-# available as an environment variable. For example:
-#
-# DATABASE_URL="mysql2://myuser:mypass@localhost/somedatabase"
-#
-# You can use this database configuration with:
-#
-# production:
-# url: <%= ENV['DATABASE_URL'] %>
-#
-production:
- <<: *default
- database: base_production
- username: base
- password: <%= ENV['BASE_DATABASE_PASSWORD'] %>
diff --git a/config/database.yml.base b/config/database.yml.base
new file mode 100644
index 0000000..1c557fb
--- /dev/null
+++ b/config/database.yml.base
@@ -0,0 +1,14 @@
+default: &default
+ adapter: mysql2
+ encoding: utf8
+ username: base
+ password: base
+ host: localhost
+
+development:
+ <<: *default
+ database: base
+
+test:
+ <<: *default
+ database: base_test

Event Timeline