Merge pull request #8 from YunoHost-Apps/testing

Testing
2024-09-03 19:46:07 +02:00 · 2022-08-18 07:13:45 +02:00 · 2022-08-18 07:13:45 +02:00 · 6314116f08
commit 6314116f08
parent 06acbdb513 55c6a1bb8b
7 changed files with 59 additions and 51 deletions
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ It shall NOT be edited by hand.

 # MyBB for YunoHost

-[![Integration level](https://dash.yunohost.org/integration/mybb.svg)](https://dash.yunohost.org/appci/app/mybb) ![](https://ci-apps.yunohost.org/ci/badges/mybb.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mybb.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/mybb.svg)](https://dash.yunohost.org/appci/app/mybb) ![Working status](https://ci-apps.yunohost.org/ci/badges/mybb.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/mybb.maintain.svg)  
 [![Install MyBB with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mybb)

 *[Lire ce readme en français.](./README_fr.md)*
@ -17,13 +17,14 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in

 MyBB is the free and open source forum software powering thousands of engaging, vibrant, and unique communities across the internet.

-**Shipped version:** 1.8.30~ynh1
+**Shipped version:** 1.8.30~ynh2
+

 **Demo:** https://demomybb.tk/

 ## Screenshots

-![](./doc/screenshots/screenshot.png)
+![Screenshot of MyBB](./doc/screenshots/screenshot.png)

 ## Disclaimers / important information

@ -36,21 +37,22 @@ MyBB is the free and open source forum software powering thousands of engaging,

 ## Documentation and resources

-* Official app website: https://mybb.com/
-* Official admin documentation: https://docs.mybb.com/1.8/administration/
-* Upstream app code repository: https://github.com/mybb/mybb
-* YunoHost documentation for this app: https://yunohost.org/app_mybb
-* Report a bug: https://github.com/YunoHost-Apps/mybb_ynh/issues
+* Official app website: <https://mybb.com/>
+* Official admin documentation: <https://docs.mybb.com/1.8/administration/>
+* Upstream app code repository: <https://github.com/mybb/mybb>
+* YunoHost documentation for this app: <https://yunohost.org/app_mybb>
+* Report a bug: <https://github.com/YunoHost-Apps/mybb_ynh/issues>

 ## Developer info

 Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/mybb_ynh/tree/testing).

 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/mybb_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade mybb -u https://github.com/YunoHost-Apps/mybb_ynh/tree/testing --debug
 ```

-**More info regarding app packaging:** https://yunohost.org/packaging_apps
+**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
--- a/README_fr.md
+++ b/README_fr.md
@ -1,10 +1,14 @@
+<!--
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+It shall NOT be edited by hand.
+-->
+
 # MyBB pour YunoHost

-[![Niveau d'intégration](https://dash.yunohost.org/integration/mybb.svg)](https://dash.yunohost.org/appci/app/mybb) ![](https://ci-apps.yunohost.org/ci/badges/mybb.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mybb.maintain.svg)  
+[![Niveau d'intégration](https://dash.yunohost.org/integration/mybb.svg)](https://dash.yunohost.org/appci/app/mybb) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/mybb.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/mybb.maintain.svg)  
 [![Installer MyBB avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mybb)

 *[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*

 > *Ce package vous permet d'installer MyBB rapidement et simplement sur un serveur YunoHost.
 Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
@ -13,13 +17,14 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour

 MyBB is the free and open source forum software powering thousands of engaging, vibrant, and unique communities across the internet.

-**Version incluse :** 1.8.30~ynh1
+**Version incluse :** 1.8.30~ynh2
+

 **Démo :** https://demomybb.tk/

 ## Captures d'écran

-![](./doc/screenshots/screenshot.png)
+![Capture d'écran de MyBB](./doc/screenshots/screenshot.png)

 ## Avertissements / informations importantes

@ -32,21 +37,22 @@ MyBB is the free and open source forum software powering thousands of engaging,

 ## Documentations et ressources

-* Site officiel de l'app : https://mybb.com/
-* Documentation officielle de l'admin : https://docs.mybb.com/1.8/administration/
-* Dépôt de code officiel de l'app : https://github.com/mybb/mybb
-* Documentation YunoHost pour cette app : https://yunohost.org/app_mybb
-* Signaler un bug : https://github.com/YunoHost-Apps/mybb_ynh/issues
+* Site officiel de l'app : <https://mybb.com/>
+* Documentation officielle de l'admin : <https://docs.mybb.com/1.8/administration/>
+* Dépôt de code officiel de l'app : <https://github.com/mybb/mybb>
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_mybb>
+* Signaler un bug : <https://github.com/YunoHost-Apps/mybb_ynh/issues>

 ## Informations pour les développeurs

 Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/mybb_ynh/tree/testing).

 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/mybb_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade mybb -u https://github.com/YunoHost-Apps/mybb_ynh/tree/testing --debug
 ```

-**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
+**Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>
--- a/1
+++ b/1
@ -15,7 +15,6 @@
 		upgrade=1	from_commit=8c280b69fc9901954657432beaffd6b3f440393c
 		backup_restore=1
 		multi_instance=1
-		port_already_use=0
 		change_url=1
 ;;; Options
 Email=
--- a/manifest.json
+++ b/manifest.json
@ -6,14 +6,15 @@
        "en": "Forum software",
        "fr": "Forum open source et libre"
    },
-    "version": "1.8.30~ynh1",
+    "version": "1.8.30~ynh2",
    "url": "https://mybb.com/",
    "upstream": {
        "license": "LGPL-3.0-only",
        "website": "https://mybb.com/",
        "demo": "https://demomybb.tk/",
        "admindoc": "https://docs.mybb.com/1.8/administration/",
-        "code": "https://github.com/mybb/mybb"
+        "code": "https://github.com/mybb/mybb",
+        "cpe": "cpe:2.3:a:mybb:mybb"
    },
    "license": "LGPL-3.0-only",
    "maintainer": {
@ -21,16 +22,16 @@
        "email": ""
    },
    "requirements": {
-        "yunohost": ">= 4.3.0"
+        "yunohost": ">= 11.0.9"
    },
    "multi_instance": true,
    "services": [
        "nginx",
-        "php7.3-fpm",
+        "php8.0-fpm",
        "mysql"
    ],
    "arguments": {
-        "install" : [
+        "install": [
            {
                "name": "domain",
                "type": "domain"
@ -48,4 +49,4 @@
            }
        ]
    }
-}
+}
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================

