From e720e524613d9f6c5eedd59b943aff60036fd809 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Thu, 26 May 2022 17:28:16 +0200
Subject: [PATCH] Cleanup the options.

---
 defaults/main.yml          |  8 ++++----
 handlers/main.yml          |  5 -----
 tasks/main.yml             | 10 ++++++----
 templates/minio.default.j2 |  2 +-
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index ffc9913..ecb5ad5 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -28,7 +28,7 @@ minio_data_prefix: /storage
 minio_volume_prefix: 'minio'
 minio_volume_subdir: 'data'
 minio_port: 9000
-minio_volumes: 'https://{{ minio_server_name_prefix }}{%raw%}{{%endraw%}1...{{ minio_server_instances_num }}{%raw%}}{%endraw%}.{{ minio_server_domain_name }}:{{ minio_port }}/{{ minio_data_prefix }}/{{ minio_volume_prefix }}{%raw%}{{%endraw%}1...{{ minio_disk_volumes }}{%raw%}}{%endraw%}/{{ minio_volume_subdir }}'
+minio_volumes: 'https://{{ minio_server_name_prefix }}{%raw%}{{%endraw%}1...{{ minio_server_instances_num }}{%raw%}}{%endraw%}.{{ minio_server_domain_name }}:{{ minio_port }}{{ minio_data_prefix }}/{{ minio_volume_prefix }}{%raw%}{{%endraw%}1...{{ minio_disk_volumes }}{%raw%}}{%endraw%}/{{ minio_volume_subdir }}'
 
 minio_dedicated_console: true
 minio_console_port: 9001
@@ -47,7 +47,7 @@ minio_root_user: minio_adm
 minio_storage_class_standard: 4
 minio_storage_class_rrs: 2
 #
-minio_prometheus_url: '{{ minio_ui_url }}'
+minio_prometheus_url: 'https://prometheus.localhost'
 minio_prometheus_jobid: 'minio-job'
 minio_prometheus_auth_type: public
 minio_external_oidc: false
@@ -55,8 +55,8 @@ minio_openid_config_url: http://localhost:8080/auth/
 minio_openid_realm: 'realm'
 minio_openid_client_id: 'minio_client_id'
 # minio_openid_client_secret: 'use a vault'
-minio_openid_client_name: 'minio_client_name'
+minio_openid_claim_name: 'policy'
 minio_openid_set_claim_prefix: false
 minio_openid_claim_prefix: 'minio_'
 minio_openid_scopes: ''
-minio_openid_redirect_uri: ''
+minio_openid_redirect_uri: '{{ minio_ui_url }}/oauth_callback'
diff --git a/handlers/main.yml b/handlers/main.yml
index efab34a..3543bd3 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -3,8 +3,3 @@
   service:
     name: minio
     state: restarted
-
-- name: reload minio
-  service:
-    name: minio
-    state: reloaded
diff --git a/tasks/main.yml b/tasks/main.yml
index 49e14bf..96beab1 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -21,6 +21,8 @@
         owner: '{{ minio_username }}'
         group: '{{ minio_username }}'
         mode: 0440
+      notify: Restart minio
+      tags: ['minio', 'minio_baremetal', 'minio_conf']
 
     - name: Change the ownership of the minio data disks
       file:
@@ -67,7 +69,7 @@
         group: '{{ minio_username }}'
         mode: 0640
         remote_src: true
-      notify: reload minio
+      notify: Restart minio
 
     - name: Copy the certificate file where minio expects it
       copy:
@@ -77,7 +79,7 @@
         group: '{{ minio_username }}'
         mode: 0640
         remote_src: true
-      notify: reload minio
+      notify: Restart minio
 
     - name: Copy the CA trust file on deb systems
       copy:
@@ -87,7 +89,7 @@
         group: '{{ minio_username }}'
         mode: 0640
         remote_src: true
-      notify: reload minio
+      notify: Restart minio
       when: ansible_distribution_file_variety == "Debian"
 
     - name: Copy the CA trust file on EL systems
@@ -98,7 +100,7 @@
         group: '{{ minio_username }}'
         mode: 0640
         remote_src: true
-      notify: reload minio
+      notify: Restart minio
       when: ansible_distribution_file_variety == "RedHat"
 
     - name: Install a script that updates the certificates upon renewal
diff --git a/templates/minio.default.j2 b/templates/minio.default.j2
index bf53f1e..e52257e 100644
--- a/templates/minio.default.j2
+++ b/templates/minio.default.j2
@@ -43,7 +43,7 @@ MINIO_PROMETHEUS_AUTH_TYPE={{ minio_prometheus_auth_type }}
 MINIO_IDENTITY_OPENID_CONFIG_URL={{ minio_openid_config_url }}
 MINIO_IDENTITY_OPENID_CLIENT_ID={{ minio_openid_client_id }}
 MINIO_IDENTITY_OPENID_CLIENT_SECRET={{ minio_openid_client_secret }}
-MINIO_IDENTITY_OPENID_CLAIM_NAME={{ minio_openid_client_name }}
+MINIO_IDENTITY_OPENID_CLAIM_NAME={{ minio_openid_claim_name }}
 {% if minio_openid_set_claim_prefix %}
 MINIO_IDENTITY_OPENID_CLAIM_PREFIX={{ minio_openid_claim_prefix }}
 {% endif %}