Merge branch 'release/1.0.6'

mbround18 · Mar 5, 2017 · 8901739 · 8901739
2 parents a1ec876 + f833f19
commit 8901739
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/config/environment.rb b/config/environment.rb
@@ -4,7 +4,6 @@
 require 'dalli'
 require 'logger'
 require 'base64'
-require 'socket'
 require 'rufus-scheduler'
 
 WORKING_DIR       = File.dirname(File.expand_path('..', __FILE__)) unless defined?(WORKING_DIR)
@@ -13,7 +12,7 @@
 USER_HOME         = Dir.home unless defined?(USER_HOME)
 RACK_ENV          = ENV.fetch('RACK_ENV', 'development')
 ARK_MANAGER_CLI   = find_executable('arkmanager', "#{USER_HOME}/bin") unless defined?(ARK_MANAGER_CLI)
-SERVER_IP_ADDRESS = Socket.ip_address_list.detect{|intf| intf.ipv4_private?}.ip_address
+SERVER_IP_ADDRESS = ENV.fetch('LISTENING_IP', '0.0.0.0')
 
 if File.exists?("#{WORKING_DIR}/config/env_config.json")
   Oj.load_file("#{WORKING_DIR}/config/env_config.json", Hash.new).each_pair { |key,value|  ENV[key] = value  }