diff --git a/.gitignore b/.gitignore index abc0826a7..6a62d5629 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ -/config/database.yml /.project /.bundle +/config/database.yml /files/* /log/* /test/* diff --git a/.hgignore b/.hgignore deleted file mode 100644 index 9fde48651..000000000 --- a/.hgignore +++ /dev/null @@ -1,39 +0,0 @@ -syntax: glob - -.project -.loadpath -config/additional_environment.rb -config/configuration.yml -config/database.yml -config/email.yml -config/initializers/session_store.rb -config/initializers/secret_token.rb -coverage -db/*.db -db/*.sqlite3 -db/schema.rb -files/* -lib/redmine/scm/adapters/mercurial/redminehelper.pyc -lib/redmine/scm/adapters/mercurial/redminehelper.pyo -log/*.log* -log/mongrel_debug -public/dispatch.* -public/plugin_assets -tmp/* -tmp/cache/* -tmp/pdf/* -tmp/sessions/* -tmp/sockets/* -tmp/test/* -tmp/thumbnails/* -vendor/cache -vendor/rails -*.rbc - -.svn/ -.git/ - -.bundle -Gemfile.lock -Gemfile.local - diff --git a/config/database.yml b/config/database.yml deleted file mode 100644 index c8199efdb..000000000 --- a/config/database.yml +++ /dev/null @@ -1,62 +0,0 @@ -# Default setup is given for MySQL with ruby1.9. If you're running Redmine -# with MySQL and ruby1.8, replace the adapter name with `mysql`. -# Examples for PostgreSQL, SQLite3 and SQL Server can be found at the end. -# Line indentation must be 2 spaces (no tabs). - -production: - adapter: mysql2 - database: trustie - host: 10.107.17.20 - #socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock - port: 3306 - username: root - password: "1234" - encoding: utf8 - -development: - adapter: mysql2 - database: trustie - host: 10.107.17.20 - #socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock - port: 3306 - username: root - password: "1234" - encoding: utf8 - -# 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: mysql2 - database: trustie_test - host: 10.107.17.20 - socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock - port: 3306 - username: root - password: "1234" - encoding: utf8 - -# PostgreSQL configuration example -#production: -# adapter: mysql2 -# database: bitnami_redmine -# host: localhost -# socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock -# port: 3306 -# username: bitnami -# password: "c16af1e560" - -# SQLite3 configuration example -#production: -# adapter: mysql2 -# database: bitnami_redmine - -# SQL Server configuration example -#production: -# adapter: mysql2 -# database: bitnami_redmine -# host: localhost -# socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock -# port: 3306 -# username: bitnami -# password: "c16af1e560"