From b6e962fa9b89a0d70a6239ec439126ff1a5155f5 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Tue, 8 Mar 2022 18:35:45 +0100
Subject: [PATCH] Fix a couple of option names.

---
 defaults/main.yml                  | 2 +-
 templates/shinyproxy-2-conf.yml.j2 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 4d591a8..88af109 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -89,7 +89,7 @@ shinyproxy_keycloak_url: 'http://localhost:8180/auth'
 shinyproxy_keycloak_resource: 'shiny_client'
 shinyproxy_keycloak_secret: 'use a vault file'
 shinyproxy_keycloak_ssl_required: 'external'
-# preferred_username, nickname, email
+# name, preferred_username, nickname, email
 shinyproxy_keycloak_name_attribute: 'preferred_username'
 shinyproxy_keycloak_role_mappings: 'false'
 
diff --git a/templates/shinyproxy-2-conf.yml.j2 b/templates/shinyproxy-2-conf.yml.j2
index 0b79689..15da3da 100644
--- a/templates/shinyproxy-2-conf.yml.j2
+++ b/templates/shinyproxy-2-conf.yml.j2
@@ -63,7 +63,7 @@ proxy:
     resource: {{ shinyproxy_keycloak_resource }}
     credentials-secret: {{ shinyproxy_keycloak_secret }}
     ssl-required: {{ shinyproxy_keycloak_ssl_required }}
-    proxy.keycloak.name-attribute: {{ shinyproxy_keycloak_name_attribute }}
+    name-attribute: {{ shinyproxy_keycloak_name_attribute }}
     use-resource-role-mappings: {{ shinyproxy_keycloak_role_mappings }}
 {% endif %}
 {% if shinyproxy_container_backend == 'docker' or shinyproxy_container_backend == 'docker-swarm' %}
@@ -128,7 +128,7 @@ proxy:
   {% endif %}
   {% if app.groups is defined %}
 
-    groups: [{{ app.groups }}]
+    access-groups: [{{ app.groups }}]
   
   {% endif %}