From 28365ad8af32f4d6efdbcc1c3604ebc0454f5287 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 10 Jul 2022 12:56:30 +0200 Subject: [PATCH 01/23] 6.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index b92b923..1d1875c 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://wordpress.org/wordpress-5.9.3.tar.gz -SOURCE_SUM=70cbea5d72decfb129f4cc8e6c3d0175ea64bec68e97961b6db0377278a52a56 +SOURCE_URL=https://wordpress.org/wordpress-6.0.tar.gz +SOURCE_SUM=1887f3223db01d6d888df77ea0b3b8dde4c6243961a6b486d1bee1be9324bf08 SOURCE_SUM_PRG=sha256sum ARCH_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 7c35075..2ae359e 100644 --- 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.9.3~ynh1", + "version": "6.0~ynh1", "url": "https://wordpress.org/", "upstream": { "license": "GPL-2.0", From fc702474eb0a797f519546e09d790ddf9963be39 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 10 Jul 2022 13:02:16 +0200 Subject: [PATCH 02/23] Change to pkg_dependencies --- scripts/_common.sh | 2 +- scripts/install | 9 ++++++++- scripts/remove | 8 ++++++++ scripts/restore | 10 +++++++++- scripts/upgrade | 9 ++++++++- 5 files changed, 34 insertions(+), 4 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 4404f4b..a0a56fb 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ YNH_PHP_VERSION="7.3" -extra_php_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-soap php${YNH_PHP_VERSION}-ssh2 php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-ldap" +pkg_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-soap php${YNH_PHP_VERSION}-ssh2 php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-ldap" #================================================= # EXPERIMENTAL HELPERS diff --git a/scripts/install b/scripts/install index 743c885..5c43754 100644 --- a/scripts/install +++ b/scripts/install @@ -59,6 +59,13 @@ ynh_app_setting_set --app=$app --key=overwrite_nginx --value=1 ynh_app_setting_set --app=$app --key=overwrite_phpfpm --value=1 ynh_app_setting_set --app=$app --key=admin_mail_html --value=1 +#================================================= +# INSTALL DEPENDENCIES +#================================================= +ynh_script_progression --message="Installing dependencies..." --weight=5 + +ynh_install_app_dependencies $pkg_dependencies + #================================================= # STANDARD MODIFICATIONS #================================================= @@ -109,7 +116,7 @@ else usage=high fi # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$usage --footprint=medium --package="$extra_php_dependencies" +ynh_add_fpm_config --usage=$usage --footprint=medium phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= diff --git a/scripts/remove b/scripts/remove index 7b77c2c..efdc072 100755 --- a/scripts/remove +++ b/scripts/remove @@ -31,6 +31,14 @@ ynh_script_progression --message="Removing the MySQL database..." --weight=2 # Remove a database if it exists, along with the associated user ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name +#================================================= +# REMOVE DEPENDENCIES +#================================================= +ynh_script_progression --message="Removing dependencies..." --time --weight=1 + +# Remove metapackage and its dependencies +ynh_remove_app_dependencies + #================================================= # REMOVE APP MAIN DIR #================================================= diff --git a/scripts/restore b/scripts/restore index f9ee58f..547ae32 100644 --- a/scripts/restore +++ b/scripts/restore @@ -93,7 +93,7 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # Recreate a dedicated php-fpm config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --package="$extra_php_dependencies" +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint #================================================= # RESTORE FAIL2BAN CONFIGURATION @@ -113,6 +113,14 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql +#================================================= +# REINSTALL DEPENDENCIES +#================================================= +ynh_script_progression --message="Reinstalling dependencies..." --weight=5 + +# Define and install dependencies +ynh_install_app_dependencies $pkg_dependencies + #================================================= # RESTORE VARIOUS FILES #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 0e7a5e0..d8862c1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -195,6 +195,13 @@ then ynh_add_nginx_config fi +#================================================= +# UPGRADE DEPENDENCIES +#================================================= +ynh_script_progression --message="Upgrading dependencies..." --weight=5 + +ynh_install_app_dependencies $pkg_dependencies + #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -204,7 +211,7 @@ if [ $overwrite_phpfpm -eq 1 ] then ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=4 # Create a dedicated PHP-FPM config - ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --package="$extra_php_dependencies" + ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint fi #================================================= From 83d7d0d79401351093dbfe5ad5a43aeea460a623 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 10 Jul 2022 13:05:59 +0200 Subject: [PATCH 03/23] Cleaning --- conf/wp-config.php | 2 +- scripts/install | 1 + scripts/remove | 8 ++++---- scripts/restore | 12 ++++++------ 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/conf/wp-config.php b/conf/wp-config.php index 12c8c7e..36a377f 100644 --- a/conf/wp-config.php +++ b/conf/wp-config.php @@ -23,7 +23,7 @@ define('DISABLE_WP_CRON', true); // ** MySQL settings - You can get this info from your web host ** // /** The name of the database for WordPress */ -define('DB_NAME', '__DB_USER__'); +define('DB_NAME', '__DB_NAME__'); /** MySQL database username */ define('DB_USER', '__DB_USER__'); diff --git a/scripts/install b/scripts/install index 5c43754..3d23093 100644 --- a/scripts/install +++ b/scripts/install @@ -128,6 +128,7 @@ ynh_script_progression --message="Configuring WordPress..." cp ../conf/wp-config.php $final_path/wp-config.php # Change variables in Wordpress configuration +ynh_replace_string --match_string="__DB_NAME__" --replace_string=$db_user --target_file=$final_path/wp-config.php ynh_replace_string --match_string="__DB_USER__" --replace_string=$db_name --target_file=$final_path/wp-config.php ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file=$final_path/wp-config.php diff --git a/scripts/remove b/scripts/remove index efdc072..64f0739 100755 --- a/scripts/remove +++ b/scripts/remove @@ -34,7 +34,7 @@ ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name #================================================= # REMOVE DEPENDENCIES #================================================= -ynh_script_progression --message="Removing dependencies..." --time --weight=1 +ynh_script_progression --message="Removing dependencies..." --weight=4 # Remove metapackage and its dependencies ynh_remove_app_dependencies @@ -42,7 +42,7 @@ ynh_remove_app_dependencies #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." +ynh_script_progression --message="Removing app main directory..." --weight=2 # Remove the app directory securely ynh_secure_remove --file="$final_path" @@ -50,7 +50,7 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 # Remove the dedicated NGINX config ynh_remove_nginx_config @@ -76,7 +76,7 @@ ynh_remove_fail2ban_config #================================================= # REMOVE VARIOUS FILES #================================================= -ynh_script_progression --message="Removing various files..." +ynh_script_progression --message="Removing various files..." --weight=1 # Remove a cron file ynh_secure_remove --file="/etc/cron.d/$app" diff --git a/scripts/restore b/scripts/restore index 547ae32..155af86 100644 --- a/scripts/restore +++ b/scripts/restore @@ -38,7 +38,7 @@ fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= -ynh_script_progression --message="Validating restoration parameters..." +ynh_script_progression --message="Validating restoration parameters..." --weight=1 test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " @@ -46,7 +46,7 @@ test ! -d $final_path \ #================================================= # ACTIVATE MAINTENANCE MODE #================================================= -ynh_script_progression --message="Activating maintenance mode..." +ynh_script_progression --message="Activating maintenance mode..." --weight=1 ynh_maintenance_mode_ON @@ -55,7 +55,7 @@ ynh_maintenance_mode_ON #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." +ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=2 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -70,7 +70,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring the app main directory..." +ynh_script_progression --message="Restoring the app main directory..." --weight=5 ynh_restore_file --origin_path="$final_path" @@ -87,7 +87,7 @@ chown $app:$app "$final_path/wp-config.php" #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." +ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=2 # Restore the file first, so it can have a backup if different ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" @@ -124,7 +124,7 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE VARIOUS FILES #================================================= -ynh_script_progression --message="Restoring various files..." +ynh_script_progression --message="Restoring various files..." --weight=1 ynh_restore_file --origin_path="/etc/cron.d/$app" From e6604477d5e8637efcdb0ba16a48d262ecbcac5f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 10 Jul 2022 13:07:42 +0200 Subject: [PATCH 04/23] Update install --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 3d23093..2a0a978 100644 --- a/scripts/install +++ b/scripts/install @@ -128,8 +128,8 @@ ynh_script_progression --message="Configuring WordPress..." cp ../conf/wp-config.php $final_path/wp-config.php # Change variables in Wordpress configuration -ynh_replace_string --match_string="__DB_NAME__" --replace_string=$db_user --target_file=$final_path/wp-config.php -ynh_replace_string --match_string="__DB_USER__" --replace_string=$db_name --target_file=$final_path/wp-config.php +ynh_replace_string --match_string="__DB_NAME__" --replace_string=$db_name --target_file=$final_path/wp-config.php +ynh_replace_string --match_string="__DB_USER__" --replace_string=$db_user --target_file=$final_path/wp-config.php ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file=$final_path/wp-config.php for i in 1 2 3 4 5 6 7 8 From 37911b03728117a979dbda45bafdc6b06c39569e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 10 Jul 2022 13:09:30 +0200 Subject: [PATCH 05/23] Update install --- scripts/install | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 2a0a978..7a5219c 100644 --- a/scripts/install +++ b/scripts/install @@ -126,11 +126,9 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Configuring WordPress..." -cp ../conf/wp-config.php $final_path/wp-config.php # Change variables in Wordpress configuration -ynh_replace_string --match_string="__DB_NAME__" --replace_string=$db_name --target_file=$final_path/wp-config.php -ynh_replace_string --match_string="__DB_USER__" --replace_string=$db_user --target_file=$final_path/wp-config.php -ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file=$final_path/wp-config.php +file=__FILE__ +ynh_add_config --template="../conf/wp-config.php" --destination="$final_path/wp-config.php" for i in 1 2 3 4 5 6 7 8 do From c58706ccc26d33673b58ce9a0ca1abe82ec0cc17 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 10 Jul 2022 13:10:11 +0200 Subject: [PATCH 06/23] Update install --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 7a5219c..38ccea3 100644 --- a/scripts/install +++ b/scripts/install @@ -79,7 +79,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # CREATE A MYSQL DATABASE #================================================= -ynh_script_progression --message="Creating a MySQL database..." +ynh_script_progression --message="Creating a MySQL database..." --weight=2 db_name=$(ynh_sanitize_dbid --db_name=$app) db_user=$db_name @@ -124,7 +124,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # CONFIGURE WP-CONFIG #================================================= -ynh_script_progression --message="Configuring WordPress..." +ynh_script_progression --message="Configuring WordPress..." --weight=1 # Change variables in Wordpress configuration file=__FILE__ From e14431e601f0545bb1e761f404087ead1eca1bc9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 5 Aug 2022 20:36:39 +0000 Subject: [PATCH 07/23] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fff618e..29bb410 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ WordPress is open source software you can use to create a beautiful website, blo With this package, you can even activate the [multisite](https://wordpress.org/support/article/glossary/#multisite) option. -**Shipped version:** 5.9.3~ynh2 +**Shipped version:** 6.0~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 1687550..abc23f8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ WordPress est un logiciel libre que vous pouvez utiliser pour créer un site ou Avec ce package, vous pouvez même activer l'option [multisite](https://codex.wordpress.org/Glossary#Multisite). -**Version incluse :** 5.9.3~ynh2 +**Version incluse :** 6.0~ynh1 ## Captures d'écran From e5c9d9ee7723cf8bfb1720b2a7251d3b14a18087 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 7 Aug 2022 08:44:14 +0200 Subject: [PATCH 08/23] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index a0a56fb..917b558 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="7.4" pkg_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-soap php${YNH_PHP_VERSION}-ssh2 php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-ldap" From 9cdd31cd20efb1e0c3b9f850136e1df143c75395 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 7 Aug 2022 08:44:30 +0200 Subject: [PATCH 09/23] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 2ae359e..2b17204 100644 --- a/manifest.json +++ b/manifest.json @@ -29,7 +29,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.3-fpm", + "php7.4-fpm", "mysql" ], "arguments": { From 46307fb9418e72610803ee5903884671e46cf2db Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 12 Aug 2022 15:18:19 +0200 Subject: [PATCH 10/23] PHP8 --- manifest.json | 4 ++-- scripts/_common.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 2b17204..09b3696 100644 --- a/manifest.json +++ b/manifest.json @@ -24,12 +24,12 @@ "email": "maniackc_dev@crudelis.fr" }], "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ "nginx", - "php7.4-fpm", + "php8.0-fpm", "mysql" ], "arguments": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 917b558..4c9ef61 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.4" +YNH_PHP_VERSION="8.0" pkg_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-soap php${YNH_PHP_VERSION}-ssh2 php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-ldap" From 61167a0d7f31e27e9b42bcce07d4a9e3f4edf5e2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 12 Aug 2022 13:18:32 +0000 Subject: [PATCH 11/23] Auto-update README --- README.md | 1 + README_fr.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 29bb410..c735cd6 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ With this package, you can even activate the [multisite](https://wordpress.org/s **Shipped version:** 6.0~ynh1 + ## Screenshots ![Screenshot of WordPress](./doc/screenshots/screen-themes.png) diff --git a/README_fr.md b/README_fr.md index abc23f8..f03c375 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,8 @@ WordPress est un logiciel libre que vous pouvez utiliser pour créer un site ou Avec ce package, vous pouvez même activer l'option [multisite](https://codex.wordpress.org/Glossary#Multisite). -**Version incluse :** 6.0~ynh1 +**Version incluse :** 6.0~ynh1 + ## Captures d'écran From 1cacd14f93314072234c9d02e130289b522ef7de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 21 Aug 2022 23:42:31 +0200 Subject: [PATCH 12/23] 6.0.1 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 1d1875c..5b815df 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://wordpress.org/wordpress-6.0.tar.gz -SOURCE_SUM=1887f3223db01d6d888df77ea0b3b8dde4c6243961a6b486d1bee1be9324bf08 +SOURCE_URL=https://wordpress.org/wordpress-6.0.1.tar.gz +SOURCE_SUM=f678596804aa89d7cdc9280862938464eab25aeaebfefa91ae175e15aa3ef054 SOURCE_SUM_PRG=sha256sum ARCH_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 09b3696..5264ed2 100644 --- 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": "6.0~ynh1", + "version": "6.0.1~ynh1", "url": "https://wordpress.org/", "upstream": { "license": "GPL-2.0", From 9509a7255dd03f4df5a9a46e77669615ad388bd8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 21 Aug 2022 21:42:40 +0000 Subject: [PATCH 13/23] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c735cd6..4f9aae3 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ WordPress is open source software you can use to create a beautiful website, blo With this package, you can even activate the [multisite](https://wordpress.org/support/article/glossary/#multisite) option. -**Shipped version:** 6.0~ynh1 +**Shipped version:** 6.0.1~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index f03c375..5a2cdba 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ WordPress est un logiciel libre que vous pouvez utiliser pour créer un site ou Avec ce package, vous pouvez même activer l'option [multisite](https://codex.wordpress.org/Glossary#Multisite). -**Version incluse :** 6.0~ynh1 +**Version incluse :** 6.0.1~ynh1 ## Captures d'écran From aac2ff7328b8428b20044822cdb88fe54a6a6f30 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 22 Aug 2022 07:50:00 +0200 Subject: [PATCH 14/23] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index a9daba0..d569c6f 100644 --- a/scripts/install +++ b/scripts/install @@ -178,7 +178,7 @@ ynh_script_progression --message="Installing WordPress plugins..." --weight=20 ynh_exec_warn_less wget --no-verbose https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar --output-document=$final_path/wp-cli.phar wpcli_alias="php$phpversion $final_path/wp-cli.phar --allow-root --path=$final_path" -$wpcli_alias plugin install authldap +#$wpcli_alias plugin install authldap $wpcli_alias plugin install http-authentication $wpcli_alias plugin install companion-auto-update $wpcli_alias plugin install wp-fail2ban-redux From 51a884dcbb60014fad35a3d00c0bb673685c44a5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 22 Aug 2022 08:02:01 +0200 Subject: [PATCH 15/23] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index d569c6f..a9daba0 100644 --- a/scripts/install +++ b/scripts/install @@ -178,7 +178,7 @@ ynh_script_progression --message="Installing WordPress plugins..." --weight=20 ynh_exec_warn_less wget --no-verbose https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar --output-document=$final_path/wp-cli.phar wpcli_alias="php$phpversion $final_path/wp-cli.phar --allow-root --path=$final_path" -#$wpcli_alias plugin install authldap +$wpcli_alias plugin install authldap $wpcli_alias plugin install http-authentication $wpcli_alias plugin install companion-auto-update $wpcli_alias plugin install wp-fail2ban-redux From 7b2129e03f3fe02191128ea9d6f123f2d81a3f49 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 22 Aug 2022 08:20:04 +0200 Subject: [PATCH 16/23] update config file --- conf/wp-config.php | 97 +++++++++++++++++++++++----------------------- scripts/install | 2 +- 2 files changed, 50 insertions(+), 49 deletions(-) diff --git a/conf/wp-config.php b/conf/wp-config.php index 36a377f..2e8fd17 100644 --- a/conf/wp-config.php +++ b/conf/wp-config.php @@ -2,71 +2,70 @@ /** * The base configuration for WordPress * - * The wp-config.php creation script uses this file during the - * installation. You don't have to use the web site, you can - * copy this file to "wp-config.php" and fill in the values. + * The wp-config.php creation script uses this file during the installation. + * You don't have to use the web site, you can copy this file to "wp-config.php" + * and fill in the values. * * This file contains the following configurations: * - * * MySQL settings + * * Database settings * * Secret keys * * Database table prefix * * ABSPATH * - * @link https://codex.wordpress.org/Editing_wp-config.php + * @link https://wordpress.org/support/article/editing-wp-config-php/ * * @package WordPress -*/ + */ -/** Disable the wordress cron because it's managed by the system */ -define('DISABLE_WP_CRON', true); - -// ** MySQL settings - You can get this info from your web host ** // +// ** Database settings - You can get this info from your web host ** // /** The name of the database for WordPress */ -define('DB_NAME', '__DB_NAME__'); +define( 'DB_NAME', '__DB_NAME__' ); -/** MySQL database username */ -define('DB_USER', '__DB_USER__'); +/** Database username */ +define( 'DB_USER', '__DB_USER__' ); -/** MySQL database password */ -define('DB_PASSWORD', '__DB_PWD__'); +/** Database password */ +define( 'DB_PASSWORD', '__DB_PWD__' ); -/** MySQL hostname */ -define('DB_HOST', 'localhost'); +/** Database hostname */ +define( 'DB_HOST', 'localhost' ); -/** Database Charset to use in creating database tables. */ -define('DB_CHARSET', 'utf8'); +/** Database charset to use in creating database tables. */ +define( 'DB_CHARSET', 'utf8' ); -/** The Database Collate type. Don't change this if in doubt. */ -define('DB_COLLATE', ''); +/** The database collate type. Don't change this if in doubt. */ +define( 'DB_COLLATE', '' ); /**#@+ - * Authentication Unique Keys and Salts. + * Authentication unique keys and salts. * - * Change these to different unique phrases! - * You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service} - * You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again. + * Change these to different unique phrases! You can generate these using + * the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service}. + * + * You can change these at any point in time to invalidate all existing cookies. + * This will force all users to have to log in again. * * @since 2.6.0 -*/ -define('AUTH_KEY', 'KEY1'); -define('SECURE_AUTH_KEY', 'KEY2'); -define('LOGGED_IN_KEY', 'KEY3'); -define('NONCE_KEY', 'KEY4'); -define('AUTH_SALT', 'KEY5'); -define('SECURE_AUTH_SALT', 'KEY6'); -define('LOGGED_IN_SALT', 'KEY7'); -define('NONCE_SALT', 'KEY8'); + */ +define( 'AUTH_KEY', 'put your unique phrase here' ); +define( 'SECURE_AUTH_KEY', 'put your unique phrase here' ); +define( 'LOGGED_IN_KEY', 'put your unique phrase here' ); +define( 'NONCE_KEY', 'put your unique phrase here' ); +define( 'AUTH_SALT', 'put your unique phrase here' ); +define( 'SECURE_AUTH_SALT', 'put your unique phrase here' ); +define( 'LOGGED_IN_SALT', 'put your unique phrase here' ); +define( 'NONCE_SALT', 'put your unique phrase here' ); /**#@-*/ /** - * WordPress Database Table prefix. + * WordPress database table prefix. * * You can have multiple installations in one database if you give each * a unique prefix. Only numbers, letters, and underscores please! -*/ -$table_prefix = 'wp_'; + */ +$table_prefix = 'wp_'; /** * For developers: WordPress debugging mode. @@ -76,20 +75,22 @@ $table_prefix = 'wp_'; * in their development environments. * * For information on other constants that can be used for debugging, - * visit the Codex. + * visit the documentation. * - * @link https://codex.wordpress.org/Debugging_in_WordPress -*/ -define('WP_DEBUG', false); + * @link https://wordpress.org/support/article/debugging-in-wordpress/ + */ +define( 'WP_DEBUG', false ); -/* That's all, stop editing! Happy blogging. */ +/* Add any custom values between this line and the "stop editing" line. */ + + + +/* That's all, stop editing! Happy publishing. */ /** Absolute path to the WordPress directory. */ -if ( !defined('ABSPATH') ) - define('ABSPATH', dirname(__FILE__) . '/'); +if ( ! defined( 'ABSPATH' ) ) { + define( 'ABSPATH', __DIR__ . '/' ); +} /** Sets up WordPress vars and included files. */ -require_once(ABSPATH . 'wp-settings.php'); - -// Force https redirect -//--PUBLIC--define('FORCE_SSL_ADMIN', true); +require_once ABSPATH . 'wp-settings.php'; diff --git a/scripts/install b/scripts/install index a9daba0..55f9189 100644 --- a/scripts/install +++ b/scripts/install @@ -127,7 +127,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) ynh_script_progression --message="Configuring WordPress..." --weight=1 # Change variables in Wordpress configuration -file=__FILE__ +dir=__DIR__ ynh_add_config --template="../conf/wp-config.php" --destination="$final_path/wp-config.php" for i in 1 2 3 4 5 6 7 8 From f707a21ccd234d06d2ae3789162a8759e9f9c2a9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 22 Aug 2022 08:43:38 +0200 Subject: [PATCH 17/23] Update wp-config.php --- conf/wp-config.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/conf/wp-config.php b/conf/wp-config.php index 2e8fd17..1419cb6 100644 --- a/conf/wp-config.php +++ b/conf/wp-config.php @@ -48,14 +48,14 @@ define( 'DB_COLLATE', '' ); * * @since 2.6.0 */ -define( 'AUTH_KEY', 'put your unique phrase here' ); -define( 'SECURE_AUTH_KEY', 'put your unique phrase here' ); -define( 'LOGGED_IN_KEY', 'put your unique phrase here' ); -define( 'NONCE_KEY', 'put your unique phrase here' ); -define( 'AUTH_SALT', 'put your unique phrase here' ); -define( 'SECURE_AUTH_SALT', 'put your unique phrase here' ); -define( 'LOGGED_IN_SALT', 'put your unique phrase here' ); -define( 'NONCE_SALT', 'put your unique phrase here' ); +define( 'AUTH_KEY', 'KEY1' ); +define( 'SECURE_AUTH_KEY', 'KEY2' ); +define( 'LOGGED_IN_KEY', 'KEY3' ); +define( 'NONCE_KEY', 'KEY4' ); +define( 'AUTH_SALT', 'KEY5' ); +define( 'SECURE_AUTH_SALT', 'KEY6' ); +define( 'LOGGED_IN_SALT', 'KEY7' ); +define( 'NONCE_SALT', 'KEY8' ); /**#@-*/ From 0082004359456bbbaa924a5a3ae0472e75e2748a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 22 Aug 2022 08:47:10 +0200 Subject: [PATCH 18/23] Update restore --- scripts/restore | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/restore b/scripts/restore index 99ade02..9f616b0 100644 --- a/scripts/restore +++ b/scripts/restore @@ -52,13 +52,6 @@ ynh_maintenance_mode_ON #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=2 - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -88,6 +81,14 @@ setfacl -Rm d:g:www-data:rwX "$final_path/wp-content/temp" chmod 400 "$final_path/wp-config.php" chown $app:$app "$final_path/wp-config.php" +#================================================= +# REINSTALL DEPENDENCIES +#================================================= +ynh_script_progression --message="Reinstalling dependencies..." --weight=5 + +# Define and install dependencies +ynh_install_app_dependencies $pkg_dependencies + #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= @@ -99,6 +100,13 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # Recreate a dedicated php-fpm config ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=2 + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # RESTORE FAIL2BAN CONFIGURATION #================================================= @@ -117,14 +125,6 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql -#================================================= -# REINSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=5 - -# Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies - #================================================= # RESTORE VARIOUS FILES #================================================= From 645b984fd5da35545a1ce78bce79f9dfa4a2a0a3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 22 Aug 2022 08:47:42 +0200 Subject: [PATCH 19/23] Update restore --- scripts/restore | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/restore b/scripts/restore index 9f616b0..b25d172 100644 --- a/scripts/restore +++ b/scripts/restore @@ -81,6 +81,15 @@ setfacl -Rm d:g:www-data:rwX "$final_path/wp-content/temp" chmod 400 "$final_path/wp-config.php" chown $app:$app "$final_path/wp-config.php" +#================================================= +# RESTORE FAIL2BAN CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the Fail2Ban configuration..." --weight=6 + +ynh_restore_file --origin_path="/etc/fail2ban/jail.d/$app.conf" +ynh_restore_file --origin_path="/etc/fail2ban/filter.d/$app.conf" +ynh_systemd_action --action=restart --service_name=fail2ban + #================================================= # REINSTALL DEPENDENCIES #================================================= @@ -107,15 +116,6 @@ ynh_script_progression --message="Restoring the NGINX web server configuration.. ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# RESTORE FAIL2BAN CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the Fail2Ban configuration..." --weight=6 - -ynh_restore_file --origin_path="/etc/fail2ban/jail.d/$app.conf" -ynh_restore_file --origin_path="/etc/fail2ban/filter.d/$app.conf" -ynh_systemd_action --action=restart --service_name=fail2ban - #================================================= # RESTORE THE MYSQL DATABASE #================================================= From 0eb3b22a44258abacaa74f7159e82ff828a8882f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 22 Aug 2022 08:50:18 +0200 Subject: [PATCH 20/23] remove YEP --- YEP.md | 117 ------------------------------------------------ scripts/upgrade | 1 - 2 files changed, 118 deletions(-) delete mode 100644 YEP.md diff --git a/YEP.md b/YEP.md deleted file mode 100644 index 1ed6cc4..0000000 --- a/YEP.md +++ /dev/null @@ -1,117 +0,0 @@ -#### [Level 0](https://github.com/YunoHost/doc/blob/master/packaging_apps_levels_fr.md#niveau-0) -[YEP 1.1 - Nommer son app et son dépot](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-11) -`Validated` -[YEP 1.2 - Inscrire l'app sur un "répertoire" connu](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-12) -`Validated` - -#### [Level 1](https://github.com/YunoHost/doc/blob/master/packaging_apps_levels_fr.md#niveau-1) -[YEP 2.2 - Utiliser bash pour les scripts principaux](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-22) -`Validated` -[YEP 2.5 - Copier correctement des fichiers](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-25) -`Don't know` -[YEP 2.7 - Donner des permissions suffisantes aux instructions bash](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-27) -`Validated` -[YEP 2.15 - Suivre les instructions d'installation de l'application](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-215) -`Validated` - -#### [Level 2](https://github.com/YunoHost/doc/blob/master/packaging_apps_levels_fr.md#niveau-2) -[YEP 1.5 - Mettre à jour régulièrement le statut de l'app](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-11) -`Validated` -[YEP 2.18.2 - Gérer l'installation à la racine d’un nom de domaine](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-2182) -`Validated` - *Automatically verified.* -[YEP 2.18.3 - Gérer l'installation sur un sous-domaine](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-2183) -`Validated` - *Automatically verified.* -[YEP 2.18.4 - Gérer l'installation sur un chemin /path](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-2184) -`Validated` - *Automatically verified.* -[YEP 4.6 - Gère le multi-instance](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-11) -`Validated` - *Automatically verified.* - -#### [Level 3](https://github.com/YunoHost/doc/blob/master/packaging_apps_levels_fr.md#niveau-3) -[YEP 2.3 - Sauvegarder les réponses lors de l'installation](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-23) -`Validated` - -#### [Level 4](https://github.com/YunoHost/doc/blob/master/packaging_apps_levels_fr.md#niveau-4) -[YEP 4.1 - Lier au ldap](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-41) -`Validated` -[YEP 4.2 - Lier l'authentification au sso](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-42) -`Validated` - -#### [Level 5](https://github.com/YunoHost/doc/blob/master/packaging_apps_levels_fr.md#niveau-5) -[YEP 1.3 - Indiquer la licence associée au paquet](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-13) -`Validated` -[YEP 2.1 - Respecter le format du manifeste](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-21) -`Validated` - *Automatically verified.* -[YEP 2.12 - Utiliser les commandes pratiques (helpers)](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-212) -`Validated` -[YEP 2.18.1 - Lancer le script d'installation d'une webapp correctement](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-2181) -`Validated` - -#### [Level 6](https://github.com/YunoHost/doc/blob/master/packaging_apps_levels_fr.md#niveau-6) -[YEP 1.4 - Informer sur l'intention de maintenir un paquet](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-14) -`Validated` -[YEP 1.6 - Se tenir informé sur l'évolution du packaging d'apps](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-16) -`Validated` -[YEP 1.7 - Ajouter l'app à l'organisation YunoHost-Apps](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-17) -`Validated` - *Automatically verified.* -[YEP 1.8 - Publier des demandes de test](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-18) -`Validated` -[YEP 1.9 - Documenter l'app](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-19) -`Validated` -[YEP 1.10 - Garder un historique de version propre](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-110) -`Don't know` -[YEP 2.9 - Enlever toutes traces de l'app lors de la suppression](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-29) -`Validated` -[YEP 3.3 - Faciliter le contrôle de l'intégrité des sources](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-33) -`Validated` -[YEP 3.5 - Suivre les recommendations de la documentation de l'app](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-35) -`Partially validated` -[YEP 3.6 - Mettre à jour les versions contenant des CVE](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-36) -`Validated` -[YEP 4.3 - Fournir un script de sauvegarde YunoHost fonctionnel](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-43) -`Validated` - *Automatically verified.* -[YEP 4.4 - Fournir un script de restauration YunoHost fonctionnel](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-44) -`Validated` - *Automatically verified.* - -#### [Level 7](https://github.com/YunoHost/doc/blob/master/packaging_apps_levels_fr.md#niveau-7) -[YEP 2.6 - Annuler l'action si les valeurs d'entrées sont incorrectes](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-26) -`Validated` -[YEP 3.2 - Ouvrir un port correctement](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-32) -`Not applicable` - -#### [Level 8](https://github.com/YunoHost/doc/blob/master/packaging_apps_levels_fr.md#niveau-8) -[YEP 2.4 - Détecter et gérer les erreurs](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-24) -`Validated` -[YEP 2.8 - Modifier correctement une configuration système](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-28) -`Validated` -[YEP 2.16 - Vérifier la disponibilité des dépendances sur ARM, x86 et x64](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-216) -`Not yet validated` - *Automatically verified.* -[YEP 2.18.5 - Gérer la tuile YunoHost pour faciliter la navigation entre les applications](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-2185) -`Validated` -[YEP 3.4 - Isoler l'app](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-34) -`Partially validated` -[YEP 4.5 - Utiliser les hooks](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-45) -`Not applicable` - -#### [Level 9](https://github.com/YunoHost/doc/blob/master/packaging_apps_levels_fr.md#niveau-9) -[YEP 2.10 - Configurer les logs de l'application](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-210) -`Not applicable` -[YEP 2.11 - Utiliser une variable plutôt que l'app id directement](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-211) -`Validated` -[YEP 2.13 - Traduire le paquet en anglais](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-213) -`Not yet validated` -[YEP 2.14 - Remplir correctement un fichier de conf](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-214) -`Not yet validated` -[YEP 2.17 - Prendre en compte la version d'origine lors des mises à jour](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-217) -`Validated` -[YEP 4.2.1 - Déconnexion](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-421) -`Don't know` - -#### Other YEP -[YEP 3.1 - Ne pas demander ou stocker de mot de passe LDAP](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-31) -`Validated` -[YEP 4.7 - Ajouter un module à la CLI](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-47) -`Not applicable` -[YEP 4.8 - Ajouter un module à l'admin web](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-48) -`Not applicable` - -State of each YEP can be one of these: `Validated`, `Partially validated`, `Not yet validated`, `Not applicable`, `Don't know`. diff --git a/scripts/upgrade b/scripts/upgrade index 05c63a3..128cb03 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -36,7 +36,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) From 968ef590efd9ce7bfc293817c0b6eaeea3d14fee Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 22 Aug 2022 08:50:45 +0200 Subject: [PATCH 21/23] Update config_panel.toml.example --- config_panel.toml.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config_panel.toml.example b/config_panel.toml.example index 07f014d..5104992 100644 --- a/config_panel.toml.example +++ b/config_panel.toml.example @@ -1,4 +1,4 @@ -version = "0.1" +version = "1.0" name = "Wordpress configuration panel" [main] From df3faa24efee919a8f5d0883db1f082654a9be15 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 22 Aug 2022 09:03:21 +0200 Subject: [PATCH 22/23] Update manifest.json --- manifest.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 5264ed2..edf27f3 100644 --- a/manifest.json +++ b/manifest.json @@ -12,7 +12,8 @@ "license": "GPL-2.0", "website": "https://wordpress.org/", "admindoc": "https://codex.wordpress.org/", - "code": "https://core.trac.wordpress.org/browser " + "code": "https://core.trac.wordpress.org/browser", + "cpe": "cpe:2.3:a:wordpress:wordpress" }, "license": "GPL-2.0", "maintainer": { From f4136ee5d21145c2d39192ac2e5571a767f5803d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 22 Aug 2022 07:03:29 +0000 Subject: [PATCH 23/23] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4f9aae3..0a1a67f 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ Furthermore, you might take a look at the [Hardening Wordpress Guide](https://wo * Official app website: * Official admin documentation: -* Upstream app code repository: +* Upstream app code repository: * YunoHost documentation for this app: * Report a bug: diff --git a/README_fr.md b/README_fr.md index 5a2cdba..71ca6b9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -62,7 +62,7 @@ Par ailleurs, vous pourriez avoir besoin de regarder [ce guide](https://wordpres * Site officiel de l'app : * Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : +* Dépôt de code officiel de l'app : * Documentation YunoHost pour cette app : * Signaler un bug :