diff options
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | README_fr.md | 8 | ||||
| -rw-r--r-- | conf/.env.production.sample | 19 | ||||
| -rw-r--r-- | conf/message | 5 | ||||
| -rw-r--r-- | scripts/install | 18 | ||||
| -rw-r--r-- | scripts/ynh_send_readme_to_admin__2 | 140 |
6 files changed, 22 insertions, 175 deletions
@@ -24,8 +24,6 @@ Mastodon is a free, open-source social network. A decentralized alternative to c  -[Source code](https://github.com/tootsuite/mastodon) - ## Configuration ### Install @@ -53,6 +51,7 @@ Recover after disconnect: $ screen -d $ screen -r ``` + ### Update #### Using __screen__ highly recommended @@ -65,6 +64,10 @@ $ screen -r ## YunoHost specific features +#### Multi-users support + +LDAP authentication is activated. + #### Supported architectures * x86-64b - [](https://ci-apps.yunohost.org/ci/apps/mastodon/) diff --git a/README_fr.md b/README_fr.md index 803538f..e286481 100644 --- a/README_fr.md +++ b/README_fr.md @@ -52,7 +52,7 @@ $ screen -r ``` L'utilisateur admin est crée automatiquement comme: user@domain.tld -### Mise à jour +### Mise à jour #### Utilisation de __screen__ fortement recommandé @@ -64,7 +64,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 + +#### Architectures supportées * x86-64b - [](https://ci-apps.yunohost.org/ci/apps/mastodon/) * ARMv8-A - [](https://ci-apps-arm.yunohost.org/ci/apps/mastodon/) diff --git a/conf/.env.production.sample b/conf/.env.production.sample index 203b74b..33f7d93 100644 --- a/conf/.env.production.sample +++ b/conf/.env.production.sample @@ -155,15 +155,16 @@ 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_SEARCH_FILTER="%{uid}=%{email}" +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=uid=local,ou=users,dc=yunohost,dc=org +LDAP_PASSWORD= +LDAP_UID=uid +LDAP_SEARCH_FILTER="%{uid}=%{email}" +LDAP_TLS_NO_VERIFY=true # PAM authentication (optional) # PAM authentication uses for the email generation the "email" pam variable diff --git a/conf/message b/conf/message deleted file mode 100644 index 488d86d..0000000 --- a/conf/message +++ /dev/null @@ -1,5 +0,0 @@ -Mastodon was successfully installed :) -Please open 'https://__DOMAIN____PATH_URL__' -The admin email is: __ADMIN_MAIL__ -The admin password is: __ADMIN_PASS__ -If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/mastodon_ynh
\ No newline at end of file diff --git a/scripts/install b/scripts/install index 5bc5c23..55b1480 100644 --- a/scripts/install +++ b/scripts/install @@ -9,7 +9,6 @@ source _common.sh source ynh_install_ruby source ynh_add_extra_apt_repos__3 -source ynh_send_readme_to_admin__2 source /usr/share/yunohost/helpers #================================================= @@ -184,12 +183,9 @@ pushd "$final_path/live" sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.1/bin/bundle exec rails db:migrate --quiet sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.1/bin/bundle exec rails assets:precompile --quiet sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.1/bin/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt - sudo -u "$app" env PATH=$PATH RAILS_ENV=production bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=admin > acc.txt + sudo -u "$app" env PATH=$PATH RAILS_ENV=production bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=admin > /dev/null 2>&1 popd -admin_pass=$( tail -1 $final_path/live/acc.txt | head -1 | cut -c 15- ) -ynh_secure_remove --file="$final_path/live/acc.txt" - vapid_private_key=$(grep -oP "VAPID_PRIVATE_KEY=\K\w+" "$final_path/live/key.txt") vapid_public_key=$(grep -oP "VAPID_PUBLIC_KEY=\K\w+" "$final_path/live/key.txt") @@ -279,18 +275,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 "$" "<br>" mail_to_send - - # Insert starting HTML tags - sed --in-place '1s@^@<!DOCTYPE html>\n<html>\n<head></head>\n<body>\n@' mail_to_send - - # Keep tabulations - ynh_replace_string " " "\ \ " mail_to_send - ynh_replace_string "\t" "\ \ " mail_to_send - - # Insert url links tags - ynh_replace_string "__URL_TAG1__\(.*\)__URL_TAG2__\(.*\)__URL_TAG3__" "<a href=\"\2\">\1</a>" mail_to_send - - # Insert pre tags - ynh_replace_string "__PRE_TAG1__" "<pre>" mail_to_send - ynh_replace_string "__PRE_TAG2__" "<\pre>" mail_to_send - - # Insert finishing HTML tags - echo -e "\n</body>\n</html>" >> 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" -} |