Skip to content

allow for OpenBSD 6.4 vs 6.5 #2

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

Closed
wants to merge 1 commit into from
Closed

allow for OpenBSD 6.4 vs 6.5 #2

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
31 changes: 29 additions & 2 deletions tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,20 @@
state: installed
loop:
- git
- ruby24-bundler
- sqlite3

- name: Install Ruby
package:
name: ruby24-bundler
state: installed
when: ansible_distribution_version == "6.4"

- name: Install Ruby
package:
name: ruby25-bundler
state: installed
when: ansible_distribution_version == "6.5"

- name: add rubywarden group
group:
name: "{{ rw_group }}"
Expand Down Expand Up @@ -41,6 +52,16 @@
binstub_directory: "{{ rw_home }}/rb/bin"
chdir: "{{ rw_src }}"
state: present
when: ansible_distribution_version == "6.4"

- name: run bundler
bundler:
executable: /usr/local/bin/bundle25
gem_path: "{{ rw_home }}/rb"
binstub_directory: "{{ rw_home }}/rb/bin"
chdir: "{{ rw_src }}"
state: present
when: ansible_distribution_version == "6.5"

- name: make the {{ rw_env }} db dir
file:
Expand All @@ -52,11 +73,17 @@
register: migrate

- name: run db:migrate
when: git_updated.changed or migrate.changed
when: (git_updated.changed or migrate.changed) and (ansible_distribution_version == "6.4")
command: "env RUBYWARDEN_ENV={{ rw_env }} bundle24 exec rake db:migrate"
args:
chdir: "{{ rw_src }}"

- name: run db:migrate
when: (git_updated.changed or migrate.changed) and (ansible_distribution_version == "6.5")
command: "env RUBYWARDEN_ENV={{ rw_env }} bundle25 exec rake db:migrate"
args:
chdir: "{{ rw_src }}"

- name: verify perms {{ rw_env }} db dir
file:
path: "{{ rw_src }}/db/{{ rw_env }}"
Expand Down
8 changes: 8 additions & 0 deletions templates/rubywarden.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ env="RUBYWARDEN_ENV={{ rw_env }} ALLOW_SIGNUPS=1 PATH=$PATH:{{ rw_home }}/rb/bin
{% else %}
env="RUBYWARDEN_ENV={{ rw_env }} PATH=$PATH:{{ rw_home }}/rb/bin HOME={{ rw_home }}"
{% endif %}
{% if ansible_facts['distribution_version'] == "6.4" %}
daemon="/usr/local/bin/bundle24"
{% elif ansible_facts['distribution_version'] == "6.5" %}
daemon="/usr/local/bin/bundle25"
{% endif %}
daemon_flags="exec rackup -p {{ rw_port }} config.ru"
daemon_user="{{ rw_user }}"

Expand All @@ -19,7 +23,11 @@ rc_start() {
${rcexec} "cd {{ rw_home }}/src && env ${env} ${daemon} ${daemon_flags}"
}

{% if ansible_facts['distribution_version'] == "6.4" %}
pexp="ruby24 .*rackup -p {{ rw_port }} config.ru"
{% elif ansible_facts['distribution_version'] == "6.5" %}
pexp="ruby25 .*rackup -p {{ rw_port }} config.ru"
{% endif %}

rc_reload=NO
rc_bg=YES
Expand Down