From ca7852ab49bd6112b6b8987940393aadb3966483 Mon Sep 17 00:00:00 2001
From: Pavel Kalashnikov <kalashnikovisme@gmail.com>
Date: Sun, 26 Mar 2017 22:55:58 +0400
Subject: [PATCH]  #FIX

---
 app/controllers/application_controller.rb       |  9 ++++-----
 app/controllers/concerns/it_projects_concern.rb |  6 +-----
 cm/deploy.yml                                   | 10 +++++-----
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 289329c5..d9c7994e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -17,11 +17,10 @@ class ApplicationController < ActionController::Base
 
   def redirect_to_another_main_page
     unless Rails.env.test?
-      PROJECTS.each do |project|
-        if request.host.include?(project) && request.path != main_page_of(request.host)
-          redirect_to main_page_of project
-          break
-        end
+      if request.host.include?('it-way.pro') && request.path != main_page_of(request.host)
+        redirect_to main_page_of project
+      elsif request.host.include?('ul-lider.ru') && request.path != activity_lines_lider_ya_liders_path(15)
+        redirect_to activity_lines_lider_ya_liders(15)
       end
     end
   end
diff --git a/app/controllers/concerns/it_projects_concern.rb b/app/controllers/concerns/it_projects_concern.rb
index bb00553b..26d23870 100644
--- a/app/controllers/concerns/it_projects_concern.rb
+++ b/app/controllers/concerns/it_projects_concern.rb
@@ -1,11 +1,7 @@
 module Concerns
   module ItProjectsConcern
     def main_page_of(it_project_name)
-      if it_project_name == 'ul-lider.ru'
-        activity_lines_lider_ya_liders(15)
-      else
-        page_page_path it_project_name.gsub('www.', '').split('.')[0].gsub('-', '_')
-      end
+      page_page_path it_project_name.gsub('www.', '').split('.')[0].gsub('-', '_')
     end
   end
 end
diff --git a/cm/deploy.yml b/cm/deploy.yml
index e673a6d0..cc4a962f 100644
--- a/cm/deploy.yml
+++ b/cm/deploy.yml
@@ -83,11 +83,6 @@
       args:
         chdir: "{{ release_path }}"
 
-    - name: Stop sidekiq
-      shell: "/usr/local/rvm/bin/rvm ruby-2.3.0 do bundle exec sidekiqctl stop /srv/ulmicru/shared/tmp/pids/sidekiq-0.pid 10"
-      args:
-        chdir: "{{ release_path  }}"
-
     - name: Linking current
       file:
         src={{ release_path }}
@@ -95,6 +90,11 @@
         state=link
         force=yes
 
+    - name: Stop sidekiq
+      shell: "/usr/local/rvm/bin/rvm ruby-2.3.0 do bundle exec sidekiqctl stop /srv/ulmicru/shared/tmp/pids/sidekiq-0.pid 10"
+      args:
+        chdir: "{{ release_path   }}"
+
     - name: Stop unicorn
       shell: "[ -e /srv/ulmicru/shared/tmp/pids/unicorn.pid  ] && kill `cat /srv/ulmicru/shared/tmp/pids/unicorn.pid`"