diff --git a/README.md b/README.md index ac562df..8a76b44 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Garradin for YunoHost -[![Integration level](https://dash.yunohost.org/integration/garradin.svg)](https://dash.yunohost.org/appci/app/garradin) ![](https://ci-apps.yunohost.org/ci/badges/garradin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/garradin.maintain.svg) -[![Install Garradin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=garradin) +[![Integration level](https://dash.yunohost.org/integration/garradin.svg)](https://dash.yunohost.org/appci/app/garradin) ![](https://ci-apps.yunohost.org/ci/badges/garradin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/garradin.maintain.svg) +[![Install Garradin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=garradin) *[Lire ce readme en français.](./README_fr.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:** 0.9.8.1 +**Shipped version:** 1.0.3 ## Screenshots @@ -26,7 +26,7 @@ Garradin is a free association managing software. * [Official demo](https://garradin.eu/essai/) ## Documentation - + * Official documentation: https://fossil.kd2.org/garradin/wiki?name=Documentation ## YunoHost specific features diff --git a/README_fr.md b/README_fr.md index 05337c9..744cae9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,17 +1,17 @@ # Garradin pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/garradin.svg)](https://dash.yunohost.org/appci/app/garradin) ![](https://ci-apps.yunohost.org/ci/badges/garradin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/garradin.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/garradin.svg)](https://dash.yunohost.org/appci/app/garradin) ![](https://ci-apps.yunohost.org/ci/badges/garradin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/garradin.maintain.svg) [![Installer Garradin avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=garradin) -*[Read this readme in english.](./README.md)* +*[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Garradin rapidement et simplement sur un serveur YunoHost. +> *Ce package vous permet d'installer Garradin 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 Garradin est un logiciel libre de gestion associative. il permet de gérer des membres. -**Version incluse :** 0.9.8.1 +**Version incluse :** 1.0.3 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 01152be..70384ea 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-0.9.8.1.tar.bz2 -SOURCE_SUM=7cc64b51c9721c2dd7ee510f245bcfc4693ee07f74581ad74003906eb4716ef1 +SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-1.0.3.tar.bz2 +SOURCE_SUM=89d9e0e0903dc1967d3159f8b30bd0e8eaea7f48daa5e9e86e5193e11b9003af SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.bz2 SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index a26d0a0..9ad0765 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,6 +1,6 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - + # Path to source alias __FINALPATH__/www/ ; @@ -8,19 +8,7 @@ location __PATH__/ { rewrite ^ https://$server_name$request_uri? permanent; } - location ~ 403 { - rewrite ^(.*)$ /include/ redirect; - rewrite ^(.*)$ /cache/ redirect; - rewrite ^(.*)$ /plugins/ redirect; - rewrite ^(.*)$ /templates/ redirect; - rewrite ^(.*)$ /.*.sqlite redirect; - rewrite ^(.*)$ /.*.log redirect; - rewrite ^(.*)$ /(README|VERSION|COPYING) redirect; - rewrite ^(.*)$ /config\.(.*)\.php redirect; - } - index index.php /_route.php; - try_files $uri $uri/ __PATH__/__PATH__/_route.php?$query_string; location ~ \.php$ { diff --git a/manifest.json b/manifest.json index 7806358..e82c0a8 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Software to manage association", "fr": "Logiciel libre de gestion d'association" }, - "version": "0.9.8.1~ynh4", + "version": "1.0.3~ynh1", "url": "http://garradin.eu/a-propos/", "license": "GPL-3.0-or-later", "maintainer": { diff --git a/pull_request_template.md b/pull_request_template.md index 9df1757..1443a9e 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -1,19 +1,16 @@ ## Problem -- *Upgrade of the application to v0.9.8.1 resolves some issues* -- *Adding links in the public page made issues due to the nginx.conf* -- *Protect somes links vilnerables for security* +- Upgrade to the version 1.0.3 ## Solution -- *I do the necessary to upgrade the application to the new sources* -- *@ericg found the solution to add in the nginx.conf* -- *Redirections to 403 on the nginx.conf for sensibles urls* +- Upgrade sources, Readme manifest +- Remove the Utils.php files (bug v 1.0.2) and réference (install upgrade) ## PR Status -- [x] Code finished. -- [x] Tested with Package_check. -- [x] Fix or enhancement tested. -- [x] Upgrade from last version tested. -- [x] Can be reviewed and tested. +- [ ] Code finished. +- [ ] Tested with Package_check. +- [ ] Fix or enhancement tested. +- [ ] Upgrade from last version tested. +- [ ] Can be reviewed and tested. ## Package_check results --- diff --git a/scripts/change_url b/scripts/change_url index 8121108..efe3a6b 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -58,12 +58,12 @@ final_path=/var/www/$app # 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 + # 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 + # Set global variables for NGINX helper domain="$old_domain" path_url="$new_path" - # Create a dedicated nginx config + # Create a dedicated NGINX config ynh_add_nginx_config fi @@ -76,7 +76,7 @@ else [ $change_path -eq 1 ] ynh_replace_string --match_string="const WWW_URI = '$old_path/';" --replace_string="const WWW_URI = '$new_path/';" --target_file="$final_path/config.local.php" fi -# Change the domain for nginx +# 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" diff --git a/scripts/install b/scripts/install index 8f26d71..65582d4 100644 --- a/scripts/install +++ b/scripts/install @@ -33,7 +33,7 @@ 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 +# Normalize the URL path syntax path_url=$(ynh_normalize_url_path $path_url) # Check web path availability @@ -71,7 +71,7 @@ ynh_setup_source --dest_dir="$final_path" #================================================= ynh_script_progression --message="Configuring NGINX web server..." --weight=2 -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -80,7 +80,7 @@ ynh_add_nginx_config ynh_script_progression --message="Configuring PHP-FPM..." --weight=5 # 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) #================================================= diff --git a/scripts/remove b/scripts/remove index be524b0..7780ced 100644 --- a/scripts/remove +++ b/scripts/remove @@ -32,7 +32,7 @@ ynh_secure_remove --file="$final_path" #================================================= ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 -# Remove the dedicated nginx config +# Remove the dedicated NGINX config ynh_remove_nginx_config #================================================= @@ -40,7 +40,7 @@ ynh_remove_nginx_config #================================================= ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=2 -# Remove the dedicated php-fpm config +# Remove the dedicated PHP-FPM config ynh_remove_fpm_config --package="$extra_php_dependencies" #================================================= diff --git a/scripts/restore b/scripts/restore index f23b8ad..5d3be8e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -76,7 +76,7 @@ ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=6 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 8d86efd..34f12fb 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -123,7 +123,7 @@ ynh_add_nginx_config ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # 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" #======================================================= # backup bdd, squelettes directory and config.local.php