Skip to content

Select init system based on ansible fact #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alachaum wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Select init system based on ansible fact #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ansible/roles/nex/tasks/initial_setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions ansible/roles/nex/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
0 ansible/roles/nex/tasks/runtime_rhel.yml → ansible/roles/nex/tasks/runtime_systemd.yml
View file
Open in desktop
File renamed without changes.
0 ansible/roles/nex/tasks/runtime_deb.yml → ansible/roles/nex/tasks/runtime_upstart.yml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ansible/roles/nex/templates/puma.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ansible/roles/nex/templates/sidekiq.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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