From 403cda1dcf295101d5c59187f0b51fe03b11223b Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Tue, 19 Jan 2021 01:59:31 +0100
Subject: [PATCH] add attributes to ldap config

---
 conf/gitlab.rb      | 9 ++++++++-
 scripts/install     | 2 +-
 upgrade-versions.sh | 7 +++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/gitlab.rb b/conf/gitlab.rb
index e3e9317..1b85e1b 100644
--- a/conf/gitlab.rb
+++ b/conf/gitlab.rb
@@ -506,7 +506,7 @@ gitlab_rails['ldap_servers'] = YAML.load <<-'EOS' # remember to close this block
     host: 'localhost'
     port: 389
     uid: 'uid'
-    encryption: 'plain' # "start_tls" or "simple_tls" or "plain"
+    encryption: 'plain' # 'start_tls' or 'simple_tls' or 'plain'
     bind_dn: 'ou=users,dc=yunohost,dc=org'
     password: ''
     active_directory: false
@@ -514,6 +514,13 @@ gitlab_rails['ldap_servers'] = YAML.load <<-'EOS' # remember to close this block
     block_auto_created_users: false
     base: 'dc=yunohost,dc=org'
     user_filter: '(&(objectClass=posixAccount)(permission=cn=gitlab.main,ou=permission,dc=yunohost,dc=org))'
+    timeout: 10
+    attributes: {
+      username: ['uid', 'sAMAccountName'],
+      name: 'cn',
+      first_name: 'givenName',
+      last_name: 'sn'
+    }
 EOS
 
 ### Smartcard authentication settings
diff --git a/scripts/install b/scripts/install
index e4ff8cf..7a99f1a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -242,7 +242,7 @@ ynh_script_progression --message="Configuring SSOwat..." --weight=1
 
 # Make app public if necessary
 if [ $is_public -eq 1 ]; then
-	ynh_permission_update --permission "main" --remove "all_users" --add "visitors"
+	ynh_permission_update --permission="main" --add "visitors"
 fi
 
 #=================================================
diff --git a/upgrade-versions.sh b/upgrade-versions.sh
index 468e33a..0f6ea7d 100755
--- a/upgrade-versions.sh
+++ b/upgrade-versions.sh
@@ -94,6 +94,13 @@ gitlab_rails['ldap_servers'] = YAML.load <<-'EOS' # remember to close this block
     block_auto_created_users: false
     base: 'dc=yunohost,dc=org'
     user_filter: '(&(objectClass=posixAccount)(permission=cn=gitlab.main,ou=permission,dc=yunohost,dc=org))'
+    timeout: 10
+    attributes: {
+      username: ['uid', 'sAMAccountName'],
+      name: 'cn',
+      first_name: 'givenName',
+      last_name: 'sn'
+    }
 EOS"
 
     # Add ldap conf