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

config/application.rb

@@ -3,6 +3,8 @@ require_relative 'boot'
 require 'csv'
 require 'rails/all'
 # require 'iconv'
+require 'openssl'
+OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.

config/puma.rb.production

@@ -1,6 +1,7 @@
-application_path = '/home/superuser/Application/sxrestaurant'
+application_path="#{File.expand_path("../..", __FILE__)}"
 directory application_path
-environment ENV.fetch("RAILS_ENV") { "production" }
+#environment ENV.fetch("RAILS_ENV") { "production" }
+environment "production"
 pidfile "#{application_path}/tmp/puma/pid"
 state_path "#{application_path}/tmp/puma/state"
 stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"