fix

config/192.168.1.242.crt

@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDaDCCAlACCQCMa8dYfX0ohTANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJZ
-RzELMAkGA1UECAwCWUcxCzAJBgNVBAcMAllHMQwwCgYDVQQKDANDMkwxCjAIBgNV
-BAsMATMxCzAJBgNVBAMMAlNYMSYwJAYJKoZIhvcNAQkBFhdud2VuaS5hdW5nQGNv
-ZGUybGFiLmNvbTAeFw0xOTExMjYwNTM0NTNaFw0yMDExMjUwNTM0NTNaMHYxCzAJ
-BgNVBAYTAllHMQswCQYDVQQIDAJZRzELMAkGA1UEBwwCWUcxDDAKBgNVBAoMA0My
-TDEKMAgGA1UECwwBMzELMAkGA1UEAwwCU1gxJjAkBgkqhkiG9w0BCQEWF253ZW5p
-LmF1bmdAY29kZTJsYWIuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAzjshIBw0Dnv4nFxBBtDd6TbcIR9GGndM7aKOr8yZBv7qKiRoFr9vtT/M1JZh
-MO2G0DxvH9BjR1oVWNuAOBx7JUf9wweZ0ntaYT+kPen66LqTn5gFfCAJ+EAzIvaq
-s2zlWB8Opl1kahW3LDLngmJGQPBTXO5UVfZHcxgyEGa4b+KdG9s8xqIC4HpvEOST
-JmtZiuk/f/9tD7TqWhLsm/Aaw851/6kNjwZJYLbb/Trw8p04iLyyFl1yxVGQLfKB
-uoT9tZizPJwZpxCPcvfk2aea0tO+tzBGvtC0VxIUGmBtsZyexVKj/dRuxYhYhFiT
-m+0LXyBVyBU5tnuSlvTTM6Qy+wIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBUS4G7
-xFFlR7Jy1pru4sBMJk11r1pXjUU4lW8bgR1GYC/truda9JyIYlsnrpb+AkhKC1wT
-cDufZs+mciN9u8K0eBSdwcAE+m1mSxa1AZbRLyXb9JxWEYmY53K/ktocQloBM3id
-sNZQpsSsqZ4DEuaIzgc3A8C+bQbKi1/P2vo12quzGqebIryvy5QPXpi47ECmSGqW
-mIBLhPoy3gzm6PamdY+0z+nKGTdAPS15tTpYsfRA3u54fiavluJYNRV2cFYlGPsS
-6YmcQNV1R+ONfjaPCqH24/NNVgeeaKzb6uGIpgOfB2cb8aXjTDVUT0qVgJ3S9M4p
-HflFmRqebVXhDDiE
------END CERTIFICATE-----

config/192.168.1.242.key

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDOOyEgHDQOe/ic
-XEEG0N3pNtwhH0Yad0ztoo6vzJkG/uoqJGgWv2+1P8zUlmEw7YbQPG8f0GNHWhVY
-24A4HHslR/3DB5nSe1phP6Q96froupOfmAV8IAn4QDMi9qqzbOVYHw6mXWRqFbcs
-MueCYkZA8FNc7lRV9kdzGDIQZrhv4p0b2zzGogLgem8Q5JMma1mK6T9//20PtOpa
-Euyb8BrDznX/qQ2PBklgttv9OvDynTiIvLIWXXLFUZAt8oG6hP21mLM8nBmnEI9y
-9+TZp5rS0763MEa+0LRXEhQaYG2xnJ7FUqP91G7FiFiEWJOb7QtfIFXIFTm2e5KW
-9NMzpDL7AgMBAAECggEABCQj0iU+1lue7mTb2WswSZKUcQXTvoxOuybcfqM5H27W
-/OmmPW6yq40Qa+RpJzZd0qikApuIotIoQ5SEypunzWPYsKXibNuVQQaqIaQlKa81
-b6r50ThDevyvCjCx1NCG+nIFNUoCzi6JcxXCmFeo2Xz574/JmcBMRv9hYfruETEO
-g5KvR+bhymaDGgKPoIgro2ar3DjKYMuWwaHJQClx3laYPIgnyGFvmTG/if5UykF4
-oTDnjVYkWqw8XOvsL5WhDBGbTq/f1jB7IjfIt1+pV51synVsa/zGNe3jQstCNBX0
-LK+7k8ub6v3jg2ZU0xx7z+hPuOIwz9HLjVEMfZWZwQKBgQDrSmJfbb7FMrPMKeaU
-TEX6+fJRQkfgUdtfx8MK5PytV4WzkHOyJ2ankkpyh5TQG77MUzubfGPmg5nBT2+I
-TEZO8rH83nOvMKLmXoPp0TvyBxGt0OqBb6RE+mc5rQmPk4lEtUq+i0L+/fB4RYMe
-CZgn8pjuvBi+4oQOiQPSl+SwuQKBgQDgYffroNTn1i3VYNU3DYp9xjSLor7TPdsv
-S2Xi5FXaZr9PcXdviBE9siY9KEBuiWVA5Q9Wv8XdBbA26VmEzyf+k7KzMr4Z6k5H
-SlqClr4AFes6KYmvP2DrVaUsxlUeDO0saxahEK8PkMYTWbWDTAv0d2YD/mLcesEr
-haeCCpyfUwKBgQCVCUDWgYVdE4ifwcq0FLwfBUNgBUPR6wex267Hr9P9WHrwCoe+
-SQbVDezqLscsKuboNbCEBH6i/KjfsZlMFERUrZXgPme4iG4mzadw63+1BpVELBje
-dADxUEsiVWDA+Qrx4oO9vihprCAtjppG5HzkkN4eGjbycjiDnHY3Zs8MwQKBgAqS
-kyv3GBEUdnRna6R8btoeTLuHn5Y0g+9mjhZyy9jOnpUPs6D9uFI/4q1fCCotLygv
-otljj98qNXNg62bmm+vS6ciny21NLQMO7dTZZXp7jenfqy0mv1pXXsENV1VjJonB
-Qf+02YrSN4MR5wuYubd7KMNnaSEaZ5+1XH80IM0hAoGBAJfHi94ZzPW2PDQr1GIm
-CS0O0cHjQNI2+5Yde2U+WuXh/U2rMyB9iTyImqw/weTVFXS2AiRmss7CBTpIxhCP
-1gVoNcRRfU7kmuiBXthgB/BuhSdeh/OQo7e9pKiNqoieMO+j8ocyvbMi8NSUl7pK
-P9O47XLOplsft4lXqG6gkn8C
------END PRIVATE KEY-----

