deploy

.gitignore

@@ -30,5 +30,6 @@
 .vscode/settings.json
 .vscode/settings.json
 
 
 config/settings.local.yml
 config/settings.local.yml
+config/secrets.yml
 config/settings/*.local.yml
 config/settings/*.local.yml
 config/environments/*.local.yml
 config/environments/*.local.yml

config/database.yml

@@ -15,7 +15,7 @@ default: &default
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   username: root
   username: root
   password: 1
   password: 1
-  socket: /var/run/mysqld/mysqld.sock
+  # socket: /var/run/mysqld/mysqld.sock
 
 
 development:
 development:
   <<: *default
   <<: *default
@@ -50,6 +50,5 @@ test:
 production:
 production:
   <<: *default
   <<: *default
   database: venjob_production
   database: venjob_production
-  username: venjob
-  password: <%= ENV['VENJOB_DATABASE_PASSWORD'] %>
-  url: <%= ENV['JAWSDB_URL'] %>
+  username: Rails.application.secrets.database_username
+  password: Rails.application.secrets.database_password

config/routes.rb

@@ -3,7 +3,7 @@
 Rails.application.routes.draw do
 Rails.application.routes.draw do
   get 'setting', to: 'users#set_lang', as: :set_lang
   get 'setting', to: 'users#set_lang', as: :set_lang
   scope '(:locale)', locale: /en|vi/ do
   scope '(:locale)', locale: /en|vi/ do
-    devise_for :users, controllers: { registrations: 'registrations' }
+    # devise_for :users, controllers: { registrations: 'registrations' }
     devise_for :admins, path: 'admin', path_names: { sign_in: 'login', sign_out: 'logout'}
     devise_for :admins, path: 'admin', path_names: { sign_in: 'login', sign_out: 'logout'}
     root 'home#index'
     root 'home#index'