From 7536e1bc9a547f4e4931191efbb3b344399f0af5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 6 Feb 2021 11:58:17 +0100 Subject: [PATCH] Small fixes --- README.md | 8 -------- README_fr.md | 4 ---- check_process | 5 ----- manifest.json | 4 ++-- pull_request_template.md | 4 +--- scripts/backup | 3 ++- scripts/install | 15 +++++++-------- scripts/upgrade | 19 ++++++++++++------- 8 files changed, 24 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 1d7291d..e2ee524 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,18 @@ # Adminer for YunoHost - [![Integration level](https://dash.yunohost.org/integration/adminer.svg)](https://dash.yunohost.org/appci/app/adminer) ![](https://ci-apps.yunohost.org/ci/badges/adminer.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/adminer.maintain.svg) - [![Install Adminer with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=adminer) *[Lire ce readme en français.](./README_fr.md)* - > *This package allows you to install Adminer 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 Adminer (formerly phpMinAdmin better alternate to phpMyAdmin) is a full-featured database management tool (MySQL, MariaDB, PostgreSQL, SQLite, MS SQL, Oracle, SimpleDB, Elasticsearch, MongoDB). Replace phpMyAdmin with Adminer and you will get a tidier user interface, better support for MySQL features, higher performance and more security. [See detailed comparison](https://www.adminer.org/en/phpmyadmin). - **Shipped version:** 4.7.8 - ## Screenshots ![](https://www.adminer.org/static/screenshots/db.png) @@ -33,7 +27,6 @@ You need to know the root password from here `/etc/yunohost/mysql` or the app us For themes download the adminer.css from the main website and replace the file in the app folder. If you have problems with drivers see here: https://www.adminer.org/en/drivers. - ## YunoHost specific features #### Multi-user support @@ -46,7 +39,6 @@ If you have problems with drivers see here: https://www.adminer.org/en/drivers. * x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/adminer_%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/adminer/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/adminer_%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/adminer/) - ## Links * Report a bug: https://github.com/YunoHost-Apps/adminer_ynh/issues diff --git a/README_fr.md b/README_fr.md index 1859e57..0cd0a4b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,22 +1,18 @@ # Adminer pour YunoHost - [![Integration level](https://dash.yunohost.org/integration/adminer.svg)](https://dash.yunohost.org/appci/app/adminer) ![](https://ci-apps.yunohost.org/ci/badges/adminer.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/adminer.maintain.svg) [![Installer Adminer avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=adminer) *[Read this readme in english.](./README.md)* > *Ce package vous permet d'installer Adminer rapidement et simplement sur un serveur YunoHost. - Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* ## Vue d'ensemble Adminer (anciennement phpMinAdmin, meilleure alternative à phpMyAdmin) est un outil de gestion de base de données (MySQL, MariaDB, PostgreSQL, SQLite, MS SQL, Oracle, SimpleDB, Elasticsearch, MongoDB). Remplacez phpMyAdmin par Adminer et vous obtiendrez une interface utilisateur plus ordonnée, une meilleure prise en charge des fonctionnalités MySQL, des performances plus élevées et plus de sécurité. [Voir comparaison détaillée](https://www.adminer.org/en/phpmyadmin). - **Version incluse :** 4.7.8 - ## Captures d'écran ![](https://www.adminer.org/static/screenshots/db.png) diff --git a/check_process b/check_process index 99d13ca..44c97a8 100644 --- a/check_process +++ b/check_process @@ -1,8 +1,6 @@ # See here for more information # https://github.com/YunoHost/package_check#syntax-check_process-file -# Move this file from check_process.default to check_process when you have filled it. - ;; Test complet ; Manifest domain="domain.tld" (DOMAIN) @@ -22,9 +20,6 @@ multi_instance=1 port_already_use=0 change_url=1 -;;;; Levels - # If the level 5 (Package linter) is forced to 1. Please add justifications here. - Level 5=auto ;;; Options Email= anmol@datamol.org Notification=change diff --git a/manifest.json b/manifest.json index 46b7e51..084dd58 100644 --- a/manifest.json +++ b/manifest.json @@ -21,12 +21,12 @@ "url": "https://github.com/jesuisfol/adminer_ynh" }, "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.0.0" }, "multi_instance": true, "services": [ "nginx", - "php7.0-fpm" + "php7.3-fpm" ], "arguments": { "install" : [ diff --git a/pull_request_template.md b/pull_request_template.md index 6b3b094..6c28fc5 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -13,6 +13,4 @@ ## 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/adminer_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/adminer_ynh%20PR-NUM-%20(USERNAME)/) +* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* diff --git a/scripts/backup b/scripts/backup index 8ebe313..5cc5c95 100644 --- a/scripts/backup +++ b/scripts/backup @@ -19,6 +19,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= +ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME @@ -55,4 +56,4 @@ ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # END OF SCRIPT #================================================= -ynh_script_progression --message="Backup script completed for Adminer. (YunoHost will then actually copy those files to the archive)." --last +ynh_print_info --message="Backup script completed for Adminer. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/install b/scripts/install index 0ed00a8..f10d2e9 100644 --- a/scripts/install +++ b/scripts/install @@ -57,12 +57,11 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path mkdir -p $final_path if [[ $root_access -eq 1 ]]; then -#copy files from with_root_access folder to the final_path - cp -a ../sources/with_root_access/. $final_path -else -#copy files from root_access_disabled folder to the final_path -cp -a ../sources/root_access_disabled/. $final_path -cp -a ../sources/root_access_disabled/. $final_path + #copy files from with_root_access folder to the final_path + cp -a ../sources/with_root_access/. $final_path + else + #copy files from root_access_disabled folder to the final_path + cp -a ../sources/root_access_disabled/. $final_path fi #================================================= @@ -97,13 +96,13 @@ ynh_add_nginx_config ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated php-fpm config -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." --weight=1 +ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary or protect it if [ $is_public -eq 1 ] diff --git a/scripts/upgrade b/scripts/upgrade index 1f019b0..dbc436d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -43,6 +43,13 @@ if [ -z "$final_path" ]; then 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 #================================================= @@ -71,13 +78,11 @@ ynh_secure_remove $final_path mkdir -p $final_path if [[ $root_access -eq 1 ]]; then - #copy files from with_root_access folder to the final_path -cp -a ../sources/with_root_access/. $final_path -else -#copy files from root_access_disabled folder to the final_path -cp -a ../sources/root_access_disabled/. $final_path -cp -a ../sources/root_access_disabled/. $final_path + cp -a ../sources/with_root_access/. $final_path + else + #copy files from root_access_disabled folder to the final_path + cp -a ../sources/root_access_disabled/. $final_path fi #================================================= @@ -102,7 +107,7 @@ ynh_add_nginx_config ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated php-fpm config -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= # RELOAD NGINX