From 3281824eac499817560cbe47e623db495386c7b3 Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Wed, 28 Jun 2023 15:51:43 +0200 Subject: [PATCH 1/2] Fix gss_mode for multinode --- manifests/multinode.pp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifests/multinode.pp b/manifests/multinode.pp index f169c37..2cc335f 100644 --- a/manifests/multinode.pp +++ b/manifests/multinode.pp @@ -14,6 +14,8 @@ class sunetdrive::multinode ( $db_ip = hiera_hash($environment)['db'] $admin_password = hiera('admin_password') $cluster_admin_password = hiera('cluster_admin_password') + # This is a global value from common.yaml but overridden in the gss-servers local.yaml + $gss_mode = hiera('gss_mode') $twofactor_enforced_groups = [] $twofactor_enforced_excluded_groups = [] From 1152fd972fa32579288a7a95f31e0cf23f820100 Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Thu, 6 Jul 2023 14:50:47 +0200 Subject: [PATCH 2/2] Add 'gss.username_format' => 'sanitize', --- templates/application/config.php.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/application/config.php.erb b/templates/application/config.php.erb index f804137..c48eceb 100644 --- a/templates/application/config.php.erb +++ b/templates/application/config.php.erb @@ -57,6 +57,7 @@ $CONFIG = array ( 'gss.master.url' => '<%= @gss_master_url %>', 'gss.mode' => '<%= @gss_mode %>', 'gss.user.discovery.module' => '\\OCA\\GlobalSiteSelector\\UserDiscoveryModules\\ManualUserMapping', + 'gss.username_format' => 'sanitize', 'installed' => true, 'instanceid' => '<%= @instanceid %>', 'integrity.check.disabled' => true,