projects
/
rails.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Localisation updates from https://translatewiki.net.
[rails.git]
/
config
/
example.database.yml
diff --git
a/config/example.database.yml
b/config/example.database.yml
index e075d7f8df7b695cbc53940940e744c5adcf48b2..7e1ffc07d02817f3473b386af159886eeabed4e8 100644
(file)
--- a/
config/example.database.yml
+++ b/
config/example.database.yml
@@
-1,12
+1,12
@@
# Using a recent release (8.3 or higher) of PostgreSQL (http://postgresql.org/) is recommended.
# Using a recent release (8.3 or higher) of PostgreSQL (http://postgresql.org/) is recommended.
-# See http
://wiki.openstreetmap.org/wiki/The_Rails_Port#PostgreSQL_
setup for detailed setup instructions.
+# See http
s://github.com/openstreetmap/openstreetmap-website/blob/master/INSTALL.md#database-
setup for detailed setup instructions.
#
development:
adapter: postgresql
database: openstreetmap
# username: openstreetmap
# password: openstreetmap
#
development:
adapter: postgresql
database: openstreetmap
# username: openstreetmap
# password: openstreetmap
- host: localhost
+
#
host: localhost
encoding: utf8
# Warning: The database defined as 'test' will be erased and
encoding: utf8
# Warning: The database defined as 'test' will be erased and
@@
-17,7
+17,7
@@
test:
database: osm_test
# username: osm_test
# password: osm_test
database: osm_test
# username: osm_test
# password: osm_test
- host: localhost
+
#
host: localhost
encoding: utf8
production:
encoding: utf8
production:
@@
-25,5
+25,5
@@
production:
database: osm
# username: osm
# password: osm
database: osm
# username: osm
# password: osm
- host: localhost
+
#
host: localhost
encoding: utf8
encoding: utf8