From 85a31775cc5fca536209a7bed623b46ad50b23f8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Jul 2021 21:03:39 +0200 Subject: [PATCH 01/12] Fix --- conf/app.src | 4 +-- manifest.json | 16 ++---------- scripts/_common.sh | 2 ++ scripts/install | 42 ++++++++++++------------------- scripts/upgrade | 61 +++++++++------------------------------------- 5 files changed, 33 insertions(+), 92 deletions(-) diff --git a/conf/app.src b/conf/app.src index 0a04ea6..c757541 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/charlesabarnes/SPFtoolbox/archive/876d0f19e4f7b19072c258164be33a5496a101a6.tar.gz -SOURCE_SUM=05f0780a7a0c19cce6a5537f47d8fc35ea9c73d2d43a5b9308e853675af07017 +SOURCE_URL=https://github.com/charlesabarnes/SPFtoolbox/archive/9306bf871c5dbc6115b75551396e90357b2b6106.tar.gz +SOURCE_SUM=7730309c43b8517d89dc0c0799b96bb595164f958417159dfeefa0e0036df7f5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 74f76be..fce3a71 100644 --- a/manifest.json +++ b/manifest.json @@ -15,12 +15,12 @@ "url": "https://www.abld.info" }, "requirements": { - "yunohost": ">= 3.5" + "yunohost": ">= 4.2.4" }, "multi_instance": true, "services": [ "nginx", - "php7.0-fpm", + "php7.3-fpm", "mysql" ], "arguments": { @@ -28,29 +28,17 @@ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain name for SPFToolBox", - "fr": "Choisissez un nom de domaine pour SPFToolBox" - }, "example": "example.com" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for SPFToolBox", - "fr": "Choisissez un chemin pour SPFToolBox" - }, "example": "/example", "default": "/example" }, { "name": "is_public", "type": "boolean", - "ask": { - "en": "Is it a public application?", - "fr": "Est-ce une application publique ?" - }, "default": true } ] diff --git a/scripts/_common.sh b/scripts/_common.sh index 78d4eab..4f9b49f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,6 +4,8 @@ # COMMON VARIABLES #================================================= +YNH_PHP_VERSION="7.3" + # dependencies used by the app pkg_dependencies="whois" diff --git a/scripts/install b/scripts/install index 81b5e72..b5bdb19 100644 --- a/scripts/install +++ b/scripts/install @@ -55,6 +55,14 @@ ynh_script_progression --message="Installing dependencies..." ynh_install_app_dependencies $pkg_dependencies +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Configuring system user..." + +# Create a system user +ynh_system_user_create --username=$app --home_dir="$final_path" + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -64,6 +72,10 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= # NGINX CONFIGURATION #================================================= @@ -72,14 +84,6 @@ ynh_script_progression --message="Configuring nginx web server..." # Create a dedicated nginx config ynh_add_nginx_config -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Configuring system user..." - -# Create a system user -ynh_system_user_create --username=$app - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -88,16 +92,6 @@ ynh_script_progression --message="Configuring php-fpm..." # Create a dedicated php-fpm config ynh_add_fpm_config -#================================================= -# GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= -ynh_script_progression --message="Securing files and directories..." - -# Set permissions to app files -chown -R root: $final_path - #================================================= # SETUP LOGROTATE #================================================= @@ -109,23 +103,17 @@ ynh_use_logrotate #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." +ynh_script_progression --message="Configuring permissions..." -if [ $is_public -eq 0 ] -then # Remove the public access - ynh_app_setting_delete $app skipped_uris -fi # Make app public if necessary if [ $is_public -eq 1 ] then - # unprotected_uris allows SSO credentials to be passed anyway. - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" + ynh_permission_update --permission="main" --add="visitors" fi - #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 56e016e..52dfe7a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,13 +18,11 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) -is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) @@ -33,21 +31,19 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." -# Fix is_public as a boolean value -if [ "$is_public" = "Yes" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=1 - is_public=1 -elif [ "$is_public" = "No" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=0 - is_public=0 -fi - # If final_path doesn't exist, create it if [ -z "$final_path" ]; then final_path=/var/www/$app ynh_app_setting_set --app=$app --key=final_path --value=$final_path fi +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -63,11 +59,12 @@ ynh_clean_setup () { ynh_abort_if_errors #================================================= -# CHECK THE PATH +# CREATE DEDICATED USER #================================================= +ynh_script_progression --message="Making sure dedicated system user exists..." -# Normalize the URL path syntax -path_url=$(ynh_normalize_url_path --path_url=$path_url) +# Create a dedicated user (if not existing) +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # STANDARD UPGRADE STEPS @@ -86,7 +83,7 @@ fi #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading nginx web server configuration..." +ynh_script_progression --message="Upgrading NGINX web server configuration..." # Create a dedicated nginx config ynh_add_nginx_config @@ -98,14 +95,6 @@ ynh_script_progression --message="Upgrading dependencies..." ynh_install_app_dependencies $pkg_dependencies -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." - -# Create a dedicated user (if not existing) -ynh_system_user_create --username=$app - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -124,32 +113,6 @@ ynh_script_progression --message="Upgrading logrotate configuration..." # Use logrotate to manage app-specific logfile(s) ynh_use_logrotate --non-append -#================================================= -# GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= -ynh_script_progression --message="Securing files and directories..." - -# Set permissions on app files -chown -R root: $final_path - -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." - -if [ $is_public -eq 0 ] -then # Remove the public access - ynh_app_setting_delete $app skipped_uris -fi -# Make app public if necessary -if [ $is_public -eq 1 ] -then - # unprotected_uris allows SSO credentials to be passed anyway - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" -fi - #================================================= # RELOAD NGINX #================================================= From d28f018e8aa002cbff958832da16a8b5969c3dd0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Jul 2021 23:00:47 +0200 Subject: [PATCH 02/12] Fix --- check_process | 12 +++--------- scripts/install | 1 + scripts/restore | 30 +++++++++++++----------------- 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/check_process b/check_process index a20c934..27a1037 100644 --- a/check_process +++ b/check_process @@ -1,8 +1,8 @@ ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - is_public=1 (PUBLIC|public=1|private=0) + domain="domain.tld" + path="/path" + is_public=1 ; Checks pkg_linter=1 setup_sub_dir=1 @@ -13,13 +13,7 @@ upgrade=1 backup_restore=1 multi_instance=1 - # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. - # incorrect_path=1 - port_already_use=0 change_url=0 -;;; Levels - # If the level 5 (Package linter) is forced to 1. Please add justifications here. - Level 5=auto ;;; Options Email= Notification=none diff --git a/scripts/install b/scripts/install index b5bdb19..ed79e9a 100644 --- a/scripts/install +++ b/scripts/install @@ -91,6 +91,7 @@ ynh_script_progression --message="Configuring php-fpm..." # Create a dedicated php-fpm config ynh_add_fpm_config +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # SETUP LOGROTATE diff --git a/scripts/restore b/scripts/restore index 3a2e28e..e060e80 100644 --- a/scripts/restore +++ b/scripts/restore @@ -48,6 +48,14 @@ 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 +#================================================= +ynh_script_progression --message="Recreating the dedicated system user..." + +# Create the dedicated user (if not existing) +ynh_system_user_create --username=$app --home_dir=$final_path + #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -55,21 +63,9 @@ ynh_script_progression --message="Restoring the app main directory..." ynh_restore_file --origin_path="$final_path" -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -ynh_script_progression --message="Recreating the dedicated system user..." - -# Create the dedicated user (if not existing) -ynh_system_user_create --username=$app - -#================================================= -# RESTORE USER RIGHTS -#================================================= -ynh_script_progression --message="Restoring user rights..." - -# Restore permissions on app files -chown -R root: $final_path +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" #================================================= # RESTORE THE PHP-FPM CONFIGURATION @@ -77,7 +73,7 @@ chown -R root: $final_path ynh_script_progression --message="Restoring PHP-FPM configuration..." ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" - +ynh_add_fpm_config #================================================= # SPECIFIC RESTORATION @@ -101,7 +97,7 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app" #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading nginx web server and php-fpm..." +ynh_script_progression --message="Reloading Nginx web server and php-fpm..." ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload From a7c9fc94f1c0cb7ed001eedb127b7ae025195432 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Jul 2021 23:14:05 +0200 Subject: [PATCH 03/12] Fix --- .../ISSUE_TEMPLATE.md | 39 ++++--- .github/PULL_REQUEST_TEMPLATE.md | 16 +++ check_process | 8 +- conf/nginx.conf | 2 +- manifest.json | 2 +- pull_request_template.md | 18 --- scripts/change_url | 105 ++++++++++++++++++ scripts/install | 5 +- scripts/remove | 4 +- scripts/restore | 4 +- scripts/upgrade | 4 +- 11 files changed, 162 insertions(+), 45 deletions(-) rename issue_template.md => .github/ISSUE_TEMPLATE.md (51%) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 pull_request_template.md create mode 100644 scripts/change_url diff --git a/issue_template.md b/.github/ISSUE_TEMPLATE.md similarity index 51% rename from issue_template.md rename to .github/ISSUE_TEMPLATE.md index 25fa857..2729a6b 100644 --- a/issue_template.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,46 +1,55 @@ --- name: Bug report -about: Create a report to help us debug, it would be nice to fill the template as much as you can to help us, help you and help us all. +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. --- **How to post a meaningful bug report** 1. *Read this whole template first.* 2. *Determine if you are on the right place:* - - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change url...), you are on the right place!* - - *Otherwise, the issue may be due to SPFtoolbox itself. Refer to its documentation or repository for help.* - - *If you have a doubt, post here, we will figure it out together.* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* + - *When in doubt, post here and we will figure it out together.* 3. *Delete the italic comments as you write over them below, and remove this guide.* --- -**Describe the bug** +### Describe the bug + *A clear and concise description of what the bug is.* -**Versions** +### Context + - Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* - YunoHost version: x.x.x - I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* -- Are you in a special context or did you perform some particular tweaking on your YunoHost instance ?: *no / yes* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* - If yes, please explain: - Using, or trying to install package version/branch: - If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* -**To Reproduce** -*Steps to reproduce the behavior.* +### Steps to reproduce + - *If you performed a command from the CLI, the command itself is enough. For example:* ```sh - sudo yunohost app install spftoolbox + sudo yunohost app install the_app ``` - *If you used the webadmin, please perform the equivalent command from the CLI first.* - *If the error occurs in your browser, explain what you did:* 1. *Go to '...'* - 2. *Click on '....'* - 3. *Scroll down to '....'* + 2. *Click on '...'* + 3. *Scroll down to '...'* 4. *See error* -**Expected behavior** +### Expected behavior + *A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* -**Logs** -*After a failed command, YunoHost makes the log available to you, but also to others, thanks to `yunohost log display [log name] --share`. The actual command, with the correct log name, is displayed at the end of the failed attempt in the CLI. Execute it and copy here the share link it outputs.* +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + *If applicable and useful, add screenshots to help explain your problem.* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) diff --git a/check_process b/check_process index 27a1037..f8e73cc 100644 --- a/check_process +++ b/check_process @@ -11,9 +11,15 @@ setup_private=1 setup_public=1 upgrade=1 + #upgrade=1 from_commit=CommitHash backup_restore=1 multi_instance=1 - change_url=0 + change_url=1 ;;; Options Email= Notification=none +;;; Upgrade options + ; commit=CommitHash + name=Name and date of the commit. + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& + diff --git a/conf/nginx.conf b/conf/nginx.conf index 50de23e..7202d38 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { # Path to source - alias __FINALPATH__/ ; + alias __FINALPATH__/; # Force usage of https if ($scheme = http) { diff --git a/manifest.json b/manifest.json index fce3a71..5c556fc 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Application to check Domain Name settings.", "fr": "Application qui permet de tester son nom de domaine." }, - "version": "1.1~ynh2", + "version": "2.1.1~ynh1", "url": "http://spftoolbox.com/", "license": "MIT", "maintainer": { diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index 1e04778..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,18 +0,0 @@ -## Problem -- *Description of why you made this PR* - -## Solution -- *And how do you fix that problem* - -## PR Status -- [ ] Code finished. -- [ ] Tested with Package_check. -- [ ] Fix or enhancement tested. -- [ ] Upgrade from last version tested. -- [ ] Can be reviewed and tested. - -## Package_check results ---- -*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* - -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/spftoolbox_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/spftoolbox_ynh%20PR-NUM-%20(USERNAME)/) diff --git a/scripts/change_url b/scripts/change_url new file mode 100644 index 0000000..5ac0e71 --- /dev/null +++ b/scripts/change_url @@ -0,0 +1,105 @@ +#!/bin/bash + +#================================================= +# GENERIC STARTING +#================================================= +# IMPORT GENERIC HELPERS +#================================================= + +source _common.sh +source /usr/share/yunohost/helpers + +#================================================= +# RETRIEVE ARGUMENTS +#================================================= + +old_domain=$YNH_APP_OLD_DOMAIN +old_path=$YNH_APP_OLD_PATH + +new_domain=$YNH_APP_NEW_DOMAIN +new_path=$YNH_APP_NEW_PATH + +app=$YNH_APP_INSTANCE_NAME + +#================================================= +# LOAD SETTINGS +#================================================= +ynh_script_progression --message="Loading installation settings..." --time --weight=1 + +# Needed for helper "ynh_add_nginx_config" +final_path=$(ynh_app_setting_get --app=$app --key=final_path) + +#================================================= +# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP +#================================================= +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --time --weight=1 + +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. + ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" + + # Restore it if the upgrade fails + ynh_restore_upgradebackup +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + +#================================================= +# CHECK WHICH PARTS SHOULD BE CHANGED +#================================================= + +change_domain=0 +if [ "$old_domain" != "$new_domain" ] +then + change_domain=1 +fi + +change_path=0 +if [ "$old_path" != "$new_path" ] +then + change_path=1 +fi + +#================================================= +# MODIFY URL IN NGINX CONF +#================================================= +ynh_script_progression --message="Updating NGINX web server configuration..." --time --weight=1 + +nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf + +# Change the path in the NGINX config file +if [ $change_path -eq 1 ] +then + # Make a backup of the original NGINX config file if modified + ynh_backup_if_checksum_is_different --file="$nginx_conf_path" + # Set global variables for NGINX helper + domain="$old_domain" + path_url="$new_path" + # Create a dedicated NGINX config + ynh_add_nginx_config +fi + +# Change the domain for NGINX +if [ $change_domain -eq 1 ] +then + # Delete file checksum for the old conf file location + ynh_delete_file_checksum --file="$nginx_conf_path" + mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf + # Store file checksum for the new config file location + ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" +fi + +#================================================= +# RELOAD NGINX +#================================================= +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 + +ynh_systemd_action --service_name=nginx --action=reload + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_script_progression --message="Change of URL completed for $app" --last diff --git a/scripts/install b/scripts/install index ed79e9a..5196575 100644 --- a/scripts/install +++ b/scripts/install @@ -44,7 +44,6 @@ ynh_script_progression --message="Storing installation settings..." ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=is_public --value=$is_public #================================================= # STANDARD MODIFICATIONS @@ -79,7 +78,7 @@ chown -R $app:www-data "$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." +ynh_script_progression --message="Configuring NGINX web server..." # Create a dedicated nginx config ynh_add_nginx_config @@ -87,7 +86,7 @@ ynh_add_nginx_config #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring php-fpm..." +ynh_script_progression --message="Configuring PHP-FPM..." # Create a dedicated php-fpm config ynh_add_fpm_config diff --git a/scripts/remove b/scripts/remove index 95e9643..a3c3712 100644 --- a/scripts/remove +++ b/scripts/remove @@ -40,7 +40,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..." # Remove the dedicated nginx config ynh_remove_nginx_config @@ -48,7 +48,7 @@ ynh_remove_nginx_config #================================================= # REMOVE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Removing php-fpm configuration..." +ynh_script_progression --message="Removing PHP-FPM configuration..." # Remove the dedicated php-fpm config ynh_remove_fpm_config diff --git a/scripts/restore b/scripts/restore index e060e80..8e405c1 100644 --- a/scripts/restore +++ b/scripts/restore @@ -44,7 +44,7 @@ test ! -d $final_path \ #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the nginx configuration..." +ynh_script_progression --message="Restoring the NGINX configuration..." ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -97,7 +97,7 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app" #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading Nginx web server and php-fpm..." +ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 52dfe7a..1e92da6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -98,7 +98,7 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading php-fpm configuration..." +ynh_script_progression --message="Upgrading PHP-FPM configuration..." # Create a dedicated php-fpm config ynh_add_fpm_config @@ -116,7 +116,7 @@ ynh_use_logrotate --non-append #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload From f5b97445a9cad88e378e3c0c603d176aa3f72bb1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Jul 2021 23:15:16 +0200 Subject: [PATCH 04/12] Update install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 5196575..faaa6ca 100644 --- a/scripts/install +++ b/scripts/install @@ -110,6 +110,7 @@ if [ $is_public -eq 1 ] then ynh_permission_update --permission="main" --add="visitors" fi + #================================================= # RELOAD NGINX #================================================= From 7f0e01ceb08e355cb9a076d7fdfa2b8c13a5374b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Jul 2021 23:18:14 +0200 Subject: [PATCH 05/12] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 5c556fc..e54e3c6 100644 --- a/manifest.json +++ b/manifest.json @@ -33,8 +33,8 @@ { "name": "path", "type": "path", - "example": "/example", - "default": "/example" + "example": "/spftoolbox", + "default": "/spftoolbox" }, { "name": "is_public", From 91c9819ab9536de8946d22f5bbd337abedd059e9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Jul 2021 23:21:10 +0200 Subject: [PATCH 06/12] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 7202d38..27c9303 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,7 +9,7 @@ location __PATH__/ { rewrite ^ https://$server_name$request_uri? permanent; } - index index.html; + index index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file #client_max_body_size 50M; From 5cc44c0ca6fe01fc3c5de99aa22320e75ef940ba Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Jul 2021 23:21:33 +0200 Subject: [PATCH 07/12] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 27c9303..597aa80 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,7 +9,7 @@ location __PATH__/ { rewrite ^ https://$server_name$request_uri? permanent; } - index index.php; + index index.php index.html; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file #client_max_body_size 50M; From 8897b905d19ac3bfe809ad77cab2e6f4037bc9d4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Jul 2021 23:28:39 +0200 Subject: [PATCH 08/12] Fux --- ...6d6775722e636f6d2f4143785a5074512e706e67.png | Bin 0 -> 50812 bytes manifest.json | 10 ++++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 doc/screenshots/687474703a2f2f692e696d6775722e636f6d2f4143785a5074512e706e67.png diff --git a/doc/screenshots/687474703a2f2f692e696d6775722e636f6d2f4143785a5074512e706e67.png b/doc/screenshots/687474703a2f2f692e696d6775722e636f6d2f4143785a5074512e706e67.png new file mode 100644 index 0000000000000000000000000000000000000000..75385fa969259df1d8d9c2addcbb566fb738bd33 GIT binary patch literal 50812 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

