Merge pull request #12 from YunoHost-Apps/cleaning

Cleaning
2024-09-03 20:26:21 +02:00 · 2022-10-14 09:35:20 +02:00 · 2022-10-14 09:35:20 +02:00 · f2b3bd02f6
commit f2b3bd02f6
parent 2b23f3a0e6 982afa9a63
8 changed files with 61 additions and 63 deletions
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ It shall NOT be edited by hand.

 # SPFtoolbox for YunoHost

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

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

 ## Overview

-Look up DNS records such as SPF, MX, Whois, and more
+Look up DNS records such as SPF, MX, Whois

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

 **Demo:** http://spftoolbox.com/

 ## Screenshots

-![](./doc/screenshots/687474703a2f2f692e696d6775722e636f6d2f4143785a5074512e706e67.png)
+![Screenshot of SPFtoolbox](./doc/screenshots/687474703a2f2f692e696d6775722e636f6d2f4143785a5074512e706e67.png)

 ## Documentation and resources

-* Official app website: http://spftoolbox.com/
-* Upstream app code repository: https://github.com/charlesabarnes/SPFtoolbox
-* YunoHost documentation for this app: https://yunohost.org/app_spftoolbox
-* Report a bug: https://github.com/YunoHost-Apps/spftoolbox_ynh/issues
+* Official app website: <http://spftoolbox.com/>
+* Upstream app code repository: <https://github.com/charlesabarnes/SPFtoolbox>
+* YunoHost documentation for this app: <https://yunohost.org/app_spftoolbox>
+* Report a bug: <https://github.com/YunoHost-Apps/spftoolbox_ynh/issues>

 ## Developer info

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

 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/spftoolbox_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade spftoolbox -u https://github.com/YunoHost-Apps/spftoolbox_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,42 +1,47 @@
+<!--
+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.
+-->
+
 # SPFtoolbox pour YunoHost

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

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

 > *Ce package vous permet d'installer SPFtoolbox 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.*

 ## Vue d'ensemble

-Recherchez des enregistrements DNS tels que SPF, MX, Whois, etc.
+Recherchez des enregistrements DNS tels que SPF, MX, Whois

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

 **Démo :** http://spftoolbox.com/

 ## Captures d'écran

-![](./doc/screenshots/687474703a2f2f692e696d6775722e636f6d2f4143785a5074512e706e67.png)
+![Capture d'écran de SPFtoolbox](./doc/screenshots/687474703a2f2f692e696d6775722e636f6d2f4143785a5074512e706e67.png)

 ## Documentations et ressources

-* Site officiel de l'app : http://spftoolbox.com/
-* Dépôt de code officiel de l'app : https://github.com/charlesabarnes/SPFtoolbox
-* Documentation YunoHost pour cette app : https://yunohost.org/app_spftoolbox
-* Signaler un bug : https://github.com/YunoHost-Apps/spftoolbox_ynh/issues
+* Site officiel de l'app : <http://spftoolbox.com/>
+* Dépôt de code officiel de l'app : <https://github.com/charlesabarnes/SPFtoolbox>
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_spftoolbox>
+* Signaler un bug : <https://github.com/YunoHost-Apps/spftoolbox_ynh/issues>

 ## Informations pour les développeurs

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

 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/spftoolbox_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade spftoolbox -u https://github.com/YunoHost-Apps/spftoolbox_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/conf/nginx.conf
+++ b/conf/nginx.conf
@ -4,11 +4,6 @@ location __PATH__/ {
  # Path to source
  alias __FINALPATH__/;

-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
  index index.php index.html;

  # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
--- a/manifest.json
+++ b/manifest.json
@ -3,10 +3,10 @@
    "id": "spftoolbox",
    "packaging_format": 1,
    "description": {
-        "en": "Look up DNS records such as SPF, MX, Whois, and more",
-        "fr": "Recherchez des enregistrements DNS tels que SPF, MX, Whois, etc."
+        "en": "Look up DNS records such as SPF, MX, Whois",
+        "fr": "Recherchez des enregistrements DNS tels que SPF, MX, Whois"
    },
-    "version": "2.1.1~ynh1",
+    "version": "2.1.1~ynh2",
    "url": "http://spftoolbox.com/",
    "upstream": {
        "license": "MIT",
@ -21,19 +21,18 @@
        "url": "https://www.abld.info"
    },
    "requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 11.0.9"
    },
    "multi_instance": true,
    "services": [
        "nginx",
-        "php7.3-fpm"
+        "php7.4-fpm"
    ],
    "arguments": {
        "install" : [
            {
                "name": "domain",
-                "type": "domain",
-                "example": "example.com"
+                "type": "domain"
            },
            {
                "name": "path",
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================

-YNH_PHP_VERSION="7.3"
+YNH_PHP_VERSION="7.4"

 # dependencies used by the app
 pkg_dependencies="whois"
--- a/scripts/install
+++ b/scripts/install
@ -75,14 +75,6 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"

-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..."
-
-# Create a dedicated nginx config
-ynh_add_nginx_config
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@ -92,6 +84,14 @@ ynh_script_progression --message="Configuring PHP-FPM..."
 ynh_add_fpm_config
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)

+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Configuring NGINX web server..."
+
+# Create a dedicated nginx config
+ynh_add_nginx_config
+
 #=================================================
 # SETUP LOGROTATE
 #=================================================
--- a/scripts/restore
+++ b/scripts/restore
@ -39,13 +39,6 @@ test ! -d $final_path \

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

+#=================================================
+# REINSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Reinstalling dependencies..."
+
+# Define and install dependencies
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
@ -74,14 +75,11 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 ynh_add_fpm_config 

 #=================================================
-# SPECIFIC RESTORATION
+# RESTORE THE NGINX CONFIGURATION
 #=================================================
-# REINSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Reinstalling dependencies..."
+ynh_script_progression --message="Restoring the NGINX configuration..."

-# Define and install dependencies
-ynh_install_app_dependencies $pkg_dependencies
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"

 #=================================================
 # RESTORE THE LOGROTATE CONFIGURATION
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -84,14 +84,6 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"

-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..."
-
-# Create a dedicated nginx config
-ynh_add_nginx_config
-
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
@ -107,6 +99,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..."
 # Create a dedicated php-fpm config
 ynh_add_fpm_config

+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Upgrading NGINX web server configuration..."
+
+# Create a dedicated nginx config
+ynh_add_nginx_config
+
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================