From 2a00fbba75af9a66ae51e1bf87bdf2857251d89c Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 29 Jan 2021 00:21:00 +0100
Subject: [PATCH] fix

---
 conf/.env.example | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 scripts/install   |  7 ++++++-
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/conf/.env.example b/conf/.env.example
index fb6dfc2..8f2c735 100644
--- a/conf/.env.example
+++ b/conf/.env.example
@@ -42,3 +42,49 @@ MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+
+# General auth
+AUTH_METHOD=ldap
+
+# The LDAP host, Adding a port is optional
+LDAP_SERVER=ldap://127.0.0.1:389
+# If using LDAP over SSL you should also define the protocol:
+# LDAP_SERVER=ldaps://example.com:636
+
+# The base DN from where users will be searched within
+LDAP_BASE_DN=ou=users,dc=yunohost,dc=org
+
+# The full DN and password of the user used to search the server
+# Can both be left as false to bind anonymously
+LDAP_DN=false
+LDAP_PASS=false
+
+# A filter to use when searching for users
+# The user-provided user-name used to replace any occurrences of '${user}'
+# If you're setting this option via other means, such as within a docker-compose.yml,
+# you may need escape the $, often using $$ or \$ instead. 
+LDAP_USER_FILTER=(&(uid=${user}))
+
+# Set the LDAP version to use when connecting to the server
+LDAP_VERSION=false
+
+# Set the property to use as a unique identifier for this user.
+# Stored and used to match LDAP users with existing BookStack users.
+# Prefixing the value with 'BIN;' will assume the LDAP service provides the attribute value as
+# binary data and BookStack will convert the value to a hexidecimal representation.
+# Defaults to 'uid'.
+LDAP_ID_ATTRIBUTE=uid
+
+# Set the default 'email' attribute. Defaults to 'mail'
+LDAP_EMAIL_ATTRIBUTE=mail
+
+# Set the property to use for a user's display name. Defaults to 'cn'
+LDAP_DISPLAY_NAME_ATTRIBUTE=cn
+
+# If you need to allow untrusted LDAPS certificates, add the below and uncomment (remove the #)
+# Only set this option if debugging or you're absolutely sure it's required for your setup.
+#LDAP_TLS_INSECURE=true
+
+# If you need to debug the details coming from your LDAP server, add the below and uncomment (remove the #)
+# Only set this option if debugging since it will block logins and potentially show private details.
+#LDAP_DUMP_USER_DETAILS=true
\ No newline at end of file
diff --git a/scripts/install b/scripts/install
index a3905de..dca1e89 100644
--- a/scripts/install
+++ b/scripts/install
@@ -126,7 +126,12 @@ popd
 
 # Set permissions to app files
 chown -R www-data:www-data $final_path
-chmod -R 755 $final_path/bootstrap/cache $final_path/public/uploads $final_path/storage
+chown -R www-data:www-data $final_path/bootstrap/cache public/uploads storage
+chown -R www-data:www-data $final_path/public/uploads
+chown -R www-data:www-data $final_path/storage
+chmod -R 755 $final_path/bootstrap/cache
+chmod -R 755 $final_path/public/uploads
+chmod -R 755 $final_path/storage
 
 #=================================================
 # SETUP SSOWAT