diff --git a/README.md b/README.md
index 30abd8e..bd421eb 100644
--- a/README.md
+++ b/README.md
@@ -24,8 +24,6 @@ Mastodon is a free, open-source social network. A decentralized alternative to c
![](https://framalibre.org/sites/default/files/mastodon.png)
-[Source code](https://github.com/tootsuite/mastodon)
-
## Configuration
### Install
@@ -41,6 +39,7 @@ Recover after disconnect:
$ screen -d
$ screen -r
```
+
### Update
#### Using __screen__ highly recommended
@@ -53,6 +52,10 @@ $ screen -r
## YunoHost specific features
+#### Multi-users support
+
+LDAP authentication is activated. All YunoHost users can authenticate.
+
#### Supported architectures
* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mastodon%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/mastodon/)
diff --git a/README_fr.md b/README_fr.md
index 78e6170..ea8fc4f 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -41,7 +41,7 @@ $ screen -r
```
L'utilisateur admin est crée automatiquement comme: user@domain.tld
-### Mise à jour
+### Mise à jour
#### Utilisation de __screen__ fortement recommandé
@@ -53,7 +53,11 @@ L'utilisateur admin est crée automatiquement comme: user@domain.tld
## Caractéristiques spécifiques YunoHost
-#### Supported architectures
+#### Support multi-utilisateurs
+
+L'authentification LDAP est activée. Tous les utilisateurs YunoHost peuvent s'authentifier.
+
+#### Architectures supportées
* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mastodon%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/mastodon/)
* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mastodon%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mastodon/)
diff --git a/conf/.env.production.sample b/conf/.env.production.sample
index 8b992d9..d27bf87 100644
--- a/conf/.env.production.sample
+++ b/conf/.env.production.sample
@@ -170,19 +170,20 @@ STREAMING_CLUSTER_NUM=1
# GID=1000
# LDAP authentication (optional)
-# LDAP_ENABLED=true
-# LDAP_HOST=localhost
-# LDAP_PORT=389
-# LDAP_METHOD=simple_tls
-# LDAP_BASE=ou=users,dc=yunohost,dc=org
-# LDAP_BIND_DN=uid=__LDAP_USER__,ou=users,dc=yunohost,dc=org
-# LDAP_PASSWORD=__LDAP_PASSWORD__
-# LDAP_UID=uid
-# LDAP_MAIL=mail
-# LDAP_SEARCH_FILTER=(|(%{uid}=%{email})(%{mail}=%{email}))
-# LDAP_UID_CONVERSION_ENABLED=true
-# LDAP_UID_CONVERSION_SEARCH=., -
-# LDAP_UID_CONVERSION_REPLACE=_
+LDAP_ENABLED=true
+LDAP_HOST=localhost
+LDAP_PORT=389
+LDAP_METHOD=start_tls
+LDAP_BASE=ou=users,dc=yunohost,dc=org
+LDAP_BIND_DN=uid=local,ou=users,dc=yunohost,dc=org
+LDAP_PASSWORD=
+LDAP_UID=uid
+LDAP_MAIL=mail
+LDAP_SEARCH_FILTER=(|(%{uid}=%{email})(%{mail}=%{email}))
+LDAP_UID_CONVERSION_ENABLED=true
+LDAP_UID_CONVERSION_SEARCH=., -
+LDAP_UID_CONVERSION_REPLACE=_
+LDAP_TLS_NO_VERIFY=true
# PAM authentication (optional)
# PAM authentication uses for the email generation the "email" pam variable
diff --git a/manifest.json b/manifest.json
index 2792cd4..8c7c3d4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -23,7 +23,7 @@
}
],
"requirements": {
- "yunohost": ">= 3.5"
+ "yunohost": ">= 3.7"
},
"multi_instance": true,
"services": [
diff --git a/scripts/install b/scripts/install
index 7d7d4b8..cb059ba 100644
--- a/scripts/install
+++ b/scripts/install
@@ -293,18 +293,6 @@ ynh_script_progression --message="Reloading nginx web server..." --weight=2
ynh_systemd_action --service_name=nginx --action=reload
-#=================================================
-# SEND A README FOR THE ADMIN
-#=================================================
-ynh_script_progression --message="Sending a readme for the admin..." --weight=17
-
-ynh_replace_string --match_string="__ADMIN_MAIL__" --replace_string="$admin_mail" --target_file="../conf/message"
-ynh_replace_string --match_string="__ADMIN_PASS__" --replace_string="$admin_pass" --target_file="../conf/message"
-ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="../conf/message"
-ynh_replace_string --match_string="__PATH_URL__" --replace_string="$path_url" --target_file="../conf/message"
-
-ynh_send_readme_to_admin --app_message="../conf/message" --recipients=$admin_mail --type='install'
-
#=================================================
# END OF SCRIPT
#=================================================
diff --git a/scripts/ynh_send_readme_to_admin__2 b/scripts/ynh_send_readme_to_admin__2
deleted file mode 100644
index 06cff8c..0000000
--- a/scripts/ynh_send_readme_to_admin__2
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/bash
-
-# Send an email to inform the administrator
-#
-# usage: ynh_send_readme_to_admin --app_message=app_message [--recipients=recipients] [--type=type]
-# | arg: -m --app_message= - The file with the content to send to the administrator.
-# | arg: -r, --recipients= - The recipients of this email. Use spaces to separate multiples recipients. - default: root
-# example: "root admin@domain"
-# If you give the name of a YunoHost user, ynh_send_readme_to_admin will find its email adress for you
-# example: "root admin@domain user1 user2"
-# | arg: -t, --type= - Type of mail, could be 'backup', 'change_url', 'install', 'remove', 'restore', 'upgrade'
-ynh_send_readme_to_admin() {
- # Declare an array to define the options of this helper.
- declare -Ar args_array=( [m]=app_message= [r]=recipients= [t]=type= )
- local app_message
- local recipients
- local type
- # Manage arguments with getopts
-
- ynh_handle_getopts_args "$@"
- app_message="${app_message:-}"
- recipients="${recipients:-root}"
- type="${type:-install}"
-
- # Get the value of admin_mail_html
- admin_mail_html=$(ynh_app_setting_get $app admin_mail_html)
- admin_mail_html="${admin_mail_html:-0}"
-
- # Retrieve the email of users
- find_mails () {
- local list_mails="$1"
- local mail
- local recipients=" "
- # Read each mail in argument
- for mail in $list_mails
- do
- # Keep root or a real email address as it is
- if [ "$mail" = "root" ] || echo "$mail" | grep --quiet "@"
- then
- recipients="$recipients $mail"
- else
- # But replace an user name without a domain after by its email
- if mail=$(ynh_user_get_info "$mail" "mail" 2> /dev/null)
- then
- recipients="$recipients $mail"
- fi
- fi
- done
- echo "$recipients"
- }
- recipients=$(find_mails "$recipients")
-
- # Subject base
- local mail_subject="☁️🆈🅽🅷☁️: \`$app\`"
-
- # Adapt the subject according to the type of mail required.
- if [ "$type" = "backup" ]; then
- mail_subject="$mail_subject has just been backup."
- elif [ "$type" = "change_url" ]; then
- mail_subject="$mail_subject has just been moved to a new URL!"
- elif [ "$type" = "remove" ]; then
- mail_subject="$mail_subject has just been removed!"
- elif [ "$type" = "restore" ]; then
- mail_subject="$mail_subject has just been restored!"
- elif [ "$type" = "upgrade" ]; then
- mail_subject="$mail_subject has just been upgraded!"
- else # install
- mail_subject="$mail_subject has just been installed!"
- fi
-
- local mail_message="This is an automated message from your beloved YunoHost server.
-
-Specific information for the application $app.
-
-$(if [ -n "$app_message" ]
-then
- cat "$app_message"
-else
- echo "...No specific information..."
-fi)
-
----
-Automatic diagnosis data from YunoHost
-
-__PRE_TAG1__$(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')__PRE_TAG2__"
-
- # Store the message into a file for further modifications.
- echo "$mail_message" > mail_to_send
-
- # If a html email is required. Apply html tags to the message.
- if [ "$admin_mail_html" -eq 1 ]
- then
- # Insert 'br' tags at each ending of lines.
- ynh_replace_string "$" "
" mail_to_send
-
- # Insert starting HTML tags
- sed --in-place '1s@^@\n\n
" mail_to_send - ynh_replace_string "__PRE_TAG2__" "<\pre>" mail_to_send - - # Insert finishing HTML tags - echo -e "\n\n" >> mail_to_send - - # Otherwise, remove tags to keep a plain text. - else - # Remove URL tags - ynh_replace_string "__URL_TAG[1,3]__" "" mail_to_send - ynh_replace_string "__URL_TAG2__" ": " mail_to_send - - # Remove PRE tags - ynh_replace_string "__PRE_TAG[1-2]__" "" mail_to_send - fi - - # Define binary to use for mail command - if [ -e /usr/bin/bsd-mailx ] - then - local mail_bin=/usr/bin/bsd-mailx - else - local mail_bin=/usr/bin/mail.mailutils - fi - - if [ "$admin_mail_html" -eq 1 ] - then - content_type="text/html" - else - content_type="text/plain" - fi - - # Send the email to the recipients - cat mail_to_send | $mail_bin -a "Content-Type: $content_type; charset=UTF-8" -s "$mail_subject" "$recipients" -}