From d9d9f39f55bc6e148ea4bc234a3164c88ec47c87 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Tue, 16 Feb 2021 20:07:12 +0100
Subject: [PATCH] Various fixes.

---
 defaults/main.yml              | 2 +-
 meta/main.yml                  | 6 ++++++
 tasks/keycloak-install.yml     | 6 +++++-
 templates/standalone-ha.xml.j2 | 3 +++
 templates/standalone.xml.j2    | 3 +++
 vars/main.yml                  | 1 -
 6 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 4c048ae..c593203 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -38,7 +38,7 @@ keycloak_database_user: keycloak_u
 keycloak_database_host: 'localhost'
 keycloak_database_max_pool_size: '50'
 keycloak_database_jboss_connection_checker: True
-
+keycloak_database_idle_timeouts_min: 1
 keycloak_admin_user: kadmin
 #keycloak_admin_password: 'define it into a vault file'
 
diff --git a/meta/main.yml b/meta/main.yml
index b8d6bce..1fbbcba 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -24,12 +24,18 @@ galaxy_info:
   galaxy_tags:
     - users
     - oidc
+    - oauth
+    - saml
 
 dependencies:
   - src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-openjdk.git
     version: master
     name: openjdk
     state: latest
+  - src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-nginx.git
+    version: master
+    name: nginx
+    state: latest
 
 collections:
   - wildfly.jcliff
diff --git a/tasks/keycloak-install.yml b/tasks/keycloak-install.yml
index 491cc29..9de018a 100644
--- a/tasks/keycloak-install.yml
+++ b/tasks/keycloak-install.yml
@@ -31,9 +31,13 @@
       - 'server.log'
       - 'audit.log'
 
-  - name: Fix the permissions of some keycloak directories
+  - name: Fix the permissions of the directories into keycloak must be able to write
     file: dest={{ keycloak_install_dir }}/{{ keycloak_distribution }}/{{ keycloak_wildfly_mode }}/{{ item }} state=directory owner={{ keycloak_user }} group={{ keycloak_user }} mode='0750' recurse=yes
     with_items: '{{ keycloak_owned_directories }}'
+
+  - name: Fix the permissions of the keycloak data directorie if they are inside the distribution
+    file: dest={{ keycloak_install_dir }}/{{ keycloak_distribution }}/{{ keycloak_wildfly_mode }}/data/{{ item }} state=directory owner={{ keycloak_user }} group={{ keycloak_user }} mode='0750' recurse=yes
+    with_items: '{{ keycloak_data_subdirs }}'
     when: keycloak_data_directory == keycloak_distribution_data_directory
 
   - name: Remove the log directory inside the keycloak distribution
diff --git a/templates/standalone-ha.xml.j2 b/templates/standalone-ha.xml.j2
index ffc1ecf..6ec1efd 100644
--- a/templates/standalone-ha.xml.j2
+++ b/templates/standalone-ha.xml.j2
@@ -139,6 +139,9 @@
                     <pool>
                         <max-pool-size>{{ keycloak_database_max_pool_size }}</max-pool-size>
                     </pool>
+                    <timeout>
+                        <idle-timeout-minutes>{{ keycloak_database_idle_timeouts_min }}</idle-timeout-minutes>
+                    </timeout>
                     <validation>
                     {% if keycloak_database_jboss_connection_checker %}
                         <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker"></valid-connection-checker>
diff --git a/templates/standalone.xml.j2 b/templates/standalone.xml.j2
index 798e1ca..1f6b2c7 100644
--- a/templates/standalone.xml.j2
+++ b/templates/standalone.xml.j2
@@ -137,6 +137,9 @@
                     <pool>
                         <max-pool-size>{{ keycloak_database_max_pool_size }}</max-pool-size>
                     </pool>
+                   <timeout>
+                        <idle-timeout-minutes>{{ keycloak_database_idle_timeouts_min }}</idle-timeout-minutes>
+                    </timeout>
                     <validation>
                     {% if keycloak_database_jboss_connection_checker %}
                         <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker"></valid-connection-checker>
diff --git a/vars/main.yml b/vars/main.yml
index 0fbad09..49e8d7b 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -11,7 +11,6 @@ keycloak_download_url: 'https://downloads.jboss.org/keycloak/{{ keycloak_version
 keycloak_runtime_home: '{{ keycloak_install_dir }}/{{ keycloak_distribution }}'
 jboss_home: '{{ keycloak_runtime_home }}'
 keycloak_owned_directories:
-  - data
   - tmp
   - configuration
   - deployments