Let users specify the version of ruby to use (default to 2.6).

Closes #2

Author: qbit

README.md

@@ -19,6 +19,7 @@ Role Variables
 
 | Variable | Default | Description |
 |--------- | ------- | ----------- |
+| rw_ruby | `2.6` | Ruby version. |
 | rw_port  | `4567`  | The port rubywarden should listen on. |
 | rw_user  | `_rubywarden` | The user that will be added to the system in order to run rubywarden. |
 | rw_home  | `/var/rubywarden` | Home directory for rw_user. |

defaults/main.yml

@@ -1,6 +1,7 @@
 ---
 # defaults file for openbsd-rubywarden
 
+rw_ruby: 2.6
 rw_port: 4567
 rw_user: _rubywarden
 rw_group: _rubywarden
@@ -9,3 +10,5 @@ rw_commit: master
 rw_env: production
 rw_home: /var/rubywarden
 rw_src: "{{ rw_home }}/src"
+
+rw_ruby_slug: "{{ rw_ruby | regex_replace('\\.', '') }}"

tasks/main.yml

@@ -6,7 +6,7 @@
     state: installed
   loop:
     - git
-    - ruby24-bundler
+    - ruby{{ rw_ruby_slug }}-bundler
     - sqlite3
 
 - name: add rubywarden group
@@ -36,7 +36,7 @@
 
 - name: run bundler
   bundler:
-    executable: /usr/local/bin/bundle24
+    executable: /usr/local/bin/bundle{{ rw_ruby_slug }}
     gem_path: "{{ rw_home }}/rb"
     binstub_directory: "{{ rw_home }}/rb/bin"
     chdir: "{{ rw_src }}"
@@ -53,7 +53,7 @@
 
 - name: run db:migrate
   when: git_updated.changed or migrate.changed
-  command: "env RUBYWARDEN_ENV={{ rw_env }} bundle24 exec rake db:migrate"
+  command: "env RUBYWARDEN_ENV={{ rw_env }} bundle{{ rw_ruby_slug }} exec rake db:migrate"
   args:
     chdir: "{{ rw_src }}"
 

templates/rubywarden.j2

@@ -9,7 +9,7 @@ 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 %}
-daemon="/usr/local/bin/bundle24"
+daemon="/usr/local/bin/bundle{{ rw_ruby_slug }}"
 daemon_flags="exec rackup -p {{ rw_port }} config.ru"
 daemon_user="{{ rw_user }}"
 
@@ -19,7 +19,7 @@ rc_start() {
 	${rcexec} "cd {{ rw_home }}/src && env ${env} ${daemon} ${daemon_flags}"
 }
 
-pexp="ruby24 .*rackup -p {{ rw_port }} config.ru"
+pexp="ruby{{ rw_ruby_slug }} .*rackup -p {{ rw_port }} config.ru"
 
 rc_reload=NO
 rc_bg=YES