YunoHost-Apps/spftoolbox_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/spftoolbox_ynh.git synced 2024-09-03 20:26:21 +02:00
Code Issues Activity Actions

Merge pull request #12 from YunoHost-Apps/cleaning

Browse source 
Cleaning
This commit is contained in:
Éric Gaspar 2022-10-14 09:35:20 +02:00 • committed by GitHub
commit f2b3bd02f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 61 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
README.md
View file

@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# SPFtoolbox for YunoHost # 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) [![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)* *[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 ## 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/ **Demo:** http://spftoolbox.com/
## Screenshots ## Screenshots
![](./doc/screenshots/687474703a2f2f692e696d6775722e636f6d2f4143785a5074512e706e67.png) ![Screenshot of SPFtoolbox](./doc/screenshots/687474703a2f2f692e696d6775722e636f6d2f4143785a5074512e706e67.png)
## Documentation and resources ## Documentation and resources
* Official app website: http://spftoolbox.com/ * Official app website: <http://spftoolbox.com/>
* Upstream app code repository: https://github.com/charlesabarnes/SPFtoolbox * Upstream app code repository: <https://github.com/charlesabarnes/SPFtoolbox>
* YunoHost documentation for this app: https://yunohost.org/app_spftoolbox * YunoHost documentation for this app: <https://yunohost.org/app_spftoolbox>
* Report a bug: https://github.com/YunoHost-Apps/spftoolbox_ynh/issues * Report a bug: <https://github.com/YunoHost-Apps/spftoolbox_ynh/issues>
## Developer info ## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/spftoolbox_ynh/tree/testing). 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. To try the testing branch, please proceed like that.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/spftoolbox_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/spftoolbox_ynh/tree/testing --debug
or or
sudo yunohost app upgrade spftoolbox -u https://github.com/YunoHost-Apps/spftoolbox_ynh/tree/testing --debug 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>

27
README_fr.md
View file

@ -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 # 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) [![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)* *[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. > *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.* Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
## Vue d'ensemble ## 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/ **Démo :** http://spftoolbox.com/
## Captures d'écran ## Captures d'écran
![](./doc/screenshots/687474703a2f2f692e696d6775722e636f6d2f4143785a5074512e706e67.png) ![Capture d'écran de SPFtoolbox](./doc/screenshots/687474703a2f2f692e696d6775722e636f6d2f4143785a5074512e706e67.png)
## Documentations et ressources ## Documentations et ressources
* Site officiel de l'app : http://spftoolbox.com/ * Site officiel de l'app : <http://spftoolbox.com/>
* Dépôt de code officiel de l'app : https://github.com/charlesabarnes/SPFtoolbox * Dépôt de code officiel de l'app : <https://github.com/charlesabarnes/SPFtoolbox>
* Documentation YunoHost pour cette app : https://yunohost.org/app_spftoolbox * Documentation YunoHost pour cette app : <https://yunohost.org/app_spftoolbox>
* Signaler un bug : https://github.com/YunoHost-Apps/spftoolbox_ynh/issues * Signaler un bug : <https://github.com/YunoHost-Apps/spftoolbox_ynh/issues>
## Informations pour les développeurs ## Informations pour les développeurs
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/spftoolbox_ynh/tree/testing). 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. Pour essayer la branche testing, procédez comme suit.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/spftoolbox_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/spftoolbox_ynh/tree/testing --debug
ou ou
sudo yunohost app upgrade spftoolbox -u https://github.com/YunoHost-Apps/spftoolbox_ynh/tree/testing --debug 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>

5
conf/nginx.conf
View file

@ -4,11 +4,6 @@ location __PATH__/ {
# Path to source # Path to source
alias __FINALPATH__/; alias __FINALPATH__/;
# Force usage of https
if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent;
}
index index.php index.html; index index.php index.html;
# Common parameter to increase upload size limit in conjunction with dedicated php-fpm file # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file

13
manifest.json
View file

@ -3,10 +3,10 @@
"id": "spftoolbox", "id": "spftoolbox",
"packaging_format": 1, "packaging_format": 1,
"description": { "description": {
"en": "Look up DNS records such as SPF, MX, Whois, and more", "en": "Look up DNS records such as SPF, MX, Whois",
"fr": "Recherchez des enregistrements DNS tels que SPF, MX, Whois, etc." "fr": "Recherchez des enregistrements DNS tels que SPF, MX, Whois"
}, },
"version": "2.1.1~ynh1", "version": "2.1.1~ynh2",
"url": "http://spftoolbox.com/", "url": "http://spftoolbox.com/",
"upstream": { "upstream": {
"license": "MIT", "license": "MIT",
@ -21,19 +21,18 @@
"url": "https://www.abld.info" "url": "https://www.abld.info"
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.2.4" "yunohost": ">= 11.0.9"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
"nginx", "nginx",
"php7.3-fpm" "php7.4-fpm"
], ],
"arguments": { "arguments": {
"install" : [ "install" : [
{ {
"name": "domain", "name": "domain",
"type": "domain", "type": "domain"
"example": "example.com"
}, },
{ {
"name": "path", "name": "path",

2
scripts/_common.sh
View file

@ -4,7 +4,7 @@
# COMMON VARIABLES # COMMON VARIABLES
#================================================= #=================================================
YNH_PHP_VERSION="7.3" YNH_PHP_VERSION="7.4"
# dependencies used by the app # dependencies used by the app
pkg_dependencies="whois" pkg_dependencies="whois"

16
scripts/install
View file

@ -75,14 +75,6 @@ chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:www-data "$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 # PHP-FPM CONFIGURATION
#================================================= #=================================================
@ -92,6 +84,14 @@ ynh_script_progression --message="Configuring PHP-FPM..."
ynh_add_fpm_config ynh_add_fpm_config
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) 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 # SETUP LOGROTATE
#================================================= #=================================================

24
scripts/restore
View file

@ -39,13 +39,6 @@ test ! -d $final_path \
#================================================= #=================================================
# STANDARD RESTORATION STEPS # 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 # RECREATE THE DEDICATED USER
#================================================= #=================================================
@ -65,6 +58,14 @@ chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:www-data "$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 # 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 ynh_add_fpm_config
#================================================= #=================================================
# SPECIFIC RESTORATION # RESTORE THE NGINX CONFIGURATION
#================================================= #=================================================
# REINSTALL DEPENDENCIES ynh_script_progression --message="Restoring the NGINX configuration..."
#=================================================
ynh_script_progression --message="Reinstalling dependencies..."
# Define and install dependencies ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
ynh_install_app_dependencies $pkg_dependencies
#================================================= #=================================================
# RESTORE THE LOGROTATE CONFIGURATION # RESTORE THE LOGROTATE CONFIGURATION

16
scripts/upgrade
View file

@ -84,14 +84,6 @@ chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:www-data "$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 # UPGRADE DEPENDENCIES
#================================================= #=================================================
@ -107,6 +99,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..."
# Create a dedicated php-fpm config # Create a dedicated php-fpm config
ynh_add_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 # SPECIFIC UPGRADE
#================================================= #=================================================