change config for local server
This commit is contained in:
@@ -1,2 +1 @@
|
||||
RAILS_ENV=production
|
||||
SERVER_MODE=cloud
|
||||
|
||||
@@ -2,8 +2,7 @@ class Origami::DashboardController < BaseOrigamiController
|
||||
|
||||
def index
|
||||
@shop = Shop.first
|
||||
Rails.logger.info ENV["SERVER_MODE"]
|
||||
Rails.logger.info "<><><><><><><><>>"
|
||||
|
||||
today = DateTime.now.strftime('%Y-%m-%d')
|
||||
|
||||
@display_type = Lookup.find_by_lookup_type("display_type")
|
||||
|
||||
@@ -13,8 +13,7 @@ class License
|
||||
|
||||
def initialize(server = "", lookup = "")
|
||||
#this code is hard-code to reflect server mode - Very important.
|
||||
# self.server_mode = ENV["SERVER_MODE"]
|
||||
self.server_mode = "cloud"
|
||||
self.server_mode = ENV["SERVER_MODE"]
|
||||
|
||||
if (server != "")
|
||||
self.class.base_uri server
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
require 'net/http'
|
||||
#require 'cups'
|
||||
require 'cups'
|
||||
|
||||
class Printer::PrinterWorker
|
||||
attr_accessor :print_settings
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
redis: &redis
|
||||
adapter: redis
|
||||
url: redis://172.17.0.1:6380/1
|
||||
url: redis://localhost:6379/1
|
||||
|
||||
production: *redis
|
||||
development: *redis
|
||||
|
||||
@@ -3,6 +3,4 @@ if File.exist?("config/license.yml")
|
||||
config.fetch(Rails.env, {}).each do |key, value|
|
||||
ENV[key.upcase] = value.to_s
|
||||
end
|
||||
else
|
||||
ENV["SERVER_MODE"] = "cloud"
|
||||
end
|
||||
|
||||
@@ -9,5 +9,5 @@ test:
|
||||
<<: *default
|
||||
|
||||
production:
|
||||
db: 0
|
||||
url: redis://172.17.0.1:6380
|
||||
<<: *default
|
||||
url: redis://127.0.0.1:6379
|
||||
|
||||
@@ -24,7 +24,7 @@ test:
|
||||
# instead read values from the environment.
|
||||
production:
|
||||
secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22
|
||||
sx_provision_url: 52.221.188.144:9292/api #connect.smartsales.asia/api #192.168.1.147:3002/api
|
||||
server_mode: cloud
|
||||
sx_provision_url: connect.smartsales.asia/api #52.221.188.144:9292/api #192.168.1.147:3002/api
|
||||
server_mode: application
|
||||
cipher_type: AES-256-CBC
|
||||
sx_key: Wh@t1$C2L
|
||||
|
||||
Reference in New Issue
Block a user