diff --git a/README.md b/README.md index 277328f..eb6ff36 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Garradin is a free association managing software. -**Shipped version:** 1.0.6 +**Shipped version:** 1.0.7 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 340610b..d472910 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Garradin est un logiciel libre de gestion associative. il permet de gérer des membres. -**Version incluse :** 1.0.6 +**Version incluse :** 1.0.7 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index dc2a031..cd191db 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-1.0.6.tar.bz2 -SOURCE_SUM=dcb2b5481fdd9ca2544f1e1f81fff1067d6eb7189e0f8547c98f6413040cf65b +SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-1.0.7.tar.bz2 +SOURCE_SUM=bf54afad2ebd1e04cb5fa7f5a2033a7c790e30e7fb69b6795b103d66dfcb6c06 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.bz2 SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 9ad0765..6a8bd52 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { # Path to source - alias __FINALPATH__/www/ ; + alias __FINALPATH__/www/; if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; diff --git a/manifest.json b/manifest.json index 7cef4cd..0545d5b 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Software to manage association", "fr": "Logiciel libre de gestion d'association" }, - "version": "1.0.6~ynh1", + "version": "1.0.7~ynh1", "url": "http://garradin.eu/a-propos/", "license": "GPL-3.0-or-later", "maintainer": { @@ -26,29 +26,17 @@ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain for Garradin", - "fr": "Choisissez un domaine pour Garradin" - }, "example": "domain.org" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for Garradin", - "fr": "Choisissez un chemin pour Garradin" - }, "example": "/garradin", "default": "/garradin" }, { "name": "is_public", "type": "boolean", - "ask": { - "en": "Is it a public application?", - "fr": "Est-ce une application publique ?" - }, "help": { "en": "The SSO is not implemented for this app and yunohost is not sure for hundred of users...", "fr": "Le SSO n'est pas implémenté pour cette application et yunohost n'est pas sûr pour une centaine d'utilisateurs..." diff --git a/scripts/backup b/scripts/backup index 2ba0d4f..551df9d 100644 --- a/scripts/backup +++ b/scripts/backup @@ -20,7 +20,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." +ynh_print_info "Declaring files to be backed up..." app=$YNH_APP_INSTANCE_NAME diff --git a/scripts/install b/scripts/install index 65582d4..9ff666a 100644 --- a/scripts/install +++ b/scripts/install @@ -33,9 +33,6 @@ ynh_script_progression --message="Validating installation parameters..." --weigh final_path=/var/www/$app test ! -e "$final_path" || ynh_die "This path already contains a folder" -# Normalize the URL path syntax -path_url=$(ynh_normalize_url_path $path_url) - # Check web path availability ynh_webpath_available $domain $path_url # Register (book) web path diff --git a/scripts/upgrade b/scripts/upgrade index 34f12fb..cb15d46 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,8 +24,12 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # CHECK VERSION #================================================= - -upgrade_type=$(ynh_check_app_version_changed) +if ynh_compare_current_package_version --comparison lt --version 0.9.8.1~ynh1; then + ynh_print_info --message="Sorry your version is outdated and need first an update to version 0.9.8.1 with the branch 0.9.8, proceed like that: 'sudo yunohost app upgrade garradin -u https://github.com/YunoHost-Apps/garradin_ynh/tree/0.9.8 --debug' and open your admin page to finalize before next update" + ynh_die "Sorry your version is outdated and need first an update to version 0.9.8.1 with the branch 0.9.8, proceed like that: 'sudo yunohost app upgrade garradin -u https://github.com/YunoHost-Apps/garradin_ynh/tree/0.9.8 --debug' and open your admin page to finalize before next update" +else + upgrade_type=$(ynh_check_app_version_changed) +fi #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -38,28 +42,6 @@ if [ -z "$final_path" ]; then ynh_app_setting_set --app=$app --key=final_path --value=$final_path fi -### If nobody installed your app before 3.7, -### then you may safely remove these lines - -# Cleaning legacy permissions -# is_public=$(ynh_app_setting_get --app=$app --key=is_public) - -if [ -n "$is_public" ]; then - # Remove protected_uris - ynh_app_setting_delete --app=$app --key=protected_uris - - #Removing skipped/unprotected_uris under certain conditions, remove the visitors group added during the migration process of 3.7 - #Remove skipped_uris. If the app was public, add visitors again to the main permission - if ynh_permission_has_user --permission=main --user=visitors - then - ynh_app_setting_delete --app=$app --key=skipped_uris - ynh_permission_update --permission "main" --add "visitors" - else - ynh_app_setting_delete --app=$app --key=skipped_uris - fi - ynh_app_setting_delete --app=$app --key=is_public -fi - #================================================= # Backup Data #================================================= @@ -97,8 +79,8 @@ ynh_script_progression --message="Upgrading source files..." --weight=5 if [ "$upgrade_type" == "UPGRADE_APP" ] then - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + # Download, check integrity, uncompress and patch the source from app.src + ynh_setup_source --dest_dir="$final_path" fi #================================================= @@ -124,7 +106,7 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config --package="$extra_php_dependencies" - +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #======================================================= # backup bdd, squelettes directory and config.local.php #======================================================= @@ -136,11 +118,13 @@ backup_squelettes=/tmp/squelettes if [ -d "$backup_squelettes" ] then cp -ar $backup_squelettes $final_path/www/squelettes + ynh_secure_remove $backup_squelettes fi if [ -e "$backup_bdd" ] then cp -a $backup_bdd $final_path/association.sqlite + ynh_secure_remove $backup_bdd fi key=$(ynh_string_random --length=50)