-YNH_PHP_VERSION="7.3"
+YNH_PHP_VERSION="8.0"

 pkg_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-xml"

--- a/scripts/restore
+++ b/scripts/restore
@ -14,6 +14,10 @@ source /usr/share/yunohost/helpers
 # MANAGE SCRIPT FAILURE
 #=================================================

+ynh_clean_setup () {
+	#### Remove this function if there's nothing to clean before calling the remove script.
+	true
+}
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors

@ -36,17 +40,11 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=1

-test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
+test ! -d $final_path \
+	|| ynh_die --message="There is already a directory: $final_path "

 #=================================================
 # STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
@ -66,18 +64,6 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"

-#=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1
-
-ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
-
-# Recreate a dedicated php-fpm config
-ynh_add_fpm_config
-
-#=================================================
-# SPECIFIC RESTORATION
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================
@ -86,6 +72,20 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=1
 # Define and install dependencies
 ynh_install_app_dependencies $pkg_dependencies

+#=================================================
+# RESTORE THE PHP-FPM CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1
+
+ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
+
+#=================================================
+# RESTORE THE NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1
+
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -72,9 +72,9 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 	
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/inc/config.php"
+	ynh_setup_source --dest_dir="$final_path" --keep="inc/config.php"

-	#This remoses the lock to do the post upgrade process.
+	#This removes the lock to do the post upgrade process.
 	#ynh_secure_remove --file="$final_path/install/lock"
 fi