From fea0af8fe2e434801af39fb1f15095faa18c78c3 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Fri, 21 Jul 2023 16:00:01 +0200
Subject: [PATCH] Use specific tags for additionals and saml.

---
 defaults/main.yml         | 6 +++---
 tasks/deb-packages.yml    | 2 +-
 tasks/redmine-plugins.yml | 2 +-
 vars/main.yml             | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 8733a09..1f08496 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -27,7 +27,7 @@ redmine_memcache_hosts:
 #
 redmine_external_ruby_ppa_enabled: false
 redmine_external_ppa_repo: 'ppa:brightbox/ruby-ng'
-ruby_ppa_version: 2.6
+ruby_ppa_version: 2.7
 
 redmine_sysvinit_service_name: '{{ redmine_inst_name }}'
 redmine_systemd_service_name: 'unicorn@{{ redmine_inst_name }}.service'
@@ -164,10 +164,10 @@ rm_dashboard_plugin_url: https://github.com/akpaevj/dashboard.git
 rm_dashboard_plugin: False
 rm_additionals_plugin: false
 rm_additionals_plugin_url: "https://github.com/AlphaNodes/additionals.git"
-rm_additionals_plugin_branch: stable
+rm_additionals_plugin_branch: "3.0.5.2"
 rm_saml_plugin: false
 rm_saml_plugin_url: "https://github.com/alphanodes/redmine_saml.git"
-rm_saml_branch: stable
+rm_saml_branch: "1.0.3"
 rm_saml_entity_id: 'redmine_saml'
 rm_saml_assertion_consumer_service_url: "http://redmine.local/auth/saml/callback"
 rm_saml_issuer: "https://redmine.local/auth/saml/metadata"
diff --git a/tasks/deb-packages.yml b/tasks/deb-packages.yml
index 1cfc015..0b79649 100644
--- a/tasks/deb-packages.yml
+++ b/tasks/deb-packages.yml
@@ -20,6 +20,6 @@
 
     - name: Install the ruby packages needed to run redmine
       ansible.builtin.apt:
-        pkg: "{% if redmine_external_ruby_ppa_enabled %}{{ redmine_ppa_packages }}{% else %}{{ redmine_distribution_packages }}{% endif %}%}"
+        pkg: "{% if redmine_external_ruby_ppa_enabled %}{{ redmine_ppa_packages }}{% else %}{{ redmine_distribution_packages }}{% endif %}"
         state: present
         cache_valid_time: 1800
diff --git a/tasks/redmine-plugins.yml b/tasks/redmine-plugins.yml
index 2e95883..3eae082 100644
--- a/tasks/redmine-plugins.yml
+++ b/tasks/redmine-plugins.yml
@@ -335,7 +335,7 @@
 - name: Install the SAML auth plugin
   ansible.builtin.git:
     repo: '{{ rm_saml_plugin_url }}'
-    dest: '{{ redmine_glob_root_dir }}/{{ redmine_inst_dir }}/plugins/additionals'
+    dest: '{{ redmine_glob_root_dir }}/{{ redmine_inst_dir }}/plugins/redmine_saml'
     version: "{{ rm_saml_branch }}"
     update: false
   notify:
diff --git a/vars/main.yml b/vars/main.yml
index de6764a..db6d343 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -25,8 +25,8 @@ redmine_pkg_dependencies:
   - imagemagick
 
 redmine_ppa_packages:
-  - "ruby{{ ruby_ppa_version }}"
-  - "ruby{{ ruby_ppa_version }}-dev"
+  - ruby{{ ruby_ppa_version }}
+  - ruby{{ ruby_ppa_version }}-dev
   - rails
   - ruby-rmagick