diff --git a/conf/.env.example b/conf/.env.example index 98e8f24..56fff24 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -49,7 +49,7 @@ MAIL_PASSWORD=null MAIL_ENCRYPTION=null # General auth -AUTH_METHOD=ldap +AUTH_METHOD=standard # The LDAP host, Adding a port is optional LDAP_SERVER=ldap://127.0.0.1:389 @@ -68,7 +68,7 @@ LDAP_PASS=false # 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})) +LDAP_USER_FILTER=(&(|(objectclass=posixAccount))(uid={{username}})(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org)) # Set the LDAP version to use when connecting to the server LDAP_VERSION=false diff --git a/conf/nginx.conf b/conf/nginx.conf index 1ca4c76..62b5830 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,6 +9,9 @@ location __PATH__/ { rewrite ^ https://$server_name$request_uri? permanent; } + client_max_body_size 100m; + client_body_timeout 120s; # Default is 60, May need to be increased for very large uploads + index index.php; try_files $uri $uri/ @bookstack; diff --git a/manifest.json b/manifest.json index e53fc31..e7a08f8 100644 --- a/manifest.json +++ b/manifest.json @@ -49,7 +49,7 @@ "en": "Choose the application language", "fr": "Choisissez la langue de l'application" }, - "choices": ["de", "en", "es", "fr", "it", "pt"], + "choices": ["de", "en", "es", "fr", "it", "nl"], "default": "en" }, { diff --git a/scripts/install b/scripts/install index 2e12774..4513d53 100644 --- a/scripts/install +++ b/scripts/install @@ -109,6 +109,7 @@ ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --targ ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$final_path/.env" ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="$final_path/.env" ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$final_path/.env" +ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="$final_path/.env" ynh_store_file_checksum $final_path/.env