Merge branch 'kaustubh-nair-patch-3' of https://github.com/publiclab/…

…mapknitter into kaustubh-nair-patch-3
publiclab · Jun 26, 2019 · 08b6de8 · 08b6de8
2 parents df95f15 + a32bd02
commit 08b6de8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/config/database.yml.cloud9.example b/config/database.yml.cloud9.example
@@ -5,18 +5,21 @@ default: &default
 
 development:
   <<: *default
-  username: 
-  password: 
+  username:
+  password:
   database: mapknitter_dev
 
 production:
-  <<: *default
-  username: root
-  password: 
+  adapter: mysql2
+  encoding: utf8
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  host: db
+  username: mapknitter
+  password: mapknitter
   database: mapknitter
 
 test:
   <<: *default
   username:
   password:
-  database: mapknitter_test
+  database: mapknitter_test
diff --git a/config/database.yml.example b/config/database.yml.example
@@ -11,13 +11,16 @@ development:
   database: mapknitter_dev
 
 production:
-  <<: *default
-  username: root
-  password:
+  adapter: mysql2
+  encoding: utf8
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  host: db
+  username: mapknitter
+  password: mapknitter
   database: mapknitter
 
 test:
   <<: *default
   username:
   password:
-  database: mapknitter_test
+  database: mapknitter_test