;a17hkPDakg1IAno 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 Date: Fri, 23 Jul 2021 23:28:56 +0200 Subject: [PATCH 09/12] Create DISCLAIMER.md --- doc/DISCLAIMER.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 doc/DISCLAIMER.md diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..e69de29 From ecce07ece7fd5aa5fec0c66721eba63f90bf665f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Jul 2021 23:30:51 +0200 Subject: [PATCH 10/12] Fix --- manifest.json | 3 +-- scripts/change_url | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/manifest.json b/manifest.json index 3e06857..62dd99e 100644 --- a/manifest.json +++ b/manifest.json @@ -26,8 +26,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.3-fpm", - "mysql" + "php7.3-fpm" ], "arguments": { "install" : [ diff --git a/scripts/change_url b/scripts/change_url index 5ac0e71..ff06606 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -24,7 +24,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) @@ -32,7 +32,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --time --weight=1 +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 # Backup the current version of the app ynh_backup_before_upgrade @@ -65,7 +65,7 @@ fi #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf From 31aa67856115100d23373a36fb20bc7f2ad5bf01 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 23 Jul 2021 21:30:58 +0000 Subject: [PATCH 11/12] Auto-update README --- README.md | 43 +++++++++++++++++++++++-------------------- README_fr.md | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 20 deletions(-) create mode 100644 README_fr.md diff --git a/README.md b/README.md index 810d83e..2ba8886 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,38 @@ + + # 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) -[![Install SPFtoolbox with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](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) -> *This package allows you to install SPFtoolbox quickly and simply on a YunoHost server. +*[Lire ce readme en français.](./README_fr.md)* + +> *This package allows you to install SPFtoolbox quickly and simply on a YunoHost server. If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview -See your record and check your domain settings -**Shipped version:** 1.1 +Application app to look up DNS records such as SPF, MX, Whois, and more + +**Shipped version:** 2.1.1~ynh1 + +**Demo:** http://spftoolbox.com/ ## Screenshots -![](https://camo.githubusercontent.com/bd296757ad81cd20b5263db892f5bcf4ca0e7b16/687474703a2f2f692e696d6775722e636f6d2f4143785a5074512e706e67) +![](./doc/screenshots/687474703a2f2f692e696d6775722e636f6d2f4143785a5074512e706e67.png) -## YunoHost specific features +## Documentation and resources -#### Supported architectures +* 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 -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/spftoolbox%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/spftoolbox/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/spftoolbox%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/spftoolbox/) - -## Links - - * Report a bug: https://github.com/YunoHost-Apps/spftoolbox_ynh/issues - * Upstream app repository: https://github.com/charlesabarnes/SPFtoolbox - * YunoHost website: https://yunohost.org/ - ---- - -Developer info ----------------- +## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/spftoolbox_ynh/tree/testing). @@ -41,3 +42,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/spftoolbox_ynh/tree/t 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 diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..4995523 --- /dev/null +++ b/README_fr.md @@ -0,0 +1,42 @@ +# 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) +[![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 + +Application pour rechercher des enregistrements DNS tels que SPF, MX, Whois, etc. + +**Version incluse :** 2.1.1~ynh1 + +**Démo :** http://spftoolbox.com/ + +## Captures d'écran + +![](./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 + +## 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. +``` +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 From 7cb1aa23a1c13db5c7f69bf1d5b5c0405b64ef71 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 24 Jul 2021 07:32:21 +0200 Subject: [PATCH 12/12] Update upgrade --- scripts/upgrade | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 1e92da6..48db94b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -80,6 +80,10 @@ then ynh_setup_source --dest_dir="$final_path" fi +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= # NGINX CONFIGURATION #=================================================