From 842edf90ce2baf87ae941529701369ba2336b911 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Jul 2021 20:02:50 +0200 Subject: [PATCH 01/29] Fix --- scripts/_common.sh | 2 ++ scripts/install | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index cbc1622..cd2cc42 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,6 +7,8 @@ # dependencies used by the app pkg_dependencies="postgresql" +YNH_COMPOSER_VERSION="2.0.13" + # dependencies used by the app YNH_PHP_VERSION="7.3" diff --git a/scripts/install b/scripts/install index 3f7dfc8..e73fb8f 100755 --- a/scripts/install +++ b/scripts/install @@ -111,6 +111,13 @@ ynh_script_progression --message="Configuring Galette..." --weight=1 ynh_add_config --template="../conf/config.inc.php.dist" --destination="$final_path/config/config.inc.php" +#================================================= +# Install PHP dependencies using composer +#================================================= +ynh_script_progression --message="Configuring Composer..." --weight=1 + +ynh_install_composer + #================================================= # GENERIC FINALIZATION #================================================= From f561aae8aa99668f9709a346183972d3baa9e476 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Jul 2021 20:03:36 +0200 Subject: [PATCH 02/29] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index e73fb8f..a59c89b 100755 --- a/scripts/install +++ b/scripts/install @@ -116,7 +116,7 @@ ynh_add_config --template="../conf/config.inc.php.dist" --destination="$final_pa #================================================= ynh_script_progression --message="Configuring Composer..." --weight=1 -ynh_install_composer +ynh_install_composer --workdir=$final_path/webroot #================================================= # GENERIC FINALIZATION From 3f00b79cc15d3b4d3b020fc7533f459e1819898c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Jul 2021 20:06:02 +0200 Subject: [PATCH 03/29] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index a59c89b..e73fb8f 100755 --- a/scripts/install +++ b/scripts/install @@ -116,7 +116,7 @@ ynh_add_config --template="../conf/config.inc.php.dist" --destination="$final_pa #================================================= ynh_script_progression --message="Configuring Composer..." --weight=1 -ynh_install_composer --workdir=$final_path/webroot +ynh_install_composer #================================================= # GENERIC FINALIZATION From 4986a89e08c6baf4bcec4936d102f81655e3f1ed Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Jul 2021 20:10:44 +0200 Subject: [PATCH 04/29] Update app.src --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 5a1154b..5ca6c2e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/galette/galette/archive/refs/tags/0.9.5.tar.gz -SOURCE_SUM=080193b1afa529484a2dead509f5df8a28f2d172a8e075d14b47a51c2b7c6265 +SOURCE_URL=https://download.tuxfamily.org/galette/galette-0.9.4.2.tar.bz2 +SOURCE_SUM=171bda8250cf0996d40a38e032d93881d67b059be98ed5af20ac00dbdf8630e3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From a3ae729e8aea36312a9b3781344769b2cdb5e1f2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Jul 2021 20:11:27 +0200 Subject: [PATCH 05/29] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 79fcb74..e251d88 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Membership management web application for non profit organizations", "fr": "Outil de gestion d'adhérents et de cotisation en ligne pour associations" }, - "version": "0.9.5~ynh1", + "version": "0.9.4.2~ynh1", "url": "https://www.galette.eu", "upstream": { "license": "GPL-3.0-or-later", From ee5bfac812df0d6e9e8209a024acc308a193973b Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 22 Jul 2021 18:11:34 +0000 Subject: [PATCH 06/29] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ff4c0f9..88c5dc8 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 Membership management web application for non profit organizations -**Shipped version:** 0.9.5~ynh1 +**Shipped version:** 0.9.4.2~ynh1 **Demo:** https://demo.galette.eu/login diff --git a/README_fr.md b/README_fr.md index 412b9f3..4ba8e47 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 Outil de gestion d'adhérents et de cotisation en ligne pour associations -**Version incluse :** 0.9.5~ynh1 +**Version incluse :** 0.9.4.2~ynh1 **Démo :** https://demo.galette.eu/login From 1349f962f45ba5a788f9a81ca81e861ec6d681da Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Jul 2021 20:13:16 +0200 Subject: [PATCH 07/29] Fix --- conf/nginx.conf | 2 +- scripts/install | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 2a32082..9dc9433 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { # Path to source - alias __FINALPATH__/webroot; + alias __FINALPATH__/galette/webroot; if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; diff --git a/scripts/install b/scripts/install index e73fb8f..c890848 100755 --- a/scripts/install +++ b/scripts/install @@ -80,8 +80,8 @@ 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" -mv $final_path/galette/* $final_path/ -ynh_secure_remove $final_path/tests +# mv $final_path/galette/* $final_path/ +# ynh_secure_remove $final_path/tests chmod 750 $final_path chmod -R o-rwx $final_path @@ -111,12 +111,12 @@ ynh_script_progression --message="Configuring Galette..." --weight=1 ynh_add_config --template="../conf/config.inc.php.dist" --destination="$final_path/config/config.inc.php" -#================================================= -# Install PHP dependencies using composer -#================================================= -ynh_script_progression --message="Configuring Composer..." --weight=1 +# #================================================= +# # Install PHP dependencies using composer +# #================================================= +# ynh_script_progression --message="Configuring Composer..." --weight=1 -ynh_install_composer +# ynh_install_composer #================================================= # GENERIC FINALIZATION From 6cb41edc2b8ed13e275b3009792cc589ce07ac9c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Jul 2021 20:14:55 +0200 Subject: [PATCH 08/29] Update install --- scripts/install | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index c890848..8a5ea13 100755 --- a/scripts/install +++ b/scripts/install @@ -109,7 +109,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Configuring Galette..." --weight=1 -ynh_add_config --template="../conf/config.inc.php.dist" --destination="$final_path/config/config.inc.php" +ynh_add_config --template="../conf/config.inc.php.dist" --destination="$final_path/galette/config/config.inc.php" # #================================================= # # Install PHP dependencies using composer @@ -124,13 +124,13 @@ ynh_add_config --template="../conf/config.inc.php.dist" --destination="$final_pa # SECURE FILES AND DIRECTORIES #================================================= -chmod u+rx $final_path/config -chmod g+rwx $final_path/config +chmod u+rx $final_path/galette/config +chmod g+rwx $final_path/galette/config for folder in attachments cache exports files imports logs photos templates_c tempimages do - chown $app $final_path/data/$folder - chmod g+rwx $final_path/data/$folder + chown $app $final_path/galette/data/$folder + chmod g+rwx $final_path/galette/data/$folder done #================================================= From 61411e5d64dfc8c91c9eb334185184d48d79fab4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Jul 2021 20:21:02 +0200 Subject: [PATCH 09/29] Update nginx.conf --- conf/nginx.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 9dc9433..8ec7dd0 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { # Path to source - alias __FINALPATH__/galette/webroot; + alias __FINALPATH__/galette/webroot/; if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; @@ -13,8 +13,9 @@ location __PATH__/ { # Common parameter to increase upload size limit in conjuction with dedicated php-fpm file #client_max_body_size 50M; - try_files $uri $uri/ @__APP__; - + #try_files $uri $uri/ @__APP__; + try_files $uri $uri/ /index.php?$query_string; + location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; From 9c740189e42e56bef13361dbf4e10b56f658adda Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Jul 2021 20:23:27 +0200 Subject: [PATCH 10/29] Update nginx.conf --- conf/nginx.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 8ec7dd0..5c2a5e7 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -14,7 +14,6 @@ location __PATH__/ { #client_max_body_size 50M; #try_files $uri $uri/ @__APP__; - try_files $uri $uri/ /index.php?$query_string; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; From e9984d1c20bda1b6ec3bfd36e5eb61d6c54c48b9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Jul 2021 20:49:58 +0200 Subject: [PATCH 11/29] Update restore --- scripts/restore | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/restore b/scripts/restore index 54d79ba..7a06b43 100644 --- a/scripts/restore +++ b/scripts/restore @@ -99,13 +99,13 @@ ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name # RESTORE USER RIGHTS #================================================= -chown "$app" "$final_path/config" -chmod 750 "$final_path/config" +chown "$app" "$final_path/galette/config" +chmod 750 "$final_path/galette/config" for folder in attachments cache exports files imports logs photos templates_c tempimages do - chown "$app" "$final_path/data/$folder" - chmod 775 "$final_path/data/$folder" + chown "$app" "$final_path/galette/data/$folder" + chmod 775 "$final_path/galette/data/$folder" done #================================================= From 1846961149d3b5e3939b89c5cf3ddb0421c88bda Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Jul 2021 20:51:13 +0200 Subject: [PATCH 12/29] 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 5c2a5e7..12dcb72 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -13,7 +13,7 @@ location __PATH__/ { # Common parameter to increase upload size limit in conjuction with dedicated php-fpm file #client_max_body_size 50M; - #try_files $uri $uri/ @__APP__; + try_files $uri $uri/ @__APP__; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; From 23a38695c32a8d558721c5a5f9ba4f211a12c433 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Jul 2021 20:57:09 +0200 Subject: [PATCH 13/29] Update _common.sh --- scripts/_common.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index cd2cc42..cbc1622 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,8 +7,6 @@ # dependencies used by the app pkg_dependencies="postgresql" -YNH_COMPOSER_VERSION="2.0.13" - # dependencies used by the app YNH_PHP_VERSION="7.3" From 3f8396cca09a23993eabc26b17c7d800c94b42e6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Jul 2021 21:18:42 +0200 Subject: [PATCH 14/29] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 8a5ea13..d6209a0 100755 --- a/scripts/install +++ b/scripts/install @@ -165,7 +165,7 @@ ynh_systemd_action --service_name=nginx --action=reload message="Galette need you to finish the installation manually. -Please open "$domain/$path_url" and finish the install process. +Please open "https://$domain/$path_url/installer.php" and finish the install process. Database information you'll need: Type: pgsql From 09f22b6e86c2e1b63cca66dcc0e049f1e47212f9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Jul 2021 23:26:10 +0200 Subject: [PATCH 15/29] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 8347adf..a1b8cd5 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=65cd8b542310e8b349107ed222fdc57e3c2d239a + #upgrade=1 from_commit=65cd8b542310e8b349107ed222fdc57e3c2d239a backup_restore=1 multi_instance=1 change_url=0 From 5abfbc1cf75ae7e9544308b6d15c58c86c83120e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Jul 2021 23:31:33 +0200 Subject: [PATCH 16/29] Update upgrade --- scripts/upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index c2acd07..e11ea7b 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -94,12 +94,12 @@ then mv "$final_path" "$final_path.old" ynh_setup_source "$final_path" - mv "$final_path"/galette/* "$final_path"/ - ynh_secure_remove "$final_path"/tests + #ynh_secure_remove "$final_path"/tests # when running automatic tests, there is no config.inc.php - if [ -e "$final_path.old/config/config.inc.php" ]; then - cp "$final_path.old/config/config.inc.php" "$final_path/config/config.inc.php" + if [ -e "$final_path.old/galette/config/config.inc.php" ]; then + cp "$final_path.old/galette/config/config.inc.php" "$final_path/galette/config/config.inc.php" + cp "$final_path.old/galette/data" "$final_path/galette/data" fi # delete temp directory From c52e3013dff840d9cd8e6bab24c40573e4d1fa15 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Jul 2021 23:42:15 +0200 Subject: [PATCH 17/29] Update upgrade --- scripts/upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index e11ea7b..8343db7 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -144,13 +144,13 @@ ynh_use_logrotate --non-append # SECURE FILES AND DIRECTORIES #================================================= -chown "$app" "$final_path/config" -chmod 750 "$final_path/config" +chown "$app" "$final_path/galette/config" +chmod 750 "$final_path/galette/config" for folder in attachments cache exports files imports logs photos templates_c tempimages do - chown "$app" "$final_path/data/$folder" - chmod 775 "$final_path/data/$folder" + chown "$app" "$final_path/galette/data/$folder" + chmod 775 "$final_path/galette/data/$folder" done #================================================= From 2d50699ac7a1ab8d64ba764bd67d30b9fc0387a8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Jul 2021 23:47:05 +0200 Subject: [PATCH 18/29] Update install --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index d6209a0..0cbb6fb 100755 --- a/scripts/install +++ b/scripts/install @@ -176,8 +176,8 @@ Password: "$db_pwd" Name: "$db_name" Important! Once done, please remember to run as root or with sudo: -\`chmod -R 500 "$final_path/config"\` -\`Remove "$final_path/install"\` +\`chmod -R 500 "$final_path/galette/config"\` +\`Remove the install file "$final_path/galette/install"\` If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/galette_ynh" From 067bf6b25d4d110092f6e127f9406e9bd1008fca Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Jul 2021 23:48:06 +0200 Subject: [PATCH 19/29] Update install --- scripts/install | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 0cbb6fb..4040de6 100755 --- a/scripts/install +++ b/scripts/install @@ -168,12 +168,12 @@ message="Galette need you to finish the installation manually. Please open "https://$domain/$path_url/installer.php" and finish the install process. Database information you'll need: -Type: pgsql -Host: localhost -Port: 5432 -User: "$db_name" -Password: "$db_pwd" -Name: "$db_name" +Type: pgsql +Host: localhost +Port: 5432 +User: "$db_name" +Password: "$db_pwd" +Name: "$db_name" Important! Once done, please remember to run as root or with sudo: \`chmod -R 500 "$final_path/galette/config"\` From f9950ac513099f91379c82e0c328d8089e4f2a7a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Jul 2021 06:55:32 +0200 Subject: [PATCH 20/29] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 8343db7..d12a8d5 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -99,7 +99,7 @@ then # when running automatic tests, there is no config.inc.php if [ -e "$final_path.old/galette/config/config.inc.php" ]; then cp "$final_path.old/galette/config/config.inc.php" "$final_path/galette/config/config.inc.php" - cp "$final_path.old/galette/data" "$final_path/galette/data" + cp -r "$final_path.old/galette/data" "$final_path/galette/data" fi # delete temp directory From 0deb58cb6fc101d386b3bbeb94d41e19b0a170aa Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Jul 2021 07:01:22 +0200 Subject: [PATCH 21/29] Update upgrade --- scripts/upgrade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index d12a8d5..2feefdf 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,7 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) +db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) timezone="$(cat /etc/timezone)" @@ -57,8 +57,8 @@ fi # If db_name doesn't exist, create it if [ -z "$db_pwd" ]; then - db_pwd=$(ynh_app_setting_get "$app" mysqlpassword) - ynh_app_setting_set "$app" mysqlpwd "$db_pwd" + db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) + ynh_app_setting_set "$app" psqlpwd "$db_pwd" fi # If final_path doesn't exist, create it From 96a18b623befc09bd2e91a60ce4708cfb8e5dd4e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Jul 2021 07:04:29 +0200 Subject: [PATCH 22/29] Update install --- scripts/install | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/scripts/install b/scripts/install index 4040de6..a264957 100755 --- a/scripts/install +++ b/scripts/install @@ -80,9 +80,6 @@ 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" -# mv $final_path/galette/* $final_path/ -# ynh_secure_remove $final_path/tests - chmod 750 $final_path chmod -R o-rwx $final_path chown -R $app:www-data $final_path @@ -100,7 +97,6 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Configuring PHP-FPM..." --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) @@ -111,26 +107,19 @@ ynh_script_progression --message="Configuring Galette..." --weight=1 ynh_add_config --template="../conf/config.inc.php.dist" --destination="$final_path/galette/config/config.inc.php" -# #================================================= -# # Install PHP dependencies using composer -# #================================================= -# ynh_script_progression --message="Configuring Composer..." --weight=1 - -# ynh_install_composer - #================================================= # GENERIC FINALIZATION #================================================= # SECURE FILES AND DIRECTORIES #================================================= -chmod u+rx $final_path/galette/config +chown $app $final_path/galette/config chmod g+rwx $final_path/galette/config for folder in attachments cache exports files imports logs photos templates_c tempimages do chown $app $final_path/galette/data/$folder - chmod g+rwx $final_path/galette/data/$folder + chmod g+rwx $final_path/galette/data/$folder done #================================================= From 748a561b3303f7df5d4c3cefddb1223a55b6bdc1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Jul 2021 07:10:47 +0200 Subject: [PATCH 23/29] FIx --- .DS_Store | Bin 0 -> 6148 bytes check_process | 7 +++---- DISCLAIMER.md => doc/DISCLAIMER.md | 0 scripts/restore | 1 + scripts/upgrade | 7 ++++--- 5 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 .DS_Store rename DISCLAIMER.md => doc/DISCLAIMER.md (100%) diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..7cbe275046a42350e05301fa3e51caa9dcc81710 GIT binary patch literal 6148 zcmeH~Jr2S!425ml0g0s}V-^m;4I%_5-~tFbB6UFQIXcfj3xyd~=vlJA*s0a_4NWZ~ zdU%d|kwHY(aHH%j%uJDYGRh>k@o~Ffr|E7bw^h;#@Ihw#xlK?3DnJFO02QDD3sN8t z^7Upx&%{Te0#slb3fT9dz>PK8g8u11@DTv)QFg=HX9=)a0j$XuLtMpWxr-|5*!DDnJGPOabkW z=i>n{m1pb6>skGhRa-YW=$9kB{RAMfqj(E Date: Fri, 23 Jul 2021 07:14:23 +0200 Subject: [PATCH 24/29] Update manifest.json --- manifest.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index e251d88..ec863ef 100644 --- a/manifest.json +++ b/manifest.json @@ -27,8 +27,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.3-fpm", - "mysql" + "php7.3-fpm" ], "arguments": { "install": [ @@ -46,6 +45,10 @@ { "name": "is_public", "type": "boolean", + "help": { + "en": "If enabled, Galette will be accessible by people who do not have an account. This can be changed later via the webadmin.", + "fr": "Si cette case est cochée, Galette sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." + }, "default": true } ] From c6caab36b68fa5c8cdfd2e36561176bd0f37fced Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Jul 2021 07:15:34 +0200 Subject: [PATCH 25/29] Fix --- conf/nginx.conf | 2 +- conf/php-fpm.conf | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 12dcb72..8ed74b8 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -11,7 +11,7 @@ location __PATH__/ { index index.html index.php; # Common parameter to increase upload size limit in conjuction with dedicated php-fpm file - #client_max_body_size 50M; + client_max_body_size 50M; try_files $uri $uri/ @__APP__; diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 0252212..c456af0 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -419,8 +419,8 @@ chdir = __FINALPATH__ ;php_admin_value[memory_limit] = 32M ; Common values to change to increase file upload limit -; php_admin_value[upload_max_filesize] = 50M -; php_admin_value[post_max_size] = 50M +php_admin_value[upload_max_filesize] = 50M +php_admin_value[post_max_size] = 50M ; php_admin_flag[mail.add_x_header] = Off ; Other common parameters @@ -428,4 +428,4 @@ chdir = __FINALPATH__ ; php_admin_value[max_input_time] = 300 ; php_admin_value[memory_limit] = 256M ; php_admin_flag[short_open_tag] = On -php_admin_value[date.timezone] = __TIMEZONE__ \ No newline at end of file +php_admin_value[date.timezone] = __TIMEZONE__ From c6eeca8b07d9998814b7d7faf751ceab32b80d5e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Jul 2021 07:22:33 +0200 Subject: [PATCH 26/29] Fix --- doc/DISCLAIMER.md | 4 ++++ doc/DISCLAIMER_fr.md | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 doc/DISCLAIMER_fr.md diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index e69de29..bc45156 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -0,0 +1,4 @@ +## Configuration + +1. The app will require to complete the registration process after the instllation is complete by visiting the domain on which Galette is installed. +1. The Postgresql database credentials will be sent to the admin mail. Fill these details while doing the registration process. diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md new file mode 100644 index 0000000..4d95474 --- /dev/null +++ b/doc/DISCLAIMER_fr.md @@ -0,0 +1,4 @@ +## Configuration + +1. Une fois l'installation terminée, l'application devra terminer le processus d'enregistrement en **visitant le domaine** sur lequel Galette est installé. +1. Les informations d'identification de la base de données Postgresql seront envoyées à **l'email admin**. Remplissez ces détails lors du processus d'inscription. From 4ad55c00257cf554d7625549ef1461bd34c6044f Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 23 Jul 2021 05:22:42 +0000 Subject: [PATCH 27/29] Auto-update README --- README.md | 7 +++++++ README_fr.md | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/README.md b/README.md index 88c5dc8..054d0d2 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,13 @@ Membership management web application for non profit organizations ![](./doc/screenshots/edit_member.png) +## Disclaimers / important information + +## Configuration + +1. The app will require to complete the registration process after the instllation is complete by visiting the domain on which Galette is installed. +1. The Postgresql database credentials will be sent to the admin mail. Fill these details while doing the registration process. + ## Documentation and resources * Official app website: https://www.galette.eu diff --git a/README_fr.md b/README_fr.md index 4ba8e47..79af070 100644 --- a/README_fr.md +++ b/README_fr.md @@ -21,6 +21,13 @@ Outil de gestion d'adhérents et de cotisation en ligne pour associations ![](./doc/screenshots/edit_member.png) +## Avertissements / informations importantes + +## Configuration + +1. Une fois l'installation terminée, l'application devra terminer le processus d'enregistrement en **visitant le domaine** sur lequel Galette est installé. +1. Les informations d'identification de la base de données Postgresql seront envoyées à **l'email admin**. Remplissez ces détails lors du processus d'inscription. + ## Documentations et ressources * Site officiel de l'app : https://www.galette.eu From 12edf3688b39a4ec8797b6b399922e642307362d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Jul 2021 07:25:41 +0200 Subject: [PATCH 28/29] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index a264957..f700a8f 100755 --- a/scripts/install +++ b/scripts/install @@ -165,7 +165,7 @@ Password: "$db_pwd" Name: "$db_name" Important! Once done, please remember to run as root or with sudo: -\`chmod -R 500 "$final_path/galette/config"\` +Restrict the rights of the config file \`chmod -R 500 "$final_path/galette/config"\` \`Remove the install file "$final_path/galette/install"\` If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/galette_ynh" From 066b9c7199a328ace785432042429902a58a7b4a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Jul 2021 07:46:48 +0200 Subject: [PATCH 29/29] Update upgrade --- scripts/upgrade | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index ccd4f44..705f109 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -107,6 +107,10 @@ then ynh_secure_remove "$final_path.old" fi +chmod 750 $final_path +chmod -R o-rwx $final_path +chown -R $app:www-data $final_path + #================================================= # NGINX CONFIGURATION #=================================================