diff --git a/conf/app.src b/conf/app.src index e58db5a..793816f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-0.9.5.tar.bz2 -SOURCE_SUM=48f8d62d8c86b3aef2d090b2a7d04873c9642d6efc451389f58a5d6e89d89612 +SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-0.9.6.tar.bz2 +SOURCE_SUM=a0c4dcc6adc25a6f093bc09b0ed4c7efcbfde0726b790431c293112800ccc282 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.bz2 SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 8328b41..af69520 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -5,21 +5,25 @@ alias __FINALPATH__/www/ ; if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; -} + } - # Example PHP configuration (remove if not used) + # Example PHP configuration (remove if not used) index index.php /_route.php; try_files $uri $uri/ index.php /_route.php; -location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param REMOTE_USER $remote_user; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $request_filename; -} + location ~ [^/]\.php(/|$) { + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param REMOTE_USER $remote_user; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param SCRIPT_FILENAME $request_filename; + } + + # Increase size limit + client_max_body_size 2M; + # PHP configuration end # Include SSOWAT user panel. diff --git a/manifest.json b/manifest.json index 5424020..6a94ac3 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,9 @@ "en": "Software to manage association", "fr": "Logiciel libre de gestion d'association" }, - "version": "0.9.5~ynh3", + + "version": "0.9.6~ynh3", + "url": "http://garradin.eu/a-propos/", "license": "GPL-3.0-or-later", "maintainer": { @@ -49,6 +51,10 @@ "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..." + }, "default": true } ] diff --git a/scripts/_common.sh b/scripts/_common.sh index 05ab34a..768fbe1 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,8 @@ #================================================= # dependencies used by the app -pkg_dependencies="php7.0-sqlite3" + +pkg_dependencies="php-sqlite3" # ============= FUTURE YUNOHOST HELPER ============= @@ -42,4 +43,4 @@ ynh_permission_has_user() { allowed_users="$(echo "$perm" | grep --invert-match '^#')" # Grep the list of users an return the result if the user is indeed into the list echo "$allowed_users" | grep --quiet --word "$user" -} \ No newline at end of file +} diff --git a/scripts/change_url b/scripts/change_url index 64f0a01..3eed07a 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -29,14 +29,22 @@ ynh_script_progression --message="Loading installation settings..." --time --wei # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) -# #================================================= -# # CHECK THE SYNTAX OF THE PATHS -# #================================================= +#================================================= +# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +#================================================= +ynh_script_progression --message="Backing up the app before changing its url (may take a while)..." --time --weight=1 -# test -n "$old_path" || old_path="/" -# test -n "$new_path" || new_path="/" -# new_path=$(ynh_normalize_url_path $new_path) -# old_path=$(ynh_normalize_url_path $old_path) +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. + ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" + + # restore it if the upgrade fails + ynh_restore_upgradebackup +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors #================================================= # CHECK WHICH PARTS SHOULD BE CHANGED diff --git a/scripts/install b/scripts/install index ba784e1..ec67600 100644 --- a/scripts/install +++ b/scripts/install @@ -46,6 +46,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #================================================= ynh_script_progression --message="Storing installation settings..." --time --weight=1 + ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url @@ -56,11 +57,11 @@ ynh_script_progression --message="Installing dependencies..." --time --weight=1 ynh_install_app_dependencies $pkg_dependencies - #================================================= # CREATE DEDICATED USER #================================================= ynh_script_progression --message="Configuring system user..." --time --weight=1 + # Create a system user ynh_system_user_create --username=$app diff --git a/scripts/upgrade b/scripts/upgrade index a764151..a708b02 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,7 +18,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) -#is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) || ynh_die "This path already contains a folder" #================================================= # CHECK VERSION