diff --git a/README.md b/README.md
index 2deee24..cf8b793 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# SPFtoolbox for YunoHost
-[](https://dash.yunohost.org/appci/app/spftoolbox)  
+[](https://dash.yunohost.org/appci/app/spftoolbox)  
[](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
-
+
## 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:
+* Upstream app code repository:
+* YunoHost documentation for this app:
+* Report a bug:
## 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
\ No newline at end of file
+**More info regarding app packaging:**
diff --git a/README_fr.md b/README_fr.md
index 187a455..9753c5b 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,42 +1,47 @@
+
+
# SPFtoolbox pour YunoHost
-[](https://dash.yunohost.org/appci/app/spftoolbox)  
+[](https://dash.yunohost.org/appci/app/spftoolbox)  
[](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
-
+
## 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 :
+* Dépôt de code officiel de l'app :
+* Documentation YunoHost pour cette app :
+* Signaler un bug :
## 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
\ No newline at end of file
+**Plus d'infos sur le packaging d'applications :**
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 597aa80..91797ab 100644
--- 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
diff --git a/manifest.json b/manifest.json
index 79ca8e1..5f57fa2 100644
--- 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",
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 4f9b49f..12242ec 100644
--- 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"
diff --git a/scripts/install b/scripts/install
index faaa6ca..f8afa2c 100644
--- 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
#=================================================
diff --git a/scripts/restore b/scripts/restore
index adbbbc1..30709d9 100644
--- 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
diff --git a/scripts/upgrade b/scripts/upgrade
index 48db94b..4b251d4 100644
--- 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
#=================================================