diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 1dd495b..765ec3f 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1 @@ -French and free content management system (CMS) \ No newline at end of file +PHPBoost allows everyone to create his own website without any particular knowledge required in webmastering. \ No newline at end of file diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index f1c3d99..391f2d6 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -1,4 +1,6 @@ -## Configuration +Complete the registration process from the setup page displayed. +Details for MySQL database to be enterted while registration process: -1. The app will require to complete the registration process after the instllation is complete by **visiting the domain** on which PHPBoost is installed. -1. The MySQL database credentials will be sent to the **admin mail**. Fill these details while doing the registration process. +Database login: __DB_USER__ +Database name: __DB_NAME__ +Database password: __DB_PWD__ diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md index e19271f..21eff78 100644 --- a/doc/POST_INSTALL_fr.md +++ b/doc/POST_INSTALL_fr.md @@ -1,4 +1,6 @@ -## Configuration +Terminez le processus d'enregistrement à partir de la page de configuration affichée. +Détails de la base de données MySQL à saisir lors du processus d'inscription : -1. Une fois l'installation terminée, l'application devra terminer le processus d'enregistrement en **visitant le domaine** sur lequel PHPBoost est installé. -1. Les informations d'identification de la base de données MySQL seront envoyées à **l'email admin**. Remplissez ces détails lors du processus d'inscription. +Connexion à la base de données : __DB_USER__ +Nom de la base de données : __DB_NAME__ +Mot de passe de la base de données : __DB_PWD__ diff --git a/manifest.toml b/manifest.toml index ca8f3fb..4faf74b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ description.fr = "système de gestion de contenu (CMS) français et libre" version = "5.2.11~ynh1" -maintainers = ["liberodark"] +maintainers = [""] [upstream] license = "GPL-3.0-only" @@ -49,7 +49,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php7.4-mysql php7.4-gd" + packages = "php8.0-mysql php8.0-gd" [resources.database] type = "mysql" diff --git a/scripts/_common.sh b/scripts/_common.sh index 74fab70..b7c971c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.4" +YNH_PHP_VERSION="8.0" #================================================= # PERSONAL HELPERS @@ -17,60 +17,3 @@ YNH_PHP_VERSION="7.4" #================================================= # FUTURE OFFICIAL HELPERS #================================================= - -# Send an email to inform the administrator -# -# usage: ynh_send_readme_to_admin app_message [recipients] -# | arg: app_message - The message to send to the administrator. -# | arg: 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" -ynh_send_readme_to_admin() { - local app_message="${1:-...No specific information...}" - local recipients="${2:-root}" - - # 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") - - local mail_subject="☁️🆈🅽🅷☁️: \`$app\` has important message for you" - - local mail_message="This is an automated message from your beloved YunoHost server. -Specific information for the application $app. -$app_message ---- -Automatic diagnosis data from YunoHost -$(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')" - - # 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 - - # Send the email to the recipients - echo "$mail_message" | $mail_bin -a "Content-Type: text/plain; charset=UTF-8" -s "$mail_subject" "$recipients" -} diff --git a/scripts/install b/scripts/install index 540031a..8088c60 100644 --- a/scripts/install +++ b/scripts/install @@ -37,26 +37,6 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=3 # Create a dedicated PHP-FPM config ynh_add_fpm_config -#================================================= -# SEND A README FOR THE ADMIN -#================================================= -ynh_script_progression --message="Sending a readme for the admin..." - -message="PHPBoost was successfully installed :) - -Please open your $app domain: https://$domain$path - -Complete the registration process from the setup page displayed. -Details for MySQL database to be enterted while registration process: - -Database login: $app -Database name: $app -Database password: $db_pwd - -If you are facing any problem or want to improve this app, please open a new issue here: https://github.com/YunoHost-Apps/phpboost_ynh/issues" - -ynh_send_readme_to_admin "$message" - #================================================= # END OF SCRIPT #=================================================