Merge branch 'r-1902001-01' of gitlab.com:code2lab/SXRestaurant into r-1902001-01

config/initializers/action_controller.rb

@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       # check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+       if check_license
+         current_license(ENV["SX_PROVISION_URL"])
+       else
+         redirect_to activate_path
+       end      
     end    
   end
 

config/license.yml

@@ -1,15 +0,0 @@
-iv_key: 0zVzQvzlcJhc1d1EuA2HRg==
-shop_name: aungcafe
-email: devops@code2lab.com
-telephone: 
-fax: 
-address: 
-dbhost: NGg7s8bJBfbDrkIeQhV+obOyEtgxtI3Dvf+b+eBm0P+r3aT+dBqHnwVEaIwsafXPFNXavhR/C0iyni1Lszkfyw==
-dbschema: X+F4yj1eQlGPiMtsgZQCqWi2NIdBLUCEj35vF4XQDZc=
-dbusername: 5CSlQR48ZAiRwWlTxzOZcw==
-dbpassword: uzPlzsPjbWhJHcbStJSS0A==
-api_token: RaZKWQwnKpvbdJvyAiMGGZPUKuJkWbE
-app_token: dCKGOGvdFsCzOUrvhdrFqoOaAUzwtEUC
-plan_sku: Qy0IoCIrNawRA2WjS3aLPg==
-renewable_date: vGwTpixrL9biHkxdRdGctA==
-plan_name: E9Njdqdou4eMpPaWDevpT95fpksDti2xvY+0u3PzKp0=

config/puma.rb

@@ -1,10 +1,10 @@
-# application_path="#{File.expand_path("../..", __FILE__)}"
-# directory application_path
-# #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"
-# port        ENV.fetch("PORT") { 62158 }
-# workers 2
-# preload_app!
+application_path="#{File.expand_path("../..", __FILE__)}"
+directory application_path
+#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"
+port        ENV.fetch("PORT") { 62158 }
+workers 2
+preload_app!