Removing Send a email

scripts/_common.sh

@@ -15,145 +15,6 @@ pkg_dependencies="coturn acl"
 # EXPERIMENTAL HELPERS
 #=================================================
 
-# 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 "  " "\&#160;\&#160;" mail_to_send
-                ynh_replace_string "\t" "\&#160;\&#160;" 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"
-}
-
 #=================================================
 # FUTURE OFFICIAL HELPERS
 #=================================================

scripts/install

@@ -86,7 +86,7 @@ port=$(ynh_find_port --port=8443)
 turnserver_tls_port=$(ynh_find_port --port=5349)
 turnserver_alt_tls_port=$(ynh_find_port --port=$((turnserver_tls_port+1)))
 
-# Open the port
+# Open the ports
 ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port
 ynh_exec_warn_less yunohost firewall allow Both $turnserver_tls_port
 ynh_exec_warn_less yunohost firewall allow Both $turnserver_alt_tls_port
@@ -285,23 +285,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
-#=================================================
-
-# WARNING : theses command are used in INSTALL, RESTORE
-# For any update do it in all files
-
-echo "Galène was successfully installed :)
-
-Galène is now accesible at this adress: https://$domain
-
-Galène implements a TURN server (for VoIP), to have this fully functional please read the 'TURN server' section in the README available here: https://github.com/YunoHost-Apps/galene_ynh .
-
-If you're facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/galene_ynh" > mail_to_send
-
-ynh_send_readme_to_admin --app_message="mail_to_send" --type="install"
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/restore

@@ -191,19 +191,6 @@ setfacl -R -m user:turnserver:rwX  /var/log/$app
 
 ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 
-#=================================================
-# SEND A README FOR THE ADMIN
-#=================================================
-
-# WARNING : theses command are used in INSTALL, RESTORE
-# For any update do it in all files
-
-echo "Galène also implements a TURN server (for VoIP), to have this fully functional please read the 'Turnserver' section in the README available here: https://github.com/YunoHost-Apps/galene_ynh .
-
-If you're facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/galene_ynh" > mail_to_send
-
-ynh_send_readme_to_admin --app_message="mail_to_send" --type="restore"
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================

scripts/upgrade

@@ -19,7 +19,6 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 admin=$(ynh_app_setting_get --app=$app --key=admin)
-is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 password=$(ynh_app_setting_get --app=$app --key=password)
 group_name=$(ynh_app_setting_get --app=$app --key=group_name)