From dc6fe55565c476337fb26769202027c0ef10cf9a Mon Sep 17 00:00:00 2001
From: Arnaud Lachaume <arnaud.lachaume@maestrano.com>
Date: Fri, 22 Sep 2017 12:49:30 -0400
Subject: [PATCH] select init system based on fact

---
 ansible/roles/nex/tasks/initial_setup.yml            |  8 ++++----
 ansible/roles/nex/tasks/main.yml                     | 12 ++++++------
 .../tasks/{runtime_rhel.yml => runtime_systemd.yml}  |  0
 .../tasks/{runtime_deb.yml => runtime_upstart.yml}   |  0
 ansible/roles/nex/templates/puma.service             |  2 +-
 ansible/roles/nex/templates/sidekiq.service          |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename ansible/roles/nex/tasks/{runtime_rhel.yml => runtime_systemd.yml} (100%)
 rename ansible/roles/nex/tasks/{runtime_deb.yml => runtime_upstart.yml} (100%)

diff --git a/ansible/roles/nex/tasks/initial_setup.yml b/ansible/roles/nex/tasks/initial_setup.yml
index 0f1c739..8a0e214 100644
--- a/ansible/roles/nex/tasks/initial_setup.yml
+++ b/ansible/roles/nex/tasks/initial_setup.yml
@@ -53,11 +53,11 @@
 - name: Nex! | Install puma
   command: gem install puma
 
-- include: runtime_deb.yml
-  when: ansible_os_family == "Debian"
+- include: runtime_upstart.yml
+  when: ansible_service_mgr == "upstart"
 
-- include: runtime_rhel.yml
-  when: ansible_os_family == "RedHat"
+- include: runtime_systemd.yml
+  when: ansible_service_mgr == "systemd"
 
 - name: Nex! | Copy puma.rb config
   template: src=puma.rb dest={{deploy_directory}}/shared/config/puma.rb owner=deployer group=deployer mode=0755
diff --git a/ansible/roles/nex/tasks/main.yml b/ansible/roles/nex/tasks/main.yml
index 79b23a6..19ae446 100644
--- a/ansible/roles/nex/tasks/main.yml
+++ b/ansible/roles/nex/tasks/main.yml
@@ -29,13 +29,13 @@
   when: infra_ec2_aws_access_key is defined
   tags: [deploy]
 
-- name: Nex! | Run/Reload Puma (Debian)
-  include: runtime_deb.yml
-  when: ansible_os_family == "Debian"
+- name: Nex! | Run/Reload Puma (Upstart)
+  include: runtime_upstart.yml
+  when: ansible_service_mgr == "upstart"
 
-- name: Nex! | Run/Reload Puma (RHEL)
-  include: runtime_rhel.yml
-  when: ansible_os_family == "RedHat"
+- name: Nex! | Run/Reload Puma (Systemd)
+  include: runtime_systemd.yml
+  when: ansible_service_mgr == "systemd"
 
 - name: Nex! | Instance Register
   ec2_elb:
diff --git a/ansible/roles/nex/tasks/runtime_rhel.yml b/ansible/roles/nex/tasks/runtime_systemd.yml
similarity index 100%
rename from ansible/roles/nex/tasks/runtime_rhel.yml
rename to ansible/roles/nex/tasks/runtime_systemd.yml
diff --git a/ansible/roles/nex/tasks/runtime_deb.yml b/ansible/roles/nex/tasks/runtime_upstart.yml
similarity index 100%
rename from ansible/roles/nex/tasks/runtime_deb.yml
rename to ansible/roles/nex/tasks/runtime_upstart.yml
diff --git a/ansible/roles/nex/templates/puma.service b/ansible/roles/nex/templates/puma.service
index b70ea4f..b27ec91 100644
--- a/ansible/roles/nex/templates/puma.service
+++ b/ansible/roles/nex/templates/puma.service
@@ -16,7 +16,7 @@ PIDFile={{ deploy_directory }}/shared/pids/puma.pid
 TimeoutSec=15
 Restart=always
 
-ExecStart=/usr/local/bin/bundle exec puma -C {{ deploy_directory }}/shared/config/puma.rb
+ExecStart=/usr/local/rvm/gems/ruby-2.3.1/bin/bundle exec puma -C {{ deploy_directory }}/shared/config/puma.rb
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ansible/roles/nex/templates/sidekiq.service b/ansible/roles/nex/templates/sidekiq.service
index ad6004a..feb3639 100644
--- a/ansible/roles/nex/templates/sidekiq.service
+++ b/ansible/roles/nex/templates/sidekiq.service
@@ -16,7 +16,7 @@ PIDFile={{ deploy_directory }}/shared/pids/sidekiq.pid
 TimeoutSec=15
 Restart=always
 
-ExecStart=/usr/local/bin/bundle exec sidekiq -c {{ nex_config.sidekiq.worker_threads }} -L {{ deploy_directory }}/shared/log/sidekiq.log
+ExecStart=/usr/local/rvm/gems/ruby-2.3.1/bin/bundle exec sidekiq -c {{ nex_config.sidekiq.worker_threads }} -L {{ deploy_directory }}/shared/log/sidekiq.log
 
 [Install]
 WantedBy=multi-user.target