From 48e995e21532de5ee0e695654e5c8d279d9317ee Mon Sep 17 00:00:00 2001
From: phil <phil@systemausfall.org>
Date: Thu, 29 Jul 2021 16:06:21 +0200
Subject: [PATCH] ruby-Version wird upstream gesetzt

---
 defaults/main.yml |  3 +--
 tasks/ruby.yml    | 13 +++----------
 tasks/zammad.yml  |  3 +++
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 241f238..d4b37d8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -4,7 +4,6 @@ debian_version: buster
 ruby_path: "{{ zammad_user_home }}/.rbenv"
 ruby_bin_path: "{{ ruby_path }}/versions/{{ ruby_version }}/bin"
 ruby_build_repo: https://github.com/rbenv/ruby-build.git
-ruby_version: 2.6.6
 
 zammad_database_name: zammad
 zammad_database_password: "{{ lookup('password', '/tmp/zammad_database_pwd length=42 chars=ascii_letters,digits') }}"
@@ -18,5 +17,5 @@ zammad_log_path: /var/log/zammad
 zammad_repo: https://github.com/zammad/zammad.git
 zammad_user: zammad
 zammad_user_home: "/home/{{ zammad_user }}"
-zammad_version: 4.1.0
+zammad_version: 5.0.0
 zammad_webserver_configuration: "/etc/nginx/sites-available/{{ zammad_domain }}"
diff --git a/tasks/ruby.yml b/tasks/ruby.yml
index 6a71317..7e5dd38 100644
--- a/tasks/ruby.yml
+++ b/tasks/ruby.yml
@@ -17,24 +17,17 @@
 
 - name: "ruby: Version prüfen"
   stat:
-    path: "{{ ruby_path }}/versions/{{ ruby_version }}"
+    path: "{{ ruby_path }}/versions/{{ ruby_version.stdout }}"
   register: ruby_installed
 
 - name: "ruby installieren"
   command:
-    cmd: "rbenv install {{ ruby_version }}"
+    cmd: "rbenv install {{ ruby_version.stdout }}"
     chdir: "{{ zammad_user_home }}"
   become: true
   become_user: "{{ zammad_user }}"
   when: ruby_installed.stat.exists == False
 
-- name: "ruby aktivieren"
-  shell: "rbenv local {{ ruby_version }}"
-  args:
-    chdir: "{{ zammad_home }}"
-  become: true
-  become_user: "{{ zammad_user }}"
-
 - name: "ruby: Bundler installieren"
   command:
     cmd: rbenv exec gem install bundler
@@ -43,7 +36,7 @@
   become_user: "{{ zammad_user }}"
 
 - name: "ruby: Ruby-Abhängigkeiten installieren"
-  shell: "RAILS_ENV=production {{ ruby_bin_path }}/bundle install --without test development mysql"
+  shell: "RAILS_ENV=production rbenv exec bundle install --without test development mysql"
   args:
     chdir: "{{ zammad_home }}"
   become: true
diff --git a/tasks/zammad.yml b/tasks/zammad.yml
index efdf09f..c7b7417 100644
--- a/tasks/zammad.yml
+++ b/tasks/zammad.yml
@@ -25,3 +25,6 @@
     src: ldap-user-filter.patch
     dest: "{{ zammad_home }}/lib/ldap/user.rb"
 
+- name: "zammad: Ermittle Ruby-Version"
+  shell: cat "{{ zammad_home }}/.ruby-version"
+  register: ruby_version