3 files changed, 11 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 8e045dd..48b7cac 100644
--- a/.gitignore
+++ b/.gitignore

@@ -35,3 +35,5 @@
 /config/master.key
 .DS_Store
+/config/credentials/production.key
diff --git a/config/credentials/production.yml.enc b/config/credentials/production.yml.enc
new file mode 100644
index 0000000..1a23841
--- /dev/null
+++ b/config/credentials/production.yml.enc

@@ -0,0 +1 @@
+36aFPYK5AHgjGYB6U/N1g9C8MEPeVSZxgfKTktrCeRq1lT1D86uri8os164vJenptdR1w24a914DRwU3UjFfv6u9lHOb3fe5ebwCcmJPVyNLq/IL3Qus2nEnnYXUBlAURqgt0Cjqxb672Sq1zIZFYGUWIl12RYOcaetnMoOoENb2CA7T/qgoQ46WyUGL9zQ09bvebBm+qCtYeYTEPAFwa4T2EofBfeNJ2RmtV8vJvbYY9kQaNWhQrUoLIHERfpRT1sUKuFJ9ub37EmydqkJX6TwDznOvH1vUDD4O+v6KvB9cEQ65Xx3eZ0Tfp7WiEkX/KolU4H6FQBHFSyNbrDZtE8vIC6KmRS8/7xbpIk3wh7hmvQbzT+L1j5afA1UY0/lsMByBqm42XwB9pFRuNxj19fQq3IHeIdGP1h+kHn0xaMQBWPVT3MrEQc1zg6KsZov/jCXSDfXTVNXT+kCvAA==--nmX853iaXA8kWASv--hHsVVKm2lDHhDLsDToiZ2Q==
+\ No newline at end of file
diff --git a/config/database.yml b/config/database.yml
index 796466b..744efc6 100644
--- a/config/database.yml
+++ b/config/database.yml

@@ -21,5 +21,11 @@ test:
  database: storage/test.sqlite3
 production:
-  <<: *default
+  adapter: mysql2
-  database: storage/production.sqlite3
+  encoding: utf8mb4
+  database: pokeviewer
+  pool: 5
+  username: pokeviewer
+  password: <%= Rails.application.credentials.database_password %>
+  collation: utf8mb4_bin
+  socket: /var/run/mysqld/mysqld.sock

diff --git a/.gitignore b/.gitignore index 8e045dd..48b7cac 100644 --- a/.gitignore +++ b/.gitignore
@@ -35,3 +35,5 @@
35	/config/master.key	35	/config/master.key
36		36
37	.DS_Store	37	.DS_Store
		38
		39	/config/credentials/production.key


diff --git a/config/credentials/production.yml.enc b/config/credentials/production.yml.enc new file mode 100644 index 0000000..1a23841 --- /dev/null +++ b/config/credentials/production.yml.enc
@@ -0,0 +1 @@
			36aFPYK5AHgjGYB6U/N1g9C8MEPeVSZxgfKTktrCeRq1lT1D86uri8os164vJenptdR1w24a914DRwU3UjFfv6u9lHOb3fe5ebwCcmJPVyNLq/IL3Qus2nEnnYXUBlAURqgt0Cjqxb672Sq1zIZFYGUWIl12RYOcaetnMoOoENb2CA7T/qgoQ46WyUGL9zQ09bvebBm+qCtYeYTEPAFwa4T2EofBfeNJ2RmtV8vJvbYY9kQaNWhQrUoLIHERfpRT1sUKuFJ9ub37EmydqkJX6TwDznOvH1vUDD4O+v6KvB9cEQ65Xx3eZ0Tfp7WiEkX/KolU4H6FQBHFSyNbrDZtE8vIC6KmRS8/7xbpIk3wh7hmvQbzT+L1j5afA1UY0/lsMByBqm42XwB9pFRuNxj19fQq3IHeIdGP1h+kHn0xaMQBWPVT3MrEQc1zg6KsZov/jCXSDfXTVNXT+kCvAA==--nmX853iaXA8kWASv--hHsVVKm2lDHhDLsDToiZ2Q== \ No newline at end of file


diff --git a/config/database.yml b/config/database.yml index 796466b..744efc6 100644 --- a/config/database.yml +++ b/config/database.yml
@@ -21,5 +21,11 @@ test:
21	database: storage/test.sqlite3	21	database: storage/test.sqlite3
22		22
23	production:	23	production:
24	<<: *default	24	adapter: mysql2
25	database: storage/production.sqlite3	25	encoding: utf8mb4
		26	database: pokeviewer
		27	pool: 5
		28	username: pokeviewer
		29	password: <%= Rails.application.credentials.database_password %>
		30	collation: utf8mb4_bin
		31	socket: /var/run/mysqld/mysqld.sock