Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

2018-03-23 19:41:38 +06:30
parent f9aa3310fa 2412fe8462
commit 6bb833aff3
18 changed files with 176 additions and 41 deletions
--- a/config/.database.yml.swp
+++ b/config/.database.yml.swp
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -24,8 +24,8 @@ test:
 # instead read values from the environment.
 production:
  secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
-  sx_provision_url: connect.smartsales.dev/api #192.168.1.147:3002/api
-  server_mode: cloud
+  sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
+  server_mode: application
  cipher_type: AES-256-CBC
  sx_key: Wh@t1$C2L

--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -8,7 +8,7 @@

 ---
 :concurrency: 25
-:pidfile: ./tmp/pids/sidekiq.pid
+:pidfile: ./tmp/sidekiq.pid
 :logfile: ./log/sidekiq.log
 :queues:
  - default