From 4cb93a9d2857ab2837551f226c22792708d8774d Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sun, 26 Sep 2021 13:36:38 +0200 Subject: [PATCH 1/4] use url --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 5f8d061..5de498c 100644 --- a/scripts/install +++ b/scripts/install @@ -112,8 +112,8 @@ find $final_path/include -type d -exec chmod 500 {} + find $final_path/include -type f -exec chmod 400 {} + find $final_path/data -type d -exec chmod 700 {} + find $final_path/data -type f -exec chmod 600 {} + -find /var/www/garradin/www -type d -exec chmod 505 {} + -find /var/www/garradin/www -type f -exec chmod 644 {} + +find $final_path/www -type d -exec chmod 505 {} + +find $final_path/www -type f -exec chmod 644 {} + #================================================= # SETUP SSOWAT From bd9781351bd237dde9dc4f0b56557f7c6d5e915f Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Mon, 27 Sep 2021 14:16:53 +0200 Subject: [PATCH 2/4] update to latest version 1.1.11 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 39f59f7..6c013e0 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Garradin (word meaning money in an aboriginal dialect of northern Australia, pronounced "gar-a-dine" em) is software for associative management. It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc. . -**Shipped version:** 1.1.10~ynh1 +**Shipped version:** 1.1.11~ynh1 **Demo:** https://garradin.eu/essai/ diff --git a/README_fr.md b/README_fr.md index e76169a..d49e94d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Garradin (mot signifiant argent dans un dialecte aborigène du nord de l'Australie, prononcé « gar-a-dine »em) est un logiciel de gestion associative. Il est l'outil de prédilection pour gérer une association, un club sportif, une ONG, etc. Il est conçu pour répondre aux besoins d'une structure de petite à moyenne taille : gestion des adhérents, comptabilité, site web, prise de notes en réunion, archivage et partage des documents de fonctionnement de l'association, discussion entre adhérents, etc etc. -**Version incluse :** 1.1.10~ynh1 +**Version incluse :** 1.1.11~ynh1 **Démo :** https://garradin.eu/essai/ diff --git a/conf/app.src b/conf/app.src index 3e30ce9..40398d4 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-1.1.10.tar.bz2 -SOURCE_SUM=56785921ce99d8424871bf340a3225016fede10345e3ce9fe51e47facc2e88cc +SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-1.1.11.tar.bz2 +SOURCE_SUM=99783fac83945fc2fa9a8b04e85031090e1cc9de7555be3fdf6ed9724687976c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.bz2 SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index cf151b2..494d7c4 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.1.10~ynh1", + "version": "1.1.11~ynh1", "url": "http://garradin.eu", "upstream": { "license": "GPL-3.0-or-later", From 8b6d8f20ca70f6ae9b230ebdd98860f6a2e649b1 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Mon, 27 Sep 2021 15:12:14 +0200 Subject: [PATCH 3/4] prevent script upgrade loose the backups --- scripts/upgrade | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index f066255..45bfa05 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -101,13 +101,11 @@ then 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 chown -R $app:$app $final_path From edf5c7143f29509eff9679bd1899a76ad1ba5029 Mon Sep 17 00:00:00 2001 From: Florent Date: Tue, 28 Sep 2021 20:30:15 +0200 Subject: [PATCH 4/4] Remove the app dependencies on package removal These app dependencies were installed along with php-fpm --- manifest.json | 2 +- scripts/remove | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 494d7c4..5dab453 100644 --- a/manifest.json +++ b/manifest.json @@ -26,7 +26,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.3-fpm" + "php7.4-fpm" ], "arguments": { "install" : [ diff --git a/scripts/remove b/scripts/remove index 7780ced..57814f7 100644 --- a/scripts/remove +++ b/scripts/remove @@ -40,8 +40,11 @@ ynh_remove_nginx_config #================================================= ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=2 +# Remove the app dependencies installed along with php-fpm +ynh_remove_app_dependencies + # Remove the dedicated PHP-FPM config -ynh_remove_fpm_config --package="$extra_php_dependencies" +ynh_remove_fpm_config #================================================= # GENERIC FINALIZATION