From 16beded1df5c69584ef18871b3a7be4a6561d34e Mon Sep 17 00:00:00 2001
From: tuftedocelot <tuftedocelot@fastmail.fm>
Date: Wed, 15 May 2019 19:57:15 -0500
Subject: [PATCH] allow for OpenBSD 6.4 vs 6.5

---
 tasks/main.yml          | 31 +++++++++++++++++++++++++++++--
 templates/rubywarden.j2 |  8 ++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 96f3c3f..396e83f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -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 }}"
@@ -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:
@@ -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 }}"
diff --git a/templates/rubywarden.j2 b/templates/rubywarden.j2
index f76bafd..e8ef040 100644
--- a/templates/rubywarden.j2
+++ b/templates/rubywarden.j2
@@ -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 }}"
 
@@ -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