config/deploy.rb

@@ -28,9 +28,24 @@ set :linked_dirs, %w{log tmp/pids tmp/puma tmp/cache tmp/sockets vendor/bundle p
 set :tests, []
 set :pty, true
 
-set :puma_jungle_conf, '/etc/puma.conf'
-set :puma_run_path, '/usr/local/bin/run-puma'
+#set :puma_state, "#{shared_path}/tmp/pids/puma.state"
+#set :puma_pid, "#{shared_path}/tmp/pids/puma.pid"
 set :puma_bind, %w(tcp://0.0.0.0:9393)
+#set :puma_conf, "#{shared_path}/puma.rb"
+#set :puma_access_log, "#{shared_path}/log/puma_access.log"
+#set :puma_error_log, "#{shared_path}/log/puma_error.log"
+#set :puma_role, :app
+set :puma_env, fetch(:rack_env, fetch(:rails_env, 'production'))
+set :puma_threads, [0, 16]
+set :puma_workers, 2
+#set :puma_worker_timeout, nil
+#set :puma_init_active_record, false
+#set :puma_preload_app, false
+#set :puma_daemonize, false
+#set :puma_plugins, []  #accept array of plugins
+#set :puma_tag, fetch(:application)
+#set :puma_restart_command, 'bundle exec puma'
+
 
 #set :enable_ssl, true
 

config/deploy/production.rb

@@ -9,11 +9,11 @@
 # set :rails_env, :production
 
 set :stage, :production
-set :server_name, "a.c2l.shop"
+set :server_name, "doemal.app"
 set :branch, "r-1902001-01"
 
 set :full_app_name, "#{fetch(:application)}_#{fetch(:stage)}"
-server '167.71.194.57', user: 'deploy', roles: %w{web app db}, primary: true
+server '178.128.58.251', user: 'deploy', roles: %w{web app db}, primary: true
 
 set :deploy_to, "/home/#{fetch(:deploy_user)}/apps/#{fetch(:full_app_name)}"
 set :rbenv_ruby, '2.6.5'

config/deploy/shared/.rbenv-vars

@@ -0,0 +1 @@
+SECRET_KEY_BASE=33c956cc0e41623bf4e0aedbb16061fa7460a993452b58311d07009782dc242925a52dbb79b506c35308e65cda7cb07b014f78daea0a7ea883a535dc14b33a09

config/deploy/shared/database.yml.erb

@@ -0,0 +1,6 @@
+production:
+  adapter: postgresql
+  host: localhost
+  database: iticket
+  username: wathon
+  password: root

config/deploy/shared/log_rotation.erb

@@ -0,0 +1,11 @@
+<%= fetch(:deploy_to) %>/shared/log/*.log {
+    daily
+    missingok
+    rotate 52
+    compress
+    delaycompress
+    notifempty
+    sharedscripts
+    endscript
+    copytruncate
+}

config/deploy/shared/monit.conf.erb

@@ -0,0 +1,2 @@
+<% application = fetch(:application) %>
+set mail-format { subject: <%= "#{fetch(:full_app_name)} - #{fetch(:rails_env)}" %> $SERVICE $EVENT at $DATE }

config/deploy/shared/nginx.conf.erb

@@ -0,0 +1,40 @@
+server {
+  server_name <%= fetch(:server_name) %>;
+  listen 80;
+  passenger_enabled on;
+  rails_env    production;
+  root <%= fetch(:deploy_to) %>/current/public;
+
+  location ^~ /assets/ {
+    gzip_static on;
+    expires max;
+    add_header Cache-Control public;
+  }
+  
+  error_page 500 502 503 504 /500.html;
+  client_max_body_size 4G;
+  keepalive_timeout 10;
+}
+
+<% if fetch(:enable_ssl) %>
+server {
+  server_name <%= fetch(:server_name) %>;
+  listen 443;
+  passenger_enabled on;
+  rails_env    production;
+  root <%= fetch(:deploy_to) %>/current/public;
+
+  location ^~ /assets/ {
+    gzip_static on;
+    expires max;
+    add_header Cache-Control public;
+  }
+
+  error_page 500 502 503 504 /500.html;
+  client_max_body_size 4G;
+  keepalive_timeout 10;
+  ssl on;
+  ssl_certificate <%= fetch(:deploy_to) %>/shared/ssl_cert.crt;
+  ssl_certificate_key <%= fetch(:deploy_to) %>/shared/ssl_private_key.key;
+}
+<% end %>

config/deploy/shared/redis.yml.erb

@@ -0,0 +1,4 @@
+<%= fetch(:rails_env) %>:
+  host: data.myapp.com
+  port: 6379
+  db: 0

config/deploy/shared/sidekiq.yml.erb

@@ -0,0 +1,2 @@
+<%= fetch(:rails_env) %>:
+  :concurrency: <%= fetch(:sidekiq_concurrency, 5) %>

config/deploy/shared/sidekiq_init.sh.erb

@@ -0,0 +1,48 @@
+#!/bin/sh
+set -e
+
+APP_ROOT=<%= current_path %>
+PID=$APP_ROOT/tmp/pids/sidekiq.pid
+CMD="cd $APP_ROOT; RAILS_ENV=<%= "#{fetch(:rails_env)}" %> nohup bundle exec sidekiq -e <%= "#{fetch(:rails_env)}" %> -C $APP_ROOT/config/sidekiq.yml -i 0 -P $PID >> $APP_ROOT/log/sidekiq.log 2>&1 &"
+STOP_CMD="cd $APP_ROOT; RAILS_ENV=<%= "#{fetch(:rails_env)}" %> bundle exec sidekiqctl stop $APP_ROOT/tmp/pids/sidekiq.pid 10"
+AS_USER=<%= fetch(:deploy_user) %>
+
+run () {
+  if [ "$(id -un)" = "$AS_USER" ]; then
+    eval $1
+  else
+    su -c "$1" - $AS_USER
+  fi
+}
+
+sig () {
+  test -s "$PID" && kill -$1 `cat $PID`
+}
+
+case "$1" in
+  start)
+    sig 0 && echo >&2 "Already Running" && exit 0
+    run "$CMD"
+    ;;
+  stop)
+    if test -s "$PID" && kill -0 `cat $PID`
+    then
+        echo "stopping...."
+        run "$STOP_CMD"
+    else
+        echo "not running"
+    fi
+    ;;
+  restart|reload)
+    if test -s "$PID" && kill -0 `cat $PID`
+    then
+      echo "stopping...."
+      run "$STOP_CMD"
+    fi
+    run "$CMD"    
+    ;;
+  *)
+    echo >&2 "Usage: $0 <start|stop|restart>"
+    exit 1
+    ;;
+esac

config/initializers/action_controller.rb

@@ -4,8 +4,8 @@ class ActionController::Base
   private
 
   def lookup_domain
-    if request.subdomain.present? && request.subdomain != "www"
-      from = request.subdomain.downcase  + "." + request.domain.downcase
+    if request.subdomains.last && request.subdomains.last != "www" && ENV["SERVER_CODE"] = "cloud"
+      from = request.host
       @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
       if (!@license.nil?)
         logger.info "Location - " + @license.dbschema
@@ -16,16 +16,15 @@ class ActionController::Base
         # reconnect_default_db
         logger.info 'License is nil'
         # redirect_to root_url(:host => request.domain) + "store_error"
-         render :json => [{ status: false, message: 'Invalid Access!'}]
-
+        render :json => [{ status: false, message: 'Invalid Access!'}]
       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