Merge branch 'testing' into fucking_maintenance

2024-09-03 20:36:10 +02:00 · 2020-04-22 14:33:08 +02:00 · 2020-04-22 14:33:08 +02:00 · 6f7e5dde74
commit 6f7e5dde74
parent 373685d573 ff2e68d13a
16 changed files with 345 additions and 40 deletions
--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 # Wordpress for YunoHost

-[![Integration level](https://dash.yunohost.org/integration/wordpress.svg)](https://dash.yunohost.org/appci/app/wordpress)  
+[![Integration level](https://dash.yunohost.org/integration/wordpress.svg)](https://dash.yunohost.org/appci/app/wordpress) ![](https://ci-apps.yunohost.org/ci/badges/wordpress.status.svg) [![](https://ci-apps.yunohost.org/ci/badges/wordpress.maintain.svg)](https://github.com/YunoHost/Apps/#what-to-do-if-i-cant-maintain-my-app-anymore-)  
 [![Install Wordpress with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=wordpress)

 > *This package allow you to install wordpress quickly and simply on a YunoHost server.  
@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 WordPress is open source software you can use to create a beautiful website, blog, or app.  
 With this package, you can even activate the [multisite](https://codex.wordpress.org/Glossary#Multisite) option.

-**Shipped version:** 5.3.2
+**Shipped version:** 5.4

 ## Screenshots

@ -41,7 +41,7 @@ Supported, with LDAP and SSO.

 * x86-64b - [![](https://ci-apps.yunohost.org/ci/logs/wordpress%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/wordpress/)
 * ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/wordpress%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/wordpress/)
-* Jessie x86-64b - [![](https://ci-stretch.nohost.me/ci/logs/wordpress%20%28Apps%29.svg)](https://ci-stretch.nohost.me/ci/apps/wordpress/)
+* Buster x86-64b - [![](https://ci-buster.nohost.me/ci/logs/wordpress%20%28Apps%29.svg)](https://ci-buster.nohost.me/ci/apps/wordpress/)

 ## Limitations

--- a/actions.toml
+++ b/actions.toml
@ -10,6 +10,36 @@ description = "Change the public access of the app."
            ask = "Is it a public app ?"
            default = true

+[reset_default_nginx]
+name = "Reset the nginx config for this app."
+command = "/bin/bash scripts/actions/reset_default_system nginx"
+# user = "root"  # optional
+# cwd = "/" # optional
+# accepted_return_codes = [0, 1, 2, 3]  # optional
+accepted_return_codes = [0]
+description = "Reset the nginx config for this app."
+
+
+[reset_default_phpfpm]
+name = "Reset the php-fpm config for this app."
+command = "/bin/bash scripts/actions/reset_default_system phpfpm"
+# user = "root"  # optional
+# cwd = "/" # optional
+# accepted_return_codes = [0, 1, 2, 3]  # optional
+accepted_return_codes = [0]
+description = "Reset the php-fpm config for this app."
+
+
+[reset_default_app]
+name = "Reset the app with a default configuration."
+command = "/bin/bash scripts/actions/reset_default_app"
+# user = "root"  # optional
+# cwd = "/" # optional
+# accepted_return_codes = [0, 1, 2, 3]  # optional
+accepted_return_codes = [0]
+description = "Reset the app to its default configuration to try to fix potential issues.<br>This action won't remove any data added to the app.<br>However, if you have modified any configuration, it will be overwritten."
+
+
 [disable_maintenance]
 name = "Disable the maintenance mode of Wordpress"
 command = "/bin/bash scripts/actions/disable_maintenance"
--- a/18
+++ b/18
@ -6,6 +6,17 @@
 		language="fr_FR"
 		multisite=0
 		is_public=1	(PUBLIC|public=1|private=0)
+    ; Actions
+        is_public=0|1
+    ; Config_panel
+        main.is_public.is_public=0|1
+        main.overwrite_files.overwrite_nginx=0|1
+        main.overwrite_files.overwrite_phpfpm=0|1
+        main.global_config.email_type=0|1
+        main.php_fpm_config.footprint=low|medium|high
+        main.php_fpm_config.free_footprint=20
+        main.php_fpm_config.usage=low|medium|high
+        main.php_fpm_config.force_max_children=20|0
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
@ -19,6 +30,8 @@
 		multi_instance=1
 		port_already_use=0
 		change_url=1
+        actions=1
+        config_panel=1
 ;; Test avec multisite
 	; Manifest
 		domain="domain.tld"	(DOMAIN)
@ -30,19 +43,16 @@
 	; Checks
 		setup_sub_dir=1
 		setup_root=0
-		setup_nourl=0
 		setup_private=1
 		setup_public=1
 		upgrade=1
 		backup_restore=1
 		multi_instance=1
-		port_already_use=0
-		change_url=0
 ;;; Levels
 	Level 5=auto
 ;;; Options
 Email=
-Notification=down
+Notification=change
 ;;; Upgrade options
 	; commit=cbb74263e33deb0ec36f99886a2f773e36d40fd9
 		name=Upgrade 4.8
--- a/conf/app.src
+++ b/conf/app.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://wordpress.org/wordpress-5.3.2.tar.gz
-SOURCE_SUM=ec7fcc299de72d4914a688ea34c96f37
+SOURCE_URL=https://wordpress.org/wordpress-5.4.tar.gz
+SOURCE_SUM=28e230c169031b92a4766d1e9cd105e1
 SOURCE_SUM_PRG=md5sum
 ARCH_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
--- a/config_panel.toml
+++ b/config_panel.toml
@ -60,3 +60,9 @@ name = "Wordpress configuration"
        choices = ["low", "medium", "high"]
        default = "low"
        help = "low: Personal usage, behind the sso. No RAM footprint when not used, but the impact on the processor can be high if many users are using the service.<br>medium: Low usage, few people or/and publicly accessible. Low RAM footprint, medium processor footprint when used.<br>high: High usage, frequently visited website. High RAM footprint, but lower on processor usage and quickly responding."
+
+        [main.php_fpm_config.force_max_children]
+        ask = "Force the value of pm.max_children ?"
+        type = "number"
+        default = "0"
+        help = "Do not change this value unless you're sure about what you're doing !<br>pm.max_children is automatically defined by this formula: $max_ram / 2 / $footprint<br>You can force that value, and ignore the formula by changing the value here.<br>To reset to the default value, set to 0."
--- a/manifest.json
+++ b/manifest.json
@ -6,7 +6,7 @@
 		"en": "Create a beautiful blog or website easily",
 		"fr": "Logiciel de création de blog ou de site Web"
 	},
-	"version": "5.3.2~ynh1",
+	"version": "5.4~ynh1",
 	"url": "https://wordpress.org/",
 	"license": "GPL-2.0",
 	"maintainer": {
--- a/pull_request_template.md
+++ b/pull_request_template.md
@ -2,7 +2,7 @@
 - *Description of why you made this PR*

 ## Solution
- *And how you fix that*
+- *And how do you fix that problem*

 ## PR Status
 - [ ] Code finished.
@ -14,10 +14,9 @@
 ## Validation
 ---
 *Minor decision*
- **Upgrade previous version** : 
 - [ ] **Code review** : 
 - [ ] **Approval (LGTM)** :  
- [ ] **Approval (LGTM)** : 
+*Code review and approval have to be from a member of @YunoHost-Apps/apps-group*
 - **CI succeeded** : 
 [![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/wordpress_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/wordpress_ynh%20PR-NUM-/)  
 *Please replace '-NUM-' in this link by the PR number.*  
--- a/scripts/actions/public_private
+++ b/scripts/actions/public_private
@ -8,6 +8,13 @@

 source /usr/share/yunohost/helpers

+#=================================================
+# MANAGE SCRIPT FAILURE
+#=================================================
+
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
 #=================================================
 # RETRIEVE ARGUMENTS
 #=================================================
@ -15,7 +22,7 @@ source /usr/share/yunohost/helpers
 # Get is_public
 is_public=${YNH_ACTION_IS_PUBLIC}

-app=${YNH_APP_INSTANCE_NAME:-$YNH_APP_ID}
+app=$YNH_APP_INSTANCE_NAME

 #=================================================
 # CHECK IF ARGUMENTS ARE CORRECT
--- a/scripts/actions/reset_default_app
+++ b/scripts/actions/reset_default_app
@ -0,0 +1,128 @@
+#!/bin/bash
+
+#=================================================
+# GENERIC STARTING
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+source scripts/_common.sh
+source /usr/share/yunohost/helpers
+source scripts/_ynh_add_fpm_config
+
+#=================================================
+# MANAGE SCRIPT FAILURE
+#=================================================
+
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
+#=================================================
+# RETRIEVE ARGUMENTS
+#=================================================
+
+app=$YNH_APP_INSTANCE_NAME
+
+domain=$(ynh_app_setting_get --app=$app --key=domain)
+path_url=$(ynh_app_setting_get --app=$app --key=path)
+is_public=$(ynh_app_setting_get --app=$app --key=is_public)
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+
+#=================================================
+# SPECIFIC ACTION
+#=================================================
+# ACTIVATE MAINTENANCE MODE
+#=================================================
+ynh_script_progression --message="Activating maintenance mode..."
+
+ynh_maintenance_mode_ON
+
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+
+ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=1
+
+# Create a dedicated nginx config
+yunohost app action run $app reset_default_nginx
+
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Making sure dedicated system user exists..."
+
+# Create a dedicated user (if not existing)
+ynh_system_user_create --username=$app
+
+#=================================================
+# PHP-FPM CONFIGURATION
+#=================================================
+
+ynh_script_progression --message="Upgrading php-fpm configuration..." --weight=2
+
+# Create a dedicated php-fpm config
+yunohost app action run $app reset_default_phpfpm
+
+#=================================================
+# CREATE A CRON TASK FOR AUTOMATIC UPDATE
+#=================================================
+
+echo "# Reach everyday wp-cron.php?doing_wp_cron to trig the internal wordpress cron.
+0 3  *  *  * root wget -q -O - https://$domain$path_url/wp-cron.php?doing_wp_cron >/dev/null 2>&1" > /etc/cron.d/$app
+
+#=================================================
+# SECURE FILES AND DIRECTORIES
+#=================================================
+
+# Set permissions to app files
+# Files have to be own by the user of wordpress. To allow upgrade from the app.
+chown -R $app: $final_path
+# Except the file config wp-config.php
+chown root: $final_path/wp-config.php
+
+# Reset permissions
+find $final_path/ -type f -print0 | xargs -0 chmod 0644
+find $final_path/ -type d -print0 | xargs -0 chmod 0755
+
+#=================================================
+# UPGRADE FAIL2BAN
+#=================================================
+ynh_script_progression --message="Reconfiguring fail2ban..." --weight=5
+
+# Create a dedicated fail2ban config
+ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="PHP message: Leed: wrong login for .* client: <HOST>" --max_retry=5
+
+#=================================================
+# SETUP SSOWAT
+#=================================================
+ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=1
+
+# Remove skipped_uris if it's still present
+ynh_app_setting_delete --app=$app --key=skipped_uris
+if [ $is_public -eq 0 ]; then
+	# Remove the public access
+	ynh_app_setting_delete --app=$app --key=unprotected_uris
+else
+	# Or replace skipped_uris by unprotected_uris
+	ynh_app_setting_set --app=$app --key=unprotected_uris --value="/"
+fi
+
+#=================================================
+# RELOAD NGINX
+#=================================================
+ynh_script_progression --message="Reloading nginx web server..."
+
+ynh_systemd_action --service_name=nginx --action=reload
+
+#=================================================
+# DEACTIVE MAINTENANCE MODE
+#=================================================
+ynh_script_progression --message="Disabling maintenance mode..."
+
+ynh_maintenance_mode_OFF
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Execution completed" --last
--- a/scripts/actions/reset_default_system
+++ b/scripts/actions/reset_default_system
@ -0,0 +1,80 @@
+#!/bin/bash
+
+#=================================================
+# GENERIC STARTING
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+source scripts/_common.sh
+source /usr/share/yunohost/helpers
+source scripts/_ynh_add_fpm_config
+
+#=================================================
+# MANAGE SCRIPT FAILURE
+#=================================================
+
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
+#=================================================
+# RETRIEVE ARGUMENTS
+#=================================================
+
+app=$YNH_APP_INSTANCE_NAME
+
+type=$1
+
+domain=$(ynh_app_setting_get --app=$app --key=domain)
+path_url=$(ynh_app_setting_get --app=$app --key=path)
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+
+multisite=$(ynh_app_setting_get --app=$app --key=multisite)
+is_public=$(ynh_app_setting_get --app=$app --key=is_public)
+
+#=================================================
+# SPECIFIC ACTION
+#=================================================
+# RESET THE CONFIG FILE
+#=================================================
+
+if [ $type == nginx ]; then
+    name=Nginx
+elif [ $type == phpfpm ]; then
+    name=PHP-FPM
+else
+    ynh_die --message="The type $type is not recognized"
+fi
+
+ynh_script_progression --message="Resetting the specific configuration of $name for the app $app..." --weight=3
+
+if [ $type == nginx ]
+then
+    (cd scripts; ynh_add_nginx_config)
+
+    if [ $multisite -eq 1 ]
+    then
+        ynh_replace_string --match_string="#--MULTISITE--" --replace_string="" --target_file=/etc/nginx/conf.d/$domain.d/$app.conf
+
+        ynh_store_file_checksum --file="/etc/nginx/conf.d/$domain.d/$app.conf"
+
+        ynh_systemd_action --service_name=nginx --action=reload
+    fi
+
+elif [ $type == phpfpm ]
+then
+    # If the app is private, set the usage to low, otherwise to high.
+    if [ $is_public -eq 0 ]
+    then
+        usage=low
+    else
+        usage=high
+    fi
+    (cd scripts; ynh_add_fpm_config --usage=$usage --footprint=medium)
+fi
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Execution completed" --last
--- a/scripts/backup
+++ b/scripts/backup
@ -77,4 +77,4 @@ ynh_backup "/etc/cron.d/$app"
 # END OF SCRIPT
 #=================================================

-ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --time --last
+ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last
--- a/scripts/change_url
+++ b/scripts/change_url
@ -77,13 +77,6 @@ then
 	change_path=1
 fi

-#=================================================
-# MANAGE FAILURE OF THE SCRIPT
-#=================================================
-
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
--- a/scripts/config
+++ b/scripts/config
@ -14,7 +14,9 @@ source _ynh_add_fpm_config
 # RETRIEVE ARGUMENTS
 #=================================================

-app=${YNH_APP_INSTANCE_NAME:-$YNH_APP_ID}
+app=$YNH_APP_INSTANCE_NAME
+
+fpm_config_dir=$(ynh_app_setting_get --app=$app --key=fpm_config_dir)

 #=================================================
 # LOAD VALUES
@ -61,6 +63,14 @@ free_footprint="${YNH_CONFIG_MAIN_PHP_FPM_CONFIG_FREE_FOOTPRINT:-$old_free_footp
 old_fpm_usage="$(ynh_app_setting_get --app=$app --key=fpm_usage)"
 fpm_usage="${YNH_CONFIG_MAIN_PHP_FPM_CONFIG_USAGE:-$old_fpm_usage}"

+# php_forced_max_children for php-fpm
+old_php_forced_max_children="$(ynh_app_setting_get --app=$app --key=php_forced_max_children)"
+# If php_forced_max_children isn't into settings.yml, get the current value from the fpm config
+if [ -z "$old_php_forced_max_children" ]; then
+    old_php_forced_max_children="$(grep "^pm.max_children" "$fpm_config_dir/pool.d/$app.conf" | awk '{print $3}')"
+fi
+php_forced_max_children="${YNH_CONFIG_MAIN_PHP_FPM_CONFIG_FORCE_MAX_CHILDREN:-$old_php_forced_max_children}"
+
 #=================================================
 # SHOW_CONFIG FUNCTION FOR 'SHOW' COMMAND
 #=================================================
@ -79,6 +89,7 @@ show_config() {
    ynh_return "YNH_CONFIG_MAIN_PHP_FPM_CONFIG_FOOTPRINT=$fpm_footprint"
    ynh_return "YNH_CONFIG_MAIN_PHP_FPM_CONFIG_FREE_FOOTPRINT=$free_footprint"
    ynh_return "YNH_CONFIG_MAIN_PHP_FPM_CONFIG_USAGE=$fpm_usage"
+    ynh_return "YNH_CONFIG_MAIN_PHP_FPM_CONFIG_FORCE_MAX_CHILDREN=$php_forced_max_children"
 }

 #=================================================
@ -88,11 +99,14 @@ show_config() {
 apply_config() {

    # Change public accessibility
-    if [ "$is_public" = "1" ]
+    if [ "$is_public" != "$old_is_public" ]
    then
-        yunohost app action run $app public_private --args is_public=1
-    else
-        yunohost app action run $app public_private --args is_public=0
+        if [ "$is_public" = "1" ]
+        then
+            yunohost app action run $app public_private --args is_public=1
+        else
+            yunohost app action run $app public_private --args is_public=0
+        fi
    fi

    #=================================================
@ -116,7 +130,10 @@ apply_config() {
    # RECONFIGURE PHP-FPM
    #=================================================

-    if [ "$fpm_usage" != "$old_fpm_usage" ] || [ "$fpm_footprint" != "$old_fpm_footprint" ] || [ "$free_footprint" != "$old_free_footprint" ]
+    if [ "$fpm_usage" != "$old_fpm_usage" ] || \
+        [ "$fpm_footprint" != "$old_fpm_footprint" ] || \
+        [ "$free_footprint" != "$old_free_footprint" ] || \
+        [ "$php_forced_max_children" != "$old_php_forced_max_children" ]
    then
        # If fpm_footprint is set to 'specific', use $free_footprint value.
        if [ "$fpm_footprint" = "specific" ]
@ -124,6 +141,18 @@ apply_config() {
            fpm_footprint=$free_footprint
        fi

+        if [ "$php_forced_max_children" != "$old_php_forced_max_children" ]
+        then
+            # Set php_forced_max_children
+            if [ $php_forced_max_children -ne 0 ]
+            then
+                ynh_app_setting_set --app=$app --key=php_forced_max_children --value="$php_forced_max_children"
+            else
+                # If the value is set to 0, remove the setting
+                ynh_app_setting_delete --app=$app --key=php_forced_max_children
+            fi
+        fi
+
        if [ "$fpm_footprint" != "0" ]
        then
            ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
--- a/scripts/install
+++ b/scripts/install
@ -117,7 +117,7 @@ else
    usage=high
 fi
 # Create a dedicated php-fpm config
-ynh_add_fpm_config --usage=$usage --footprint=$usage
+ynh_add_fpm_config --usage=$usage --footprint=medium

 #=================================================
 # SPECIFIC SETUP
@ -286,7 +286,13 @@ ynh_secure_remove $final_path/wp-cli.phar
 # SEND A README FOR THE ADMIN
 #=================================================

-echo "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/wordpress_ynh" > mail_to_send
+# Get main domain and buid the url of the admin panel of the app.
+admin_panel="https://$(grep portal_domain /etc/ssowat/conf.json | cut -d'"' -f4)/yunohost/admin/#/apps/$app"
+
+echo "You can configure this app easily by using the experimental __URL_TAG1__config-panel feature__URL_TAG2__$admin_panel/config-panel__URL_TAG3__.
+You can also find some specific actions for this app by using the experimental __URL_TAG1__action feature__URL_TAG2__$admin_panel/actions__URL_TAG3__.
+
+If you're facing an issue or want to improve this app, please open a new issue in this __URL_TAG1__project__URL_TAG2__https://github.com/YunoHost-Apps/wordpress_ynh__URL_TAG3__." > mail_to_send

 ynh_send_readme_to_admin --app_message="mail_to_send" --recipients="$admin_wordpress" --type=install

--- a/scripts/restore
+++ b/scripts/restore
@ -33,7 +33,7 @@ admin_wordpress=$(ynh_app_setting_get --app=$app --key=admin)
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
 #=================================================
-ynh_script_progression --message="Validating restoration parameters..." --time --weight=1
+ynh_script_progression --message="Validating restoration parameters..."

 ynh_webpath_available --domain=$domain --path_url=$path_url \
 	|| ynh_die --message="Path not available: ${domain}${path_url}"
@ -131,7 +131,13 @@ ynh_maintenance_mode_OFF
 # SEND A README FOR THE ADMIN
 #=================================================

-echo "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/wordpress_ynh" > mail_to_send
+# Get main domain and buid the url of the admin panel of the app.
+admin_panel="https://$(grep portal_domain /etc/ssowat/conf.json | cut -d'"' -f4)/yunohost/admin/#/apps/$app"
+
+echo "You can configure this app easily by using the experimental __URL_TAG1__config-panel feature__URL_TAG2__$admin_panel/config-panel__URL_TAG3__.
+You can also find some specific actions for this app by using the experimental __URL_TAG1__action feature__URL_TAG2__$admin_panel/actions__URL_TAG3__.
+
+If you're facing an issue or want to improve this app, please open a new issue in this __URL_TAG1__project__URL_TAG2__https://github.com/YunoHost-Apps/wordpress_ynh__URL_TAG3__." > mail_to_send

 ynh_send_readme_to_admin --app_message="mail_to_send" --recipients="$admin_wordpress" --type=restore

--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -119,7 +119,7 @@ fi

 # If fpm_footprint doesn't exist, create it
 if [ -z "$fpm_footprint" ]; then
-    fpm_footprint=$usage
+    fpm_footprint=medium
    ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
 fi

@ -223,14 +223,17 @@ ynh_script_progression --message="Configuring multisite..." --weight=2
 if [ $multisite -eq 1 ]
 then
 	ynh_replace_string --match_string="#--MULTISITE--" --replace_string="" --target_file=/etc/nginx/conf.d/$domain.d/$app.conf
+
+    ynh_store_file_checksum --file="/etc/nginx/conf.d/$domain.d/$app.conf"
+
+    ynh_systemd_action --service_name=nginx --action=reload
+	
 	plugin_network="--network"
 else
 	multisite=0
 	plugin_network=""
-	if [ $is_public -eq 0 ]
+	if [ $is_public -eq 1 ]
 	then
-		ynh_replace_string --match_string="#--PRIVATE--" --replace_string="" --target_file=/etc/nginx/conf.d/$domain.d/$app.conf
-	else
 		ynh_replace_string --match_string="//--PUBLIC--define" --replace_string="define" --target_file=$final_path/wp-config.php
 	fi
 fi
@ -332,10 +335,18 @@ ynh_maintenance_mode_OFF
 # Get main domain and buid the url of the admin panel of the app.
 admin_panel="https://$(grep portal_domain /etc/ssowat/conf.json | cut -d'"' -f4)/yunohost/admin/#/apps/$app"

-# Build the changelog
-ynh_app_changelog || true
+# If a html email is required. Apply html to the changelog.
+if [ "$admin_mail_html" -eq 1 ]; then
+    format=html
+else
+    format=plain
+fi
+ynh_app_changelog --format=$format

-echo "If you're facing an issue or want to improve this app, please open a new issue in this __URL_TAG1__project__URL_TAG2__https://github.com/YunoHost-Apps/wordpress_ynh__URL_TAG3__.
+echo "You can configure this app easily by using the experimental __URL_TAG1__config-panel feature__URL_TAG2__$admin_panel/config-panel__URL_TAG3__.
+You can also find some specific actions for this app by using the experimental __URL_TAG1__action feature__URL_TAG2__$admin_panel/actions__URL_TAG3__.
+
+If you're facing an issue or want to improve this app, please open a new issue in this __URL_TAG1__project__URL_TAG2__https://github.com/YunoHost-Apps/wordpress_ynh__URL_TAG3__.

 ---