From 8a5b5266744caf00e71d6b3f6b7909ae91d2ea7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 9 Apr 2023 23:27:25 +0200 Subject: [PATCH 01/80] v2 --- conf/app.src | 7 ---- conf/config.local.php | 4 +- conf/nginx.conf | 2 +- conf/php-fpm.conf | 2 +- manifest.toml | 58 ++++++++++++++++++++++++++ scripts/_common.sh | 6 +-- scripts/backup | 14 +++---- scripts/change_url | 68 ++++++++++++++++--------------- scripts/install | 76 +++++++++++++++++----------------- scripts/remove | 20 ++++----- scripts/restore | 48 +++++++++++----------- scripts/upgrade | 94 +++++++++++++++++++++---------------------- 12 files changed, 226 insertions(+), 173 deletions(-) delete mode 100644 conf/app.src create mode 100644 manifest.toml diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index 2e0110c..0000000 --- a/conf/app.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://fossil.kd2.org/paheko/uv/paheko-1.2.8.tar.gz -SOURCE_SUM=d1946fca1a56b03fc59f577fe750aca2e94251a10440eea354b523d553ddd3fa -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -SOURCE_EXTRACT=true diff --git a/conf/config.local.php b/conf/config.local.php index e9b8a71..0080731 100644 --- a/conf/config.local.php +++ b/conf/config.local.php @@ -5,5 +5,5 @@ * * Pour ajouter vos configurations personnalisées, rendez-vous dans le fichier config.local.user.php */ -require '__FINALPATH__/config.local.yunohost.php'; -require '__FINALPATH__/config.local.user.php'; +require '__INSTALL_DIR__/config.local.yunohost.php'; +require '__INSTALL_DIR__/config.local.user.php'; diff --git a/conf/nginx.conf b/conf/nginx.conf index b468e8b..9ca9db2 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { # Path to source - alias __FINALPATH__/www/; + alias __INSTALL_DIR__/www/; index index.php /_route.php; diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 5f1eb97..02336ca 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -358,7 +358,7 @@ request_terminate_timeout = 1d ; Chdir to this directory at the start. ; Note: relative path can be used. ; Default Value: current directory or / when chroot -chdir = __FINALPATH__ +chdir = __INSTALL_DIR__ ; Redirect worker stdout and stderr into main error log. If not set, stdout and ; stderr will be redirected to /dev/null according to FastCGI specs. diff --git a/manifest.toml b/manifest.toml new file mode 100644 index 0000000..6dd1c5f --- /dev/null +++ b/manifest.toml @@ -0,0 +1,58 @@ +packaging_format = 2 + +id = "paheko" +name = "Paheko" +description.en = "Software to manage association" +description.fr = "Logiciel libre de gestion d'association" + +version = "1.2.8~ynh1" + +maintainers = ["rodinux"] + +[upstream] +license = "GPL-3.0-or-later" +website = "https://paheko.cloud" +demo = "https://paheko.cloud/essai/" +admindoc = "https://fossil.kd2.org/paheko/wiki?name=Documentation" +code = "https://fossil.kd2.org/paheko/dir?ci=tip" +cpe = "???" # FIXME: optional but recommended if relevant, this is meant to contain the Common Platform Enumeration, which is sort of a standard id for applications defined by the NIST. In particular, Yunohost may use this is in the future to easily track CVE (=security reports) related to apps. The CPE may be obtained by searching here: https://nvd.nist.gov/products/cpe/search. For example, for Nextcloud, the CPE is 'cpe:2.3:a:nextcloud:nextcloud' (no need to include the version number) +fund = "???" # FIXME: optional but recommended (or remove if irrelevant / not applicable). This is meant to be an URL where people can financially support this app, especially when its development is based on volunteers and/or financed by its community. YunoHost may later advertise it in the webadmin. + +[integration] +yunohost = ">= 11.0.9" +architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"] +multi_instance = true +ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials. +sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. +disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ... +ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... +ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... + +[install] + [install.domain] + # this is a generic question - ask strings are automatically handled by Yunohost's core + type = "domain" + + [install.path] + # this is a generic question - ask strings are automatically handled by Yunohost's core + type = "path" + default = "/paheko" + + [install.init_main_permission] + help.en = "The SSO is not implemented for this app and yunohost is not sure for hundred of users..." + help.fr = "Le SSO n'est pas implémenté pour cette application et yunohost n'est pas sûr pour une centaine d'utilisateurs..." + type = "group" + default = "visitors" + +[resources] + [resources.sources.main] + url = "https://fossil.kd2.org/paheko/uv/paheko-1.2.8.tar.gz" + sha256 = "d1946fca1a56b03fc59f577fe750aca2e94251a10440eea354b523d553ddd3fa" + + + [resources.system_user] + + [resources.install_dir] + + [resources.permissions] + main.url = "/" diff --git a/scripts/_common.sh b/scripts/_common.sh index b713a49..9a46b44 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,12 +6,12 @@ # PHP APP SPECIFIC #================================================= -YNH_PHP_VERSION="8.0" +#REMOVEME? YNH_PHP_VERSION="8.0" -php_dependencies="php${YNH_PHP_VERSION} php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-gnupg" +#REMOVEME? php_dependencies="php${YNH_PHP_VERSION} php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-gnupg" # dependencies used by the app (must be on a single line) -pkg_dependencies="$php_dependencies" +#REMOVEME? pkg_dependencies="$php_dependencies" #================================================= # PERSONAL HELPERS diff --git a/scripts/backup b/scripts/backup index 75ce3e0..9a44356 100644 --- a/scripts/backup +++ b/scripts/backup @@ -15,18 +15,18 @@ source /usr/share/yunohost/helpers #================================================= # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_print_info --message="Loading installation settings..." +#REMOVEME? ynh_print_info --message="Loading installation settings..." -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -domain=$(ynh_app_setting_get --app=$app --key=domain) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP @@ -37,7 +37,7 @@ ynh_print_info --message="Declaring files to be backed up..." # BACKUP THE APP MAIN DIR #================================================= -ynh_backup --src_path="$final_path" +ynh_backup --src_path="$install_dir" #================================================= # BACKUP THE NGINX CONFIGURATION diff --git a/scripts/change_url b/scripts/change_url index 3540c90..d3d5897 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -13,56 +13,56 @@ source /usr/share/yunohost/helpers # RETRIEVE ARGUMENTS #================================================= -old_domain=$YNH_APP_OLD_DOMAIN -old_path=$YNH_APP_OLD_PATH +#REMOVEME? old_domain=$YNH_APP_OLD_DOMAIN +#REMOVEME? old_path=$YNH_APP_OLD_PATH -new_domain=$YNH_APP_NEW_DOMAIN -new_path=$YNH_APP_NEW_PATH +#REMOVEME? new_domain=$YNH_APP_NEW_DOMAIN +#REMOVEME? new_path=$YNH_APP_NEW_PATH -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -# Needed for helper "ynh_add_nginx_config" -final_path=$(ynh_app_setting_get --app=$app --key=final_path) +#REMOVEME? # Needed for helper "ynh_add_nginx_config" +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) # Add settings here as needed by your application -secret_key=$(ynh_app_setting_get --app=$app --key=secret_key) +#REMOVEME? secret_key=$(ynh_app_setting_get --app=$app --key=secret_key) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 +#REMOVEME? ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 # Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { +#REMOVEME? ynh_backup_before_upgrade +#REMOVEME? 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" +#REMOVEME? ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" # Restore it if the upgrade fails - ynh_restore_upgradebackup +#REMOVEME? ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # CHECK WHICH PARTS SHOULD BE CHANGED #================================================= -change_domain=0 -if [ "$old_domain" != "$new_domain" ] +#REMOVEME? change_domain=0 +#REMOVEME? if [ "$old_domain" != "$new_domain" ] then - change_domain=1 + #REMOVEME? change_domain=1 fi -change_path=0 -if [ "$old_path" != "$new_path" ] +#REMOVEME? change_path=0 +#REMOVEME? if [ "$old_path" != "$new_path" ] then - change_path=1 + #REMOVEME? change_path=1 fi #================================================= @@ -72,28 +72,30 @@ fi #================================================= ynh_script_progression --message="Updating NGINX web server configuration..." --weight=5 -nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf +ynh_change_url_nginx_config + +#REMOVEME? nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf # 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 - ynh_backup_if_checksum_is_different --file="$nginx_conf_path" +#REMOVEME? ynh_backup_if_checksum_is_different --file="$nginx_conf_path" # Set global variables for NGINX helper - domain="$old_domain" - path_url="$new_path" +#REMOVEME? domain="$old_domain" +#REMOVEME? path="$new_path" # Create a dedicated NGINX config - ynh_add_nginx_config +#REMOVEME? ynh_add_nginx_config fi # 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" - mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf +#REMOVEME? ynh_delete_file_checksum --file="$nginx_conf_path" +#REMOVEME? mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf # Store file checksum for the new config file location - ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" +#REMOVEME? ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" fi #================================================= @@ -102,19 +104,19 @@ fi # UPDATE A CONFIG FILE #================================================= ynh_script_progression --message="Updating a configuration file..." --weight=1 - +#REMOVEME? domain=$new_domain path=$new_path -ynh_add_config --template="config.local.yunohost.php" --destination="$final_path/config.local.yunohost.php" +ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" #================================================= # GENERIC FINALISATION #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=2 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=2 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? #REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 7b2f7e9..c26308b 100644 --- a/scripts/install +++ b/scripts/install @@ -14,66 +14,66 @@ source /usr/share/yunohost/helpers #================================================= # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -domain=$YNH_APP_ARG_DOMAIN -path_url=$YNH_APP_ARG_PATH -is_public=$YNH_APP_ARG_IS_PUBLIC +#REMOVEME? domain=$YNH_APP_ARG_DOMAIN +#REMOVEME? path=$YNH_APP_ARG_PATH +#REMOVEME? is_public=$YNH_APP_ARG_IS_PUBLIC -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -ynh_script_progression --message="Validating installation parameters..." --weight=1 +#REMOVEME? ynh_script_progression --message="Validating installation parameters..." --weight=1 -final_path=/var/www/$app -test ! -e "$final_path" || ynh_die --message="This path already contains a folder" +#REMOVEME? install_dir=/var/www/$app +#REMOVEME? test ! -e "$install_dir" || ynh_die --message="This path already contains a folder" # Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url +#REMOVEME? ynh_webpath_register --app=$app --domain=$domain --path=$path #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_script_progression --message="Storing installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Storing installation settings..." --weight=1 -ynh_app_setting_set --app=$app --key=domain --value=$domain -ynh_app_setting_set --app=$app --key=path --value=$path_url +#REMOVEME? ynh_app_setting_set --app=$app --key=domain --value=$domain +#REMOVEME? ynh_app_setting_set --app=$app --key=path --value=$path #================================================= # STANDARD MODIFICATIONS #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing dependencies..." --weight=1 +#REMOVEME? ynh_script_progression --message="Installing dependencies..." --weight=1 -ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Configuring system user..." --weight=3 +#REMOVEME? ynh_script_progression --message="Configuring system user..." --weight=3 # Create a system user -ynh_system_user_create --username=$app --home_dir="$final_path" +#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." --weight=4 -ynh_app_setting_set --app=$app --key=final_path --value=$final_path +#REMOVEME? ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$final_path" +ynh_setup_source --dest_dir="$install_dir" -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # PHP-FPM CONFIGURATION @@ -103,42 +103,42 @@ secret_key=$(ynh_string_random --length=50) ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key # Install configuration files -ynh_add_config --template="config.local.php" --destination="$final_path/config.local.php" -ynh_add_config --template="config.local.yunohost.php" --destination="$final_path/config.local.yunohost.php" -ynh_add_config --template="config.local.user.php" --destination="$final_path/config.local.user.php" +ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" +ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" +ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" # Permissions on files and directories -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" -find "$final_path" -type d -exec chmod 550 {} + -find "$final_path" -type f -exec chmod 440 {} + -find "$final_path/data" -type d -exec chmod 770 {} + -find "$final_path/data" -type f -exec chmod 660 {} + -chmod 440 "$final_path/config.local.php" -chmod 440 "$final_path/config.local.yunohost.php" -chmod 660 "$final_path/config.local.user.php" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" +find "$install_dir" -type d -exec chmod 550 {} + +find "$install_dir" -type f -exec chmod 440 {} + +find "$install_dir/data" -type d -exec chmod 770 {} + +find "$install_dir/data" -type f -exec chmod 660 {} + +chmod 440 "$install_dir/config.local.php" +chmod 440 "$install_dir/config.local.yunohost.php" +chmod 660 "$install_dir/config.local.user.php" #================================================= # GENERIC FINALIZATION #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring permissions..." --weight=8 +#REMOVEME? ynh_script_progression --message="Configuring permissions..." --weight=8 # Make app public if necessary -if [ $is_public -eq 1 ] +#REMOVEME? if [ $is_public -eq 1 ] then # Everyone can access the app. # The "main" permission is automatically created before the install script. - ynh_permission_update --permission="main" --add="visitors" +#REMOVEME? ynh_permission_update --permission="main" --add="visitors" fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT diff --git a/scripts/remove b/scripts/remove index 40ca2ab..0aff02c 100644 --- a/scripts/remove +++ b/scripts/remove @@ -12,22 +12,22 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=2 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=2 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=domain) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) #================================================= # STANDARD REMOVE #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." --weight=3 +#REMOVEME? ynh_script_progression --message="Removing app main directory..." --weight=3 # Remove the app directory securely -ynh_secure_remove --file="$final_path" +#REMOVEME? ynh_secure_remove --file="$install_dir" #================================================= # REMOVE NGINX CONFIGURATION @@ -48,20 +48,20 @@ ynh_remove_fpm_config #================================================= # REMOVE DEPENDENCIES #================================================= -ynh_script_progression --message="Removing dependencies..." --weight=1 +#REMOVEME? ynh_script_progression --message="Removing dependencies..." --weight=1 # Remove metapackage and its dependencies -ynh_remove_app_dependencies +#REMOVEME? ynh_remove_app_dependencies #================================================= # GENERIC FINALIZATION #================================================= # REMOVE DEDICATED USER #================================================= -ynh_script_progression --message="Removing the dedicated system user..." --weight=2 +#REMOVEME? ynh_script_progression --message="Removing the dedicated system user..." --weight=2 # Delete a system user -ynh_system_user_delete --username=$app +#REMOVEME? ynh_system_user_delete --username=$app #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index 55a2c33..5b7c05a 100644 --- a/scripts/restore +++ b/scripts/restore @@ -15,65 +15,65 @@ source /usr/share/yunohost/helpers #================================================= # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -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) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= -ynh_script_progression --message="Validating restoration parameters..." --weight=4 +#REMOVEME? ynh_script_progression --message="Validating restoration parameters..." --weight=4 -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +#REMOVEME? test ! -d $install_dir \ + || ynh_die --message="There is already a directory: $install_dir " #================================================= # STANDARD RESTORATION STEPS #================================================= # RECREATE THE DEDICATED USER #================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --weight=3 +#REMOVEME? ynh_script_progression --message="Recreating the dedicated system user..." --weight=3 # Create the dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" +#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" #================================================= # RESTORE THE APP MAIN DIR #================================================= ynh_script_progression --message="Restoring the app main directory..." --weight=5 -ynh_restore_file --origin_path="$final_path" +ynh_restore_file --origin_path="$install_dir" # Restore permissions on app files -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" -find "$final_path" -type d -exec chmod 550 {} + -find "$final_path" -type f -exec chmod 440 {} + -find "$final_path/data" -type d -exec chmod 770 {} + -find "$final_path/data" -type f -exec chmod 660 {} + -chmod 440 "$final_path/config.local.php" -chmod 440 "$final_path/config.local.yunohost.php" -chmod 660 "$final_path/config.local.user.php" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" +find "$install_dir" -type d -exec chmod 550 {} + +find "$install_dir" -type f -exec chmod 440 {} + +find "$install_dir/data" -type d -exec chmod 770 {} + +find "$install_dir/data" -type f -exec chmod 660 {} + +chmod 440 "$install_dir/config.local.php" +chmod 440 "$install_dir/config.local.yunohost.php" +chmod 660 "$install_dir/config.local.user.php" #================================================= # SPECIFIC RESTORATION #================================================= # REINSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reinstalling dependencies..." --weight=1 # Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 6a0acd8..b4a8a21 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -15,15 +15,15 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=3 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=3 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -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) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -secret_key=$(ynh_app_setting_get --app=$app --key=secret_key) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#REMOVEME? secret_key=$(ynh_app_setting_get --app=$app --key=secret_key) #================================================= # CHECK VERSION @@ -35,25 +35,25 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=30 +#REMOVEME? ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=30 # Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup_migration() { +#REMOVEME? ynh_backup_before_upgrade +#REMOVEME? ynh_clean_setup_migration() { yunohost app remove $app - app=garradin ynh_restore_upgradebackup +#REMOVEME? app=garradin ynh_restore_upgradebackup } -ynh_clean_setup () { +#REMOVEME? ynh_clean_setup () { # Restore it if the upgrade fails if [[ $migration_process -eq 1 ]]; then - ynh_clean_setup_migration +#REMOVEME? ynh_clean_setup_migration else - ynh_restore_upgradebackup +#REMOVEME? ynh_restore_upgradebackup fi } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # STANDARD UPGRADE STEPS @@ -62,10 +62,10 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -# If final_path doesn't exist, create it -if [ -z "$final_path" ]; then - final_path=/var/www/$app - ynh_app_setting_set --app=$app --key=final_path --value=$final_path +# If install_dir doesn't exist, create it +if [ -z "$install_dir" ]; then +#REMOVEME? install_dir=/var/www/$app +#REMOVEME? ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir fi # If secret_key doesn't exist, create it @@ -76,8 +76,8 @@ fi # Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all +#REMOVEME? if ynh_legacy_permissions_exists; then +#REMOVEME? ynh_legacy_permissions_delete_all ynh_app_setting_delete --app=$app --key=is_public fi @@ -87,15 +87,15 @@ fi #================================================= [[ $YNH_APP_ID == "garradin" ]] \ - && [[ "$(cat "$final_path/VERSION")" != 1.2.4 ]] \ + && [[ "$(cat "$install_dir/VERSION")" != 1.2.4 ]] \ && ynh_die --message "It looks like that you have an old Garradin installed. You need to first upgrade your Garradin instance (id: $garradin_migrate_id) and after to migrate to Paheko." ynh_handle_app_migration --migration_id=garradin --migration_list=garradin_migrations if [[ $migration_process -eq 1 ]]; then - final_path=$(ynh_app_setting_get --app=$app --key=final_path) - ynh_permission_update --permission="main" --add="all_users" - ynh_permission_update --permission="main" --add="visitors" +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? ynh_permission_update --permission="main" --add="all_users" +#REMOVEME? ynh_permission_update --permission="main" --add="visitors" fi #================================================= @@ -105,10 +105,10 @@ fi #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 +#REMOVEME? ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 # Create a dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" +#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -119,19 +119,19 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="association.sqlite squelettes/ data/ skel-dist/ config.local.user.php" + ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite squelettes/ data/ skel-dist/ config.local.user.php" fi -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # UPGRADE DEPENDENCIES #================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=1 +#REMOVEME? ynh_script_progression --message="Upgrading dependencies..." --weight=1 -ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_install_app_dependencies $pkg_dependencies #================================================= # PHP-FPM CONFIGURATION @@ -157,23 +157,23 @@ ynh_add_nginx_config ynh_script_progression --message="Updating a configuration file..." --weight=5 if ynh_compare_current_package_version --comparison lt --version 1.1.15~ynh1; then - ynh_add_config --template="config.local.user.php" --destination="$final_path/config.local.user.php" + ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" fi -ynh_add_config --template="config.local.php" --destination="$final_path/config.local.php" -ynh_add_config --template="config.local.yunohost.php" --destination="$final_path/config.local.yunohost.php" +ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" +ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" # NOTE: Don't overwrite config.local.user.php # Permissions on files and directories -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" -find "$final_path" -type d -exec chmod 550 {} + -find "$final_path" -type f -exec chmod 440 {} + -find "$final_path/data" -type d -exec chmod 770 {} + -find "$final_path/data" -type f -exec chmod 660 {} + -chmod 440 "$final_path/config.local.php" -chmod 440 "$final_path/config.local.yunohost.php" -chmod 660 "$final_path/config.local.user.php" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" +find "$install_dir" -type d -exec chmod 550 {} + +find "$install_dir" -type f -exec chmod 440 {} + +find "$install_dir/data" -type d -exec chmod 770 {} + +find "$install_dir/data" -type f -exec chmod 660 {} + +chmod 440 "$install_dir/config.local.php" +chmod 440 "$install_dir/config.local.yunohost.php" +chmod 660 "$install_dir/config.local.user.php" #================================================= # FINALISE UPGRADE @@ -189,9 +189,9 @@ ynh_local_curl "/index.php" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= # FINISH MIGRATION PROCESS From cfe621ed4c3765824a67df44199489f6d5ba37ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 9 Apr 2023 23:38:58 +0200 Subject: [PATCH 02/80] v2 --- .github/workflows/updater.sh | 101 ------ .github/workflows/updater.yml | 49 --- check_process | 26 -- conf/extra_php-fpm.conf | 4 + conf/php-fpm.conf | 430 -------------------------- doc/{DISCLAIMER.md => ADMIN.md} | 0 doc/{DISCLAIMER_fr.md => ADMIN_fr.md} | 0 manifest.json | 54 ---- manifest.toml | 23 +- scripts/_common.sh | 7 - scripts/backup | 18 -- scripts/change_url | 91 +----- scripts/install | 77 ----- scripts/remove | 38 --- scripts/restore | 47 --- scripts/upgrade | 79 +---- tests.toml | 9 + 17 files changed, 36 insertions(+), 1017 deletions(-) delete mode 100644 .github/workflows/updater.sh delete mode 100644 .github/workflows/updater.yml delete mode 100644 check_process create mode 100644 conf/extra_php-fpm.conf delete mode 100644 conf/php-fpm.conf rename doc/{DISCLAIMER.md => ADMIN.md} (100%) rename doc/{DISCLAIMER_fr.md => ADMIN_fr.md} (100%) delete mode 100644 manifest.json create mode 100644 tests.toml diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh deleted file mode 100644 index 0389773..0000000 --- a/.github/workflows/updater.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash - -#================================================= -# PACKAGE UPDATING HELPER -#================================================= - -# This script is meant to be run by GitHub Actions -# The YunoHost-Apps organisation offers a template Action to run this script periodically -# Since each app is different, maintainers can adapt its contents so as to perform -# automatic actions when a new upstream release is detected. - -#================================================= -# FETCHING LATEST RELEASE AND ITS ASSETS -#================================================= - -# Fetching information -current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') -# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) -file=$(curl --silent "https://fossil.kd2.org/paheko/juvlist" | jq -r '.[] | select( .name | contains("paheko") and contains(".tar.gz") ) | select( .name | contains(".deb") or contains(".asc") or contains("beta") or contains("alpha") | not ) | .name' | sort -V | tail -1) -assets="https://fossil.kd2.org/paheko/uv/$file" - -version=$(echo ${file/.tar.gz} | cut -d "-" -f2) - -# Setting up the environment variables -echo "Current version: $current_version" -echo "Latest release from upstream: $version" -echo "VERSION=$version" >> $GITHUB_ENV -echo "REPO=$repo" >> $GITHUB_ENV -# For the time being, let's assume the script will fail -echo "PROCEED=false" >> $GITHUB_ENV - -# Proceed only if the retrieved version is greater than the current one -if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then - echo "::warning ::No new version available" - exit 0 -# Proceed only if a PR for this new version does not already exist -elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then - echo "::warning ::A branch already exists for this update" - exit 0 -fi - -#================================================= -# UPDATE SOURCE FILES -#================================================= - -# Let's download source tarball -asset_url=$assets - -echo "Handling asset at $asset_url" - -src="app" - -# Create the temporary directory -tempdir="$(mktemp -d)" - -# Download sources and calculate checksum -filename=${asset_url##*/} -curl --silent -4 -L $asset_url -o "$tempdir/$filename" -checksum=$(sha256sum "$tempdir/$filename" | head -c 64) - -# Delete temporary directory -rm -rf $tempdir - -# Get extension -if [[ $filename == *.tar.gz ]]; then - extension=tar.gz -else - extension=${filename##*.} -fi - -# Rewrite source file -cat < conf/$src.src -SOURCE_URL=$asset_url -SOURCE_SUM=$checksum -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=$extension -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -SOURCE_EXTRACT=true -EOT -echo "... conf/$src.src updated" - -#================================================= -# SPECIFIC UPDATE STEPS -#================================================= - -# Any action on the app's source code can be done. -# The GitHub Action workflow takes care of committing all changes after this script ends. - -#================================================= -# GENERIC FINALIZATION -#================================================= - -# Replace new version in manifest -echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json - -# No need to update the README, yunohost-bot takes care of it - -# The Action will proceed only if the PROCEED environment variable is set to true -echo "PROCEED=true" >> $GITHUB_ENV -exit 0 diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml deleted file mode 100644 index a56d7cb..0000000 --- a/.github/workflows/updater.yml +++ /dev/null @@ -1,49 +0,0 @@ -# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected. -# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization. -# This file should be enough by itself, but feel free to tune it to your needs. -# It calls updater.sh, which is where you should put the app-specific update steps. -name: Check for new upstream releases -on: - # Allow to manually trigger the workflow - workflow_dispatch: - # Run it every day at 6:00 UTC - schedule: - - cron: '0 6 * * *' -jobs: - updater: - runs-on: ubuntu-latest - steps: - - name: Fetch the source code - uses: actions/checkout@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - name: Run the updater script - id: run_updater - run: | - # Setting up Git user - git config --global user.name 'yunohost-bot' - git config --global user.email 'yunohost-bot@users.noreply.github.com' - # Run the updater script - /bin/bash .github/workflows/updater.sh - - name: Commit changes - id: commit - if: ${{ env.PROCEED == 'true' }} - run: | - git commit -am "Upgrade to v$VERSION" - - name: Create Pull Request - id: cpr - if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: Update to version ${{ env.VERSION }} - committer: 'yunohost-bot ' - author: 'yunohost-bot ' - signoff: false - base: testing - branch: ci-auto-update-v${{ env.VERSION }} - delete-branch: true - title: 'Upgrade to version ${{ env.VERSION }}' - body: | - Upgrade to v${{ env.VERSION }} - draft: false diff --git a/check_process b/check_process deleted file mode 100644 index c93e9ad..0000000 --- a/check_process +++ /dev/null @@ -1,26 +0,0 @@ -; Test complet - ; Manifest - domain="domain.tld" - path="/path" - is_public=1 - ; Checks - pkg_linter=1 - setup_sub_dir=1 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - upgrade=1 from_commit=6e100378cfac2b3b13d83bd8d7d6d402e36b8bcb - backup_restore=1 - multi_instance=1 - change_url=1 -;;; Options -Email= -Notification=none -;;; Upgrade options - ; commit=7205455e0a806a49c48c6d2f005d80d1b74a3355 - name=Previous version - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& - - diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf new file mode 100644 index 0000000..c27cac6 --- /dev/null +++ b/conf/extra_php-fpm.conf @@ -0,0 +1,4 @@ +; Additional php.ini defines, specific to this pool of workers. + +php_admin_value[upload_max_filesize] = 2M +php_admin_value[post_max_size] = 2M diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf deleted file mode 100644 index 02336ca..0000000 --- a/conf/php-fpm.conf +++ /dev/null @@ -1,430 +0,0 @@ -; Start a new pool named 'www'. -; the variable $pool can be used in any directive and will be replaced by the -; pool name ('www' here) -[__NAMETOCHANGE__] - -; Per pool prefix -; It only applies on the following directives: -; - 'access.log' -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = __USER__ -group = __USER__ - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /var/run/php/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock - -; Set listen(2) backlog. -; Default Value: 511 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 511 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. -; Default Values: user and group are set as the running user -; mode is set to 0660 -listen.owner = www-data -listen.group = www-data -;listen.mode = 0660 -; When POSIX Access Control Lists are supported you can set them using -; these options, value is a comma separated list of user/group names. -; When set, listen.owner and listen.group are ignored -;listen.acl_users = -;listen.acl_groups = - -; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user -; or group is differrent than the master process user. It allows to create process -; core dump and ptrace the process for the pool user. -; Default Value: no -; process.dumpable = yes - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 5 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -pm.start_servers = 2 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 3 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following informations: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php/7.0/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{miliseconds}d -; - %{mili}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some exemples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: output header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -slowlog = /var/log/nginx/__NAMETOCHANGE__.slow.log - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -request_slowlog_timeout = 5s - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -request_terminate_timeout = 1d - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -chdir = __INSTALL_DIR__ - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - -; Clear environment in FPM workers -; Prevents arbitrary environment variables from reaching FPM worker processes -; by clearing the environment in workers before env vars specified in this -; pool configuration are added. -; Setting to "no" will make all environment variables available to PHP code -; via getenv(), $_ENV and $_SERVER. -; Default Value: yes -;clear_env = no - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; execute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 .php7 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;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_flag[mail.add_x_header] = Off - -; Other common parameters -; php_admin_value[max_execution_time] = 600 -; php_admin_value[max_input_time] = 300 -; php_admin_value[memory_limit] = 256M -; php_admin_flag[short_open_tag] = On diff --git a/doc/DISCLAIMER.md b/doc/ADMIN.md similarity index 100% rename from doc/DISCLAIMER.md rename to doc/ADMIN.md diff --git a/doc/DISCLAIMER_fr.md b/doc/ADMIN_fr.md similarity index 100% rename from doc/DISCLAIMER_fr.md rename to doc/ADMIN_fr.md diff --git a/manifest.json b/manifest.json deleted file mode 100644 index 1bc9cf0..0000000 --- a/manifest.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "name": "Paheko", - "id": "paheko", - "packaging_format": 1, - "description": { - "en": "Software to manage association", - "fr": "Logiciel libre de gestion d'association" - }, - "version": "1.2.8~ynh1", - "url": "https://paheko.cloud", - "upstream": { - "license": "GPL-3.0-or-later", - "website": "https://paheko.cloud", - "demo": "https://paheko.cloud/essai/", - "admindoc": "https://fossil.kd2.org/paheko/wiki?name=Documentation", - "code": "https://fossil.kd2.org/paheko/dir?ci=tip" - }, - "license": "GPL-3.0-or-later", - "maintainer": { - "name": "rodinux", - "email": "rodnux07@rodinux.fr" - }, - "requirements": { - "yunohost": ">= 11.0.9" - }, - "multi_instance": true, - "services": [ - "nginx", - "php8.0-fpm" - ], - "arguments": { - "install": [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "path", - "type": "path", - "example": "/paheko", - "default": "/paheko" - }, - { - "name": "is_public", - "type": "boolean", - "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/manifest.toml b/manifest.toml index 6dd1c5f..d27ed91 100644 --- a/manifest.toml +++ b/manifest.toml @@ -15,26 +15,22 @@ website = "https://paheko.cloud" demo = "https://paheko.cloud/essai/" admindoc = "https://fossil.kd2.org/paheko/wiki?name=Documentation" code = "https://fossil.kd2.org/paheko/dir?ci=tip" -cpe = "???" # FIXME: optional but recommended if relevant, this is meant to contain the Common Platform Enumeration, which is sort of a standard id for applications defined by the NIST. In particular, Yunohost may use this is in the future to easily track CVE (=security reports) related to apps. The CPE may be obtained by searching here: https://nvd.nist.gov/products/cpe/search. For example, for Nextcloud, the CPE is 'cpe:2.3:a:nextcloud:nextcloud' (no need to include the version number) -fund = "???" # FIXME: optional but recommended (or remove if irrelevant / not applicable). This is meant to be an URL where people can financially support this app, especially when its development is based on volunteers and/or financed by its community. YunoHost may later advertise it in the webadmin. [integration] -yunohost = ">= 11.0.9" -architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"] +yunohost = ">= 11.1.17" +architectures = "all" multi_instance = true -ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials. -sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. -disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ... -ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... -ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... +ldap = false +sso = false +disk = "50M" +ram.build = "50M" +ram.runtime = "50M" [install] [install.domain] - # this is a generic question - ask strings are automatically handled by Yunohost's core type = "domain" [install.path] - # this is a generic question - ask strings are automatically handled by Yunohost's core type = "path" default = "/paheko" @@ -48,7 +44,7 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen [resources.sources.main] url = "https://fossil.kd2.org/paheko/uv/paheko-1.2.8.tar.gz" sha256 = "d1946fca1a56b03fc59f577fe750aca2e94251a10440eea354b523d553ddd3fa" - + autoupdate.strategy = "latest_github_tag" [resources.system_user] @@ -56,3 +52,6 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen [resources.permissions] main.url = "/" + + [resources.apt] + packages = "php8.0-sqlite3 php8.0-gd php8.0-intl php8.0-cli php8.0-gnupg" diff --git a/scripts/_common.sh b/scripts/_common.sh index 9a46b44..1e47ce7 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,13 +6,6 @@ # PHP APP SPECIFIC #================================================= -#REMOVEME? YNH_PHP_VERSION="8.0" - -#REMOVEME? php_dependencies="php${YNH_PHP_VERSION} php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-gnupg" - -# dependencies used by the app (must be on a single line) -#REMOVEME? pkg_dependencies="$php_dependencies" - #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/backup b/scripts/backup index 9a44356..18f83fe 100644 --- a/scripts/backup +++ b/scripts/backup @@ -10,24 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_print_info --message="Loading installation settings..." - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - #================================================= # DECLARE DATA AND CONF FILES TO BACKUP #================================================= diff --git a/scripts/change_url b/scripts/change_url index d3d5897..f0a6298 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,62 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -#REMOVEME? old_domain=$YNH_APP_OLD_DOMAIN -#REMOVEME? old_path=$YNH_APP_OLD_PATH - -#REMOVEME? new_domain=$YNH_APP_NEW_DOMAIN -#REMOVEME? new_path=$YNH_APP_NEW_PATH - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 - -#REMOVEME? # Needed for helper "ynh_add_nginx_config" -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) - -# Add settings here as needed by your application -#REMOVEME? secret_key=$(ynh_app_setting_get --app=$app --key=secret_key) - -#================================================= -# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP -#================================================= -#REMOVEME? ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 - -# Backup the current version of the app -#REMOVEME? ynh_backup_before_upgrade -#REMOVEME? ynh_clean_setup () { - # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. -#REMOVEME? ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" - - # Restore it if the upgrade fails -#REMOVEME? ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - -#================================================= -# CHECK WHICH PARTS SHOULD BE CHANGED -#================================================= - -#REMOVEME? change_domain=0 -#REMOVEME? if [ "$old_domain" != "$new_domain" ] -then - #REMOVEME? change_domain=1 -fi - -#REMOVEME? change_path=0 -#REMOVEME? if [ "$old_path" != "$new_path" ] -then - #REMOVEME? change_path=1 -fi - #================================================= # STANDARD MODIFICATIONS #================================================= @@ -74,50 +18,17 @@ ynh_script_progression --message="Updating NGINX web server configuration..." -- ynh_change_url_nginx_config -#REMOVEME? nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf - -# 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 -#REMOVEME? ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for NGINX helper -#REMOVEME? domain="$old_domain" -#REMOVEME? path="$new_path" - # Create a dedicated NGINX config -#REMOVEME? ynh_add_nginx_config -fi - -# Change the domain for NGINX -if [ $change_domain -eq 1 ] -then - # Delete file checksum for the old conf file location -#REMOVEME? ynh_delete_file_checksum --file="$nginx_conf_path" -#REMOVEME? mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf - # Store file checksum for the new config file location -#REMOVEME? ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" -fi - #================================================= # SPECIFIC MODIFICATIONS #================================================= # UPDATE A CONFIG FILE #================================================= ynh_script_progression --message="Updating a configuration file..." --weight=1 -#REMOVEME? + domain=$new_domain path=$new_path ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" -#================================================= -# GENERIC FINALISATION -#================================================= -# RELOAD NGINX -#================================================= -#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=2 - -#REMOVEME? #REMOVEME? ynh_systemd_action --service_name=nginx --action=reload - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/install b/scripts/install index c26308b..d76907c 100644 --- a/scripts/install +++ b/scripts/install @@ -9,69 +9,14 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - -#================================================= -# RETRIEVE ARGUMENTS FROM THE MANIFEST -#================================================= - -#REMOVEME? domain=$YNH_APP_ARG_DOMAIN -#REMOVEME? path=$YNH_APP_ARG_PATH -#REMOVEME? is_public=$YNH_APP_ARG_IS_PUBLIC - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#================================================= -# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS -#================================================= -#REMOVEME? ynh_script_progression --message="Validating installation parameters..." --weight=1 - -#REMOVEME? install_dir=/var/www/$app -#REMOVEME? test ! -e "$install_dir" || ynh_die --message="This path already contains a folder" - -# Register (book) web path -#REMOVEME? ynh_webpath_register --app=$app --domain=$domain --path=$path - -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= -#REMOVEME? ynh_script_progression --message="Storing installation settings..." --weight=1 - -#REMOVEME? ynh_app_setting_set --app=$app --key=domain --value=$domain -#REMOVEME? ynh_app_setting_set --app=$app --key=path --value=$path - -#================================================= -# STANDARD MODIFICATIONS -#================================================= -# INSTALL DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Installing dependencies..." --weight=1 - -#REMOVEME? ynh_install_app_dependencies $pkg_dependencies - -#================================================= -# CREATE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Configuring system user..." --weight=3 - -# Create a system user -#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." --weight=4 -#REMOVEME? ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -118,28 +63,6 @@ chmod 440 "$install_dir/config.local.php" chmod 440 "$install_dir/config.local.yunohost.php" chmod 660 "$install_dir/config.local.user.php" -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP SSOWAT -#================================================= -#REMOVEME? ynh_script_progression --message="Configuring permissions..." --weight=8 - -# Make app public if necessary -#REMOVEME? if [ $is_public -eq 1 ] -then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. -#REMOVEME? ynh_permission_update --permission="main" --add="visitors" -fi - -#================================================= -# RELOAD NGINX -#================================================= -#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/remove b/scripts/remove index 0aff02c..4993569 100644 --- a/scripts/remove +++ b/scripts/remove @@ -9,26 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=2 - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) - -#================================================= -# STANDARD REMOVE -#================================================= -# REMOVE APP MAIN DIR -#================================================= -#REMOVEME? ynh_script_progression --message="Removing app main directory..." --weight=3 - -# Remove the app directory securely -#REMOVEME? ynh_secure_remove --file="$install_dir" - #================================================= # REMOVE NGINX CONFIGURATION #================================================= @@ -45,24 +25,6 @@ ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=2 # Remove the dedicated PHP-FPM config ynh_remove_fpm_config -#================================================= -# REMOVE DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Removing dependencies..." --weight=1 - -# Remove metapackage and its dependencies -#REMOVEME? ynh_remove_app_dependencies - -#================================================= -# GENERIC FINALIZATION -#================================================= -# REMOVE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Removing the dedicated system user..." --weight=2 - -# Delete a system user -#REMOVEME? ynh_system_user_delete --username=$app - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 5b7c05a..c1ab315 100644 --- a/scripts/restore +++ b/scripts/restore @@ -10,43 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - -#================================================= -# CHECK IF THE APP CAN BE RESTORED -#================================================= -#REMOVEME? ynh_script_progression --message="Validating restoration parameters..." --weight=4 - -#REMOVEME? test ! -d $install_dir \ - || ynh_die --message="There is already a directory: $install_dir " - -#================================================= -# STANDARD RESTORATION STEPS -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Recreating the dedicated system user..." --weight=3 - -# Create the dedicated user (if not existing) -#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -65,16 +28,6 @@ chmod 440 "$install_dir/config.local.php" chmod 440 "$install_dir/config.local.yunohost.php" chmod 660 "$install_dir/config.local.user.php" -#================================================= -# SPECIFIC RESTORATION -#================================================= -# REINSTALL DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Reinstalling dependencies..." --weight=1 - -# Define and install dependencies -#REMOVEME? ynh_install_app_dependencies $pkg_dependencies - #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index b4a8a21..b113cf9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,48 +12,34 @@ source ./experimental_helper.sh source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=3 - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -#REMOVEME? secret_key=$(ynh_app_setting_get --app=$app --key=secret_key) - #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." --weight=1 upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -#REMOVEME? ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=30 +ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=30 # Backup the current version of the app -#REMOVEME? ynh_backup_before_upgrade -#REMOVEME? ynh_clean_setup_migration() { +ynh_backup_before_upgrade +ynh_clean_setup_migration() { yunohost app remove $app -#REMOVEME? app=garradin ynh_restore_upgradebackup + app=garradin ynh_restore_upgradebackup } -#REMOVEME? ynh_clean_setup () { +ynh_clean_setup () { # Restore it if the upgrade fails if [[ $migration_process -eq 1 ]]; then -#REMOVEME? ynh_clean_setup_migration + ynh_clean_setup_migration else -#REMOVEME? ynh_restore_upgradebackup + ynh_restore_upgradebackup fi } # Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors +ynh_abort_if_errors #================================================= # STANDARD UPGRADE STEPS @@ -62,26 +48,12 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -# If install_dir doesn't exist, create it -if [ -z "$install_dir" ]; then -#REMOVEME? install_dir=/var/www/$app -#REMOVEME? ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir -fi - # If secret_key doesn't exist, create it if [[ -z "$secret_key" ]]; then secret_key=$(ynh_string_random --length=50) ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key fi - -# Cleaning legacy permissions -#REMOVEME? if ynh_legacy_permissions_exists; then -#REMOVEME? ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public -fi - #================================================= # MIGRATION FROM Garradin #================================================= @@ -93,23 +65,11 @@ fi ynh_handle_app_migration --migration_id=garradin --migration_list=garradin_migrations if [[ $migration_process -eq 1 ]]; then -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? ynh_permission_update --permission="main" --add="all_users" -#REMOVEME? ynh_permission_update --permission="main" --add="visitors" + install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) + ynh_permission_update --permission="main" --add="all_users" + ynh_permission_update --permission="main" --add="visitors" fi -#================================================= -# STANDARD UPGRADE STEPS -#================================================= - -#================================================= -# CREATE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 - -# Create a dedicated user (if not existing) -#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -122,17 +82,9 @@ then ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite squelettes/ data/ skel-dist/ config.local.user.php" fi -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Upgrading dependencies..." --weight=1 - -#REMOVEME? ynh_install_app_dependencies $pkg_dependencies - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -184,15 +136,6 @@ ynh_local_curl "/admin/index.php" sleep 5 ynh_local_curl "/index.php" -#================================================= -# GENERIC FINALIZATION -#================================================= -# RELOAD NGINX -#================================================= -#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload - #================================================= # FINISH MIGRATION PROCESS #================================================= diff --git a/tests.toml b/tests.toml new file mode 100644 index 0000000..a76e789 --- /dev/null +++ b/tests.toml @@ -0,0 +1,9 @@ +test_format = 1.0 + +[default] + + # ------------------------------- + # Commits to test upgrade from + # ------------------------------- + + test_upgrade_from.534bb03f927c5301e69bc0339a7441142a75b485.name = "Upgrade from 1.2.8" From 45a8de5bd1fc5f4787278009c90506b90d648670 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 9 Apr 2023 21:39:02 +0000 Subject: [PATCH 03/80] Auto-update README --- README.md | 14 -------------- README_fr.md | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/README.md b/README.md index e20e2b7..e15d236 100644 --- a/README.md +++ b/README.md @@ -42,20 +42,6 @@ You can now upgrade Garradin with Paheko ! ![Screenshot of Paheko](./doc/screenshots/screenshot.png) -## Disclaimers / important information - -### Migrate from Garradin - -This package handle the migration from Garradin to Paheko. For that, you will have to upgrade your Garradin application with this repository. This can only be done from the command-line interface - e.g. through SSH. Once you're connected, you simply have to execute the following: - -```bash -sudo yunohost app upgrade garradin -u https://github.com/YunoHost-Apps/paheko_ynh --debug -``` - -The --debug option will let you see the full output. If you encounter any issue, please report it aand paste the logs. - -**Important**: After the migration, you'll have to wait a couple of minutes (at most 3 minutes) before you can start using Paheko. - ## Documentation and resources * Official app website: diff --git a/README_fr.md b/README_fr.md index 74efcb1..ad33004 100644 --- a/README_fr.md +++ b/README_fr.md @@ -38,20 +38,6 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie ![Capture d’écran de Paheko](./doc/screenshots/screenshot.png) -## Avertissements / informations importantes - -### Migrer depuis Garradin - -Ce paquet supporte la migration de Garradin vers Paheko. Pour ce faire, vous allez devoir mettre à jour l'application Garradin à l'aide de ce dépôt. Cette opération ne peut se faire seulement depuis une interface en ligne de commande, autrement dit en SSH. Une fois connecté/e, vous devez simplement lancer la commande suivante : - -```bash -sudo yunohost app upgrade garradin -u https://github.com/YunoHost-Apps/paheko_ynh --debug -``` - -L'option debug vous permet de voir l'entièreté du journal d'installation. Si vous rencontrez des difficultés, merci de créer un ticket en collant le journal d'erreur. - -**Important** : Après la migration, veuillez attendre quelques instants (maximum 3 minutes) avant de commencer à utiliser Paheko. - ## Documentations et ressources * Site officiel de l’app : From 38ef8d1ed6e2623906dcbc2cef491a0a7bba4abe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 9 Apr 2023 23:48:08 +0200 Subject: [PATCH 04/80] fix --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index d76907c..ffb5051 100644 --- a/scripts/install +++ b/scripts/install @@ -26,7 +26,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Configuring PHP-FPM..." --weight=5 # Create a dedicated PHP-FPM config -ynh_add_fpm_config +ynh_add_fpm_config --usage=low --footprint=low #================================================= # NGINX CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index b113cf9..376ae36 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -91,7 +91,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config +ynh_add_fpm_config --usage=low --footprint=low #================================================= # NGINX CONFIGURATION From 66cf96a8e11836b00f65af3adf5d23370511d86c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 9 Apr 2023 23:48:48 +0200 Subject: [PATCH 05/80] Update upgrade --- scripts/upgrade | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 376ae36..c284bda 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,8 +38,6 @@ ynh_clean_setup () { ynh_restore_upgradebackup fi } -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors #================================================= # STANDARD UPGRADE STEPS From 95eb3d761fd83d66248ce917b54776b1b1cb7a6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 10 Apr 2023 11:15:23 +0200 Subject: [PATCH 06/80] fix --- scripts/experimental_helper.sh | 4 ++-- scripts/upgrade | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/experimental_helper.sh b/scripts/experimental_helper.sh index 9f4b973..1c4d621 100644 --- a/scripts/experimental_helper.sh +++ b/scripts/experimental_helper.sh @@ -68,7 +68,7 @@ ynh_handle_app_migration () { ynh_handle_getopts_args "$@" # Get the new app id in the manifest - local new_app_id=$(grep \"id\": ../manifest.json | cut -d\" -f4) + local new_app_id=$(grep \"id\": ../manifest.toml| cut -d\" -f4) if [ $old_app_number -eq 1 ]; then local new_app=$new_app_id else @@ -129,7 +129,7 @@ ynh_handle_app_migration () { local settings_dir="/etc/yunohost/apps" cp -a "$settings_dir/$old_app" "$settings_dir/$new_app" - cp -a ../{scripts,conf,manifest.json} "$settings_dir/$new_app" + cp -a ../{scripts,conf,manifest.json} "$settings_dir/$new_app/{scripts,conf,manifest.toml}" # Replace the old id by the new one ynh_replace_string --match_string="\(^id: .*\)$old_app" --replace_string="\1$new_app" --target_file="$settings_dir/$new_app/settings.yml" diff --git a/scripts/upgrade b/scripts/upgrade index c284bda..644825c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,7 +47,7 @@ ynh_clean_setup () { ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # If secret_key doesn't exist, create it -if [[ -z "$secret_key" ]]; then +if [[ -z "${secret_key:-}" ]]; then secret_key=$(ynh_string_random --length=50) ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key fi From 7d701f855f3199a077b8a0f5680c15840e6d0b23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 10 Apr 2023 11:51:41 +0200 Subject: [PATCH 07/80] Revert "fix" This reverts commit 95eb3d761fd83d66248ce917b54776b1b1cb7a6b. --- scripts/experimental_helper.sh | 4 ++-- scripts/upgrade | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/experimental_helper.sh b/scripts/experimental_helper.sh index 1c4d621..9f4b973 100644 --- a/scripts/experimental_helper.sh +++ b/scripts/experimental_helper.sh @@ -68,7 +68,7 @@ ynh_handle_app_migration () { ynh_handle_getopts_args "$@" # Get the new app id in the manifest - local new_app_id=$(grep \"id\": ../manifest.toml| cut -d\" -f4) + local new_app_id=$(grep \"id\": ../manifest.json | cut -d\" -f4) if [ $old_app_number -eq 1 ]; then local new_app=$new_app_id else @@ -129,7 +129,7 @@ ynh_handle_app_migration () { local settings_dir="/etc/yunohost/apps" cp -a "$settings_dir/$old_app" "$settings_dir/$new_app" - cp -a ../{scripts,conf,manifest.json} "$settings_dir/$new_app/{scripts,conf,manifest.toml}" + cp -a ../{scripts,conf,manifest.json} "$settings_dir/$new_app" # Replace the old id by the new one ynh_replace_string --match_string="\(^id: .*\)$old_app" --replace_string="\1$new_app" --target_file="$settings_dir/$new_app/settings.yml" diff --git a/scripts/upgrade b/scripts/upgrade index 644825c..c284bda 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,7 +47,7 @@ ynh_clean_setup () { ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # If secret_key doesn't exist, create it -if [[ -z "${secret_key:-}" ]]; then +if [[ -z "$secret_key" ]]; then secret_key=$(ynh_string_random --length=50) ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key fi From aeda71695cd4cbc6cba47dd441e29bcd8898f556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 10 Apr 2023 11:52:04 +0200 Subject: [PATCH 08/80] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index c284bda..644825c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,7 +47,7 @@ ynh_clean_setup () { ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # If secret_key doesn't exist, create it -if [[ -z "$secret_key" ]]; then +if [[ -z "${secret_key:-}" ]]; then secret_key=$(ynh_string_random --length=50) ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key fi From d9bedee29b395f6f19486146c96d115d6e701bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 19 Apr 2023 15:48:10 +0200 Subject: [PATCH 09/80] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index d27ed91..6e2de11 100644 --- a/manifest.toml +++ b/manifest.toml @@ -54,4 +54,4 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php8.0-sqlite3 php8.0-gd php8.0-intl php8.0-cli php8.0-gnupg" + packages = "php8.0-sqlite3 php8.0-gd php8.0-intl php8.0-cli php8.0-gnupg" From c8b5f4a19af86888891ac9af15200be34d5a240c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 19 Apr 2023 16:08:56 +0200 Subject: [PATCH 10/80] cleaning --- manifest.toml | 4 ++-- scripts/install | 6 +++--- scripts/upgrade | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest.toml b/manifest.toml index 6e2de11..a30b1a0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -35,8 +35,8 @@ ram.runtime = "50M" default = "/paheko" [install.init_main_permission] - help.en = "The SSO is not implemented for this app and yunohost is not sure for hundred of users..." - help.fr = "Le SSO n'est pas implémenté pour cette application et yunohost n'est pas sûr pour une centaine d'utilisateurs..." + help.en = "The SSO is not implemented for this app and YunoHost is not sure for hundred of users..." + help.fr = "Le SSO n'est pas implémenté pour cette application et YunoHost n'est pas sûr pour une centaine d'utilisateurs..." type = "group" default = "visitors" diff --git a/scripts/install b/scripts/install index ffb5051..7b93a0e 100644 --- a/scripts/install +++ b/scripts/install @@ -48,9 +48,9 @@ secret_key=$(ynh_string_random --length=50) ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key # Install configuration files -ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" -ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" -ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" +ynh_add_config --template="../conf/config.local.php" --destination="$install_dir/config.local.php" +ynh_add_config --template="../conf/config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" +ynh_add_config --template="../conf/config.local.user.php" --destination="$install_dir/config.local.user.php" # Permissions on files and directories chmod -R o-rwx "$install_dir" diff --git a/scripts/upgrade b/scripts/upgrade index 644825c..dd02cfd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -107,11 +107,11 @@ ynh_add_nginx_config ynh_script_progression --message="Updating a configuration file..." --weight=5 if ynh_compare_current_package_version --comparison lt --version 1.1.15~ynh1; then - ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" + ynh_add_config --template="../cong/config.local.user.php" --destination="$install_dir/config.local.user.php" fi -ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" -ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" +ynh_add_config --template="../cong/config.local.php" --destination="$install_dir/config.local.php" +ynh_add_config --template="../cong/config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" # NOTE: Don't overwrite config.local.user.php # Permissions on files and directories From 57e0293ea20479c2b1ca7eb66fc7aa388e39a636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 19 Apr 2023 19:08:22 +0200 Subject: [PATCH 11/80] without migration --- conf/garradin_migrations | 7 - conf/garradin_post_migration.sh | 46 ------ doc/DESCRIPTION.md | 2 - scripts/experimental_helper.sh | 265 -------------------------------- scripts/upgrade | 59 ------- 5 files changed, 379 deletions(-) delete mode 100644 conf/garradin_migrations delete mode 100644 conf/garradin_post_migration.sh delete mode 100644 scripts/experimental_helper.sh diff --git a/conf/garradin_migrations b/conf/garradin_migrations deleted file mode 100644 index 96f1226..0000000 --- a/conf/garradin_migrations +++ /dev/null @@ -1,7 +0,0 @@ -# App main directory -/var/www/$app - -# NGINX web server configuration -/etc/nginx/conf.d/$domain.d/$app.conf - -/etc/php/8.0/fpm/pool.d/$app.conf diff --git a/conf/garradin_post_migration.sh b/conf/garradin_post_migration.sh deleted file mode 100644 index a0395c2..0000000 --- a/conf/garradin_post_migration.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# Ending the migration process from Gogs to Gitea - -set -u - -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - -source /usr/share/yunohost/helpers - -#================================================= -# SET VARIABLES -#================================================= - -old_app="__OLD_APP__" -new_app="__NEW_APP__" -script_name="$0" - -#================================================= -# DELETE OLD APP'S SESSIONS -#================================================= - -[ -n "$old_app" ] && find /var/lib/php/sessions/ -user "$old_app" -delete - -#================================================= -# DELETE OLD APP'S SETTINGS -#================================================= - -# `app=""` Circumvents this issue: https://github.com/YunoHost/issues/issues/2138 -app="" ynh_secure_remove --file="/etc/yunohost/apps/$old_app" - -yunohost app ssowatconf - - -#================================================= -# REMOVE THE OLD USER -#================================================= -ynh_user_exists --username=$old_app && ynh_system_user_delete $old_app - -#================================================= -# DELETE THIS SCRIPT -#================================================= - -echo "rm $script_name" | at now + 1 minutes diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 19241bf..a06dc9c 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,5 +1,3 @@ -## Paheko - Paheko (we chose the name Paheko, a word from the Māori language meaning "to cooperate", illustrating the purpose of the software: to improve together the daily management of an association) 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. . diff --git a/scripts/experimental_helper.sh b/scripts/experimental_helper.sh deleted file mode 100644 index 9f4b973..0000000 --- a/scripts/experimental_helper.sh +++ /dev/null @@ -1,265 +0,0 @@ -#!/bin/bash - -# Need also the helper https://github.com/YunoHost-Apps/Experimental_helpers/blob/master/ynh_handle_getopts_args/ynh_handle_getopts_args - -# Make the main steps to migrate an app to its fork. -# -# This helper has to be used for an app which needs to migrate to a new name or a new fork -# (like owncloud to nextcloud or zerobin to privatebin). -# -# This helper will move the files of an app to its new name -# or recreate the things it can't move. -# -# To specify which files it has to move, you have to create a "migration file", stored in ../conf -# This file is a simple list of each file it has to move, -# except that file names must reference the $app variable instead of the real name of the app, -# and every instance-specific variables (like $domain). -# $app is especially important because it's this variable which will be used to identify the old place and the new one for each file. -# -# If a database exists for this app, it will be dumped and then imported in a newly created database, with a new name and new user. -# Don't forget you have to then apply these changes to application-specific settings (depends on the packaged application) -# -# Same things for an existing user, a new one will be created. -# But the old one can't be removed unless it's not used. See below. -# -# If you have some dependencies for your app, it's possible to change the fake debian package which manages them. -# You have to fill the $pkg_dependencies variable, and then a new fake package will be created and installed, -# and the old one will be removed. -# If you don't have a $pkg_dependencies variable, the helper can't know what the app dependencies are. -# -# The app settings.yml will be modified as follows: -# - finalpath will be changed according to the new name (but only if the existing $final_path contains the old app name) -# - The checksums of php-fpm and nginx config files will be updated too. -# - If there is a $db_name value, it will be changed. -# - And, of course, the ID will be changed to the new name too. -# -# Finally, the $app variable will take the value of the new name. -# The helper will set the $migration_process variable to 1 if a migration has been successfully handled. -# -# You have to handle by yourself all the migrations not done by this helper, like configuration or special values in settings.yml -# Also, at the end of the upgrade script, you have to add a post_migration script to handle all the things the helper can't do during YunoHost upgrade (mostly for permission reasons), -# especially remove the old user, move some hooks and remove the old configuration directory -# To launch this script, you have to move it elsewhere and start it after the upgrade script. -# `cp ../conf/$script_post_migration /tmp` -# `(cd /tmp; echo "/tmp/$script_post_migration" | at now + 2 minutes)` -# -# usage: ynh_handle_app_migration migration_id migration_list -# | arg: -i, --migration_id= - ID from which to migrate -# | arg: -l, --migration_list= - File specifying every file to move (one file per line) -ynh_handle_app_migration () { - # Need for end of install - ynh_package_install at - - #================================================= - # LOAD SETTINGS - #================================================= - - old_app=$YNH_APP_INSTANCE_NAME - local old_app_id=$YNH_APP_ID - local old_app_number=$YNH_APP_INSTANCE_NUMBER - - # Declare an array to define the options of this helper. - declare -Ar args_array=( [i]=migration_id= [l]=migration_list= ) - # Get the id from which to migrate - local migration_id - # And the file with the paths to move - local migration_list - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - - # Get the new app id in the manifest - local new_app_id=$(grep \"id\": ../manifest.json | cut -d\" -f4) - if [ $old_app_number -eq 1 ]; then - local new_app=$new_app_id - else - local new_app=${new_app_id}__${old_app_number} - fi - - #================================================= - # CHECK IF IT HAS TO MIGRATE - #================================================= - - migration_process=0 - - if [ "$old_app_id" == "$new_app_id" ] - then - # If the 2 id are the same - # No migration to do. - echo 0 - return 0 - else - if [ "$old_app_id" != "$migration_id" ] - then - # If the new app is not the authorized id, fail. - ynh_die --message="Incompatible application for migration from $old_app_id to $new_app_id" - fi - - ynh_print_info --message="Migrate from $old_app_id to $new_app_id" >&2 - - #================================================= - # CHECK IF THE MIGRATION CAN BE DONE - #================================================= - - # TODO Handle multi instance apps... - # Check that there is not already an app installed for this id. - (yunohost app list | grep -q -w "id: $new_app") \ - && ynh_die --message="$new_app is already installed" - - #================================================= - # CHECK THE LIST OF FILES TO MOVE - #================================================= - - local temp_migration_list="$(tempfile)" - - # Build the list by removing blank lines and comment lines - sed '/^#.*\|^$/d' "../conf/$migration_list" > "$temp_migration_list" - - # Check if there is no file in the destination - local file_to_move="" - while read file_to_move - do - # Replace all occurences of $app by $new_app in each file to move. - local move_to_destination="${file_to_move//\$app/$new_app}" - test -e "$move_to_destination" && ynh_die --message="A file named $move_to_destination already exists." - done < "$temp_migration_list" - - #================================================= - # COPY YUNOHOST SETTINGS FOR THIS APP - #================================================= - - local settings_dir="/etc/yunohost/apps" - cp -a "$settings_dir/$old_app" "$settings_dir/$new_app" - cp -a ../{scripts,conf,manifest.json} "$settings_dir/$new_app" - - # Replace the old id by the new one - ynh_replace_string --match_string="\(^id: .*\)$old_app" --replace_string="\1$new_app" --target_file="$settings_dir/$new_app/settings.yml" - # INFO: There a special behavior with yunohost app setting: - # if the id given in argument does not match with the id - # stored in the config file, the config file will be purged. - # That's why we use sed instead of app setting here. - # https://github.com/YunoHost/yunohost/blob/c6b5284be8da39cf2da4e1036a730eb5e0515096/src/yunohost/app.py#L1316-L1321 - - # Change the label if it's simply the name of the app - old_label=$(ynh_app_setting_get --app=$new_app --key=label) - if [ "${old_label,,}" == "$old_app_id" ] - then - # Build the new label from the id of the app. With the first character as upper case - new_label=$(echo $new_app_id | cut -c1 | tr [:lower:] [:upper:])$(echo $new_app_id | cut -c2-) - ynh_app_setting_set --app=$new_app --key=label --value=$new_label - fi - - permissions_name=$(yunohost user permission list $old_app --short --output-as plain) - for permission_name in $permissions_name - do - yunohost tools shell -c "from yunohost.permission import permission_delete; permission_delete('$permission_name', force=True, sync_perm=False)" - done - - yunohost tools shell -c "from yunohost.permission import permission_create; permission_create('$new_app.main', url='/' , show_tile=True , sync_perm=True)" - - #================================================= - # MOVE FILES TO THE NEW DESTINATION - #================================================= - - while read file_to_move - do - # Replace all occurence of $app by $new_app in each file to move. - move_to_destination="$(eval echo "${file_to_move//\$app/$new_app}")" - local real_file_to_move="$(eval echo "${file_to_move//\$app/$old_app}")" - ynh_print_info --message="Move file $real_file_to_move to $move_to_destination" >&2 - mv "$real_file_to_move" "$move_to_destination" - done < "$temp_migration_list" - - #================================================= - # UPDATE SETTINGS KNOWN ENTRIES - #================================================= - - # Replace nginx checksum - ynh_replace_string --match_string="\(^checksum__etc_nginx.*\)_$old_app" --replace_string="\1_$new_app" --target_file="$settings_dir/$new_app/settings.yml" - - # Replace php-fpm checksums - ynh_replace_string --match_string="\(^checksum__etc_php.*[-_]\)$old_app" --replace_string="\1$new_app" --target_file="$settings_dir/$new_app/settings.yml" - - # Replace final_path - ynh_replace_string --match_string="\(^final_path: .*\)$old_app" --replace_string="\1$new_app" --target_file="$settings_dir/$new_app/settings.yml" - - # Replace fail2ban_filter - ynh_replace_string --match_string="\(^checksum__etc_fail2ban_filter.*\)_$old_app" --replace_string="\1_$new_app" --target_file="$settings_dir/$new_app/settings.yml" - - # Replace fail2ban_jail - ynh_replace_string --match_string="\(^checksum__etc_fail2ban_jail.*\)_$old_app" --replace_string="\1_$new_app" --target_file="$settings_dir/$new_app/settings.yml" - - # Replace systemd - ynh_replace_string --match_string="\(^checksum__etc_systemd_system.*\)_$old_app" --replace_string="\1_$new_app" --target_file="$settings_dir/$new_app/settings.yml" - - #================================================= - # MOVE THE MYSQL DATABASE - #================================================= - - old_db_name=$(ynh_app_setting_get --app=$old_app --key=db_name) - - # Check if a database exists before trying to move it - if [ -n "$old_db_name" ] && mysqlshow | grep -q "^| $old_db_name" - then - old_db_user=$old_db_name - db_pwd=$(ynh_app_setting_get --app=$old_app --key=mysqlpwd) - - new_db_name=$(ynh_sanitize_dbid --db_name=$new_app) - new_db_user=$new_db_name - ynh_print_info --message="Rename the database $db_name to $new_db_name" >&2 - - local sql_dump="/tmp/${db_name}-$(date '+%s').sql" - - # Dump the old database - ynh_mysql_dump_db --database="$old_db_name" > "$sql_dump" - - # Create a new database - ynh_mysql_setup_db --db_user=$new_db_user --db_name=$new_db_name --db_pwd=$db_pwd - - # Then restore the old one into the new one - ynh_mysql_connect_as --user=$new_db_user --password=$db_pwd --database=$new_db_name < "$sql_dump" - - # Remove the old database - ynh_mysql_remove_db --db_user=$old_db_user --db_name=$old_db_name - - # And the dump - ynh_secure_remove --file="$sql_dump" - - # Update the value of $db_name - db_name=$new_db_name - db_user=$new_db_user - ynh_app_setting_set --app=$new_app --key=db_name --value=$db_name - fi - - #================================================= - # CHANGE THE FAKE DEPENDENCIES PACKAGE - #================================================= - - # Check if a variable $pkg_dependencies exists - # If this variable doesn't exist, this part shall be managed in the upgrade script. - if [ -n "${pkg_dependencies:-}" ] - then - # Define the name of the package - local old_package_name="${old_app//_/-}-ynh-deps" - local new_package_name="${new_app//_/-}-ynh-deps" - - if ynh_package_is_installed --package="$old_package_name" - then - # Install a new fake package - app=$new_app - ynh_install_app_dependencies $pkg_dependencies - # Then remove the old one - app=$old_app - ynh_remove_app_dependencies - fi - fi - - #================================================= - # UPDATE THE ID OF THE APP - #================================================= - - app=$new_app - - # Set migration_process to 1 to inform that an upgrade has been made - migration_process=1 - fi -} diff --git a/scripts/upgrade b/scripts/upgrade index dd02cfd..9a0f9f3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -7,8 +7,6 @@ #================================================= # Load common variables and helpers -source ./experimental_helper.sh - source _common.sh source /usr/share/yunohost/helpers @@ -18,27 +16,6 @@ source /usr/share/yunohost/helpers upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=30 - -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup_migration() { - yunohost app remove $app - app=garradin ynh_restore_upgradebackup -} - -ynh_clean_setup () { - # Restore it if the upgrade fails - if [[ $migration_process -eq 1 ]]; then - ynh_clean_setup_migration - else - ynh_restore_upgradebackup - fi -} - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -52,22 +29,6 @@ if [[ -z "${secret_key:-}" ]]; then ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key fi -#================================================= -# MIGRATION FROM Garradin -#================================================= - -[[ $YNH_APP_ID == "garradin" ]] \ - && [[ "$(cat "$install_dir/VERSION")" != 1.2.4 ]] \ - && ynh_die --message "It looks like that you have an old Garradin installed. You need to first upgrade your Garradin instance (id: $garradin_migrate_id) and after to migrate to Paheko." - -ynh_handle_app_migration --migration_id=garradin --migration_list=garradin_migrations - -if [[ $migration_process -eq 1 ]]; then - install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) - ynh_permission_update --permission="main" --add="all_users" - ynh_permission_update --permission="main" --add="visitors" -fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -134,26 +95,6 @@ ynh_local_curl "/admin/index.php" sleep 5 ynh_local_curl "/index.php" -#================================================= -# FINISH MIGRATION PROCESS -#================================================= - -if [[ $migration_process -eq 1 ]]; then - echo "Garradin has been successfully migrated to Paheko! \ - A last scheduled operation will run in a couple of minutes to finish the \ - migration in YunoHost side. Do not proceed any application operation while \ - you don't see Garradin as installed." >&2 - - # Execute a post migration script after the end of this upgrade. - # Mainly for some cleaning - script_post_migration=garradin_post_migration.sh - ynh_replace_string --match_string __OLD_APP__ --replace_string "$old_app" --target_file ../conf/$script_post_migration - ynh_replace_string --match_string __NEW_APP__ --replace_string "$app" --target_file ../conf/$script_post_migration - cp ../conf/$script_post_migration /tmp - chmod +x /tmp/$script_post_migration - (cd /tmp; echo "/tmp/$script_post_migration > /tmp/$script_post_migration.log 2>&1" | at now + 2 minutes) -fi - #================================================= # END OF SCRIPT #================================================= From 4d0c0ffd3ab2a38ee88019b4c9588c57417c1e80 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 19 Apr 2023 17:08:27 +0000 Subject: [PATCH 12/80] Auto-update README --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index e15d236..72ede37 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,6 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -## Paheko - Paheko (we chose the name Paheko, a word from the Māori language meaning "to cooperate", illustrating the purpose of the software: to improve together the daily management of an association) 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. . From 8cc62c8e1f9f5a55ad0a0c1849e4e9df8725aa06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 19 Apr 2023 20:41:02 +0200 Subject: [PATCH 13/80] cleaning --- scripts/install | 6 +++--- scripts/upgrade | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 7b93a0e..ffb5051 100644 --- a/scripts/install +++ b/scripts/install @@ -48,9 +48,9 @@ secret_key=$(ynh_string_random --length=50) ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key # Install configuration files -ynh_add_config --template="../conf/config.local.php" --destination="$install_dir/config.local.php" -ynh_add_config --template="../conf/config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" -ynh_add_config --template="../conf/config.local.user.php" --destination="$install_dir/config.local.user.php" +ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" +ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" +ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" # Permissions on files and directories chmod -R o-rwx "$install_dir" diff --git a/scripts/upgrade b/scripts/upgrade index 9a0f9f3..251e374 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -68,11 +68,11 @@ ynh_add_nginx_config ynh_script_progression --message="Updating a configuration file..." --weight=5 if ynh_compare_current_package_version --comparison lt --version 1.1.15~ynh1; then - ynh_add_config --template="../cong/config.local.user.php" --destination="$install_dir/config.local.user.php" + ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" fi -ynh_add_config --template="../cong/config.local.php" --destination="$install_dir/config.local.php" -ynh_add_config --template="../cong/config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" +ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" +ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" # NOTE: Don't overwrite config.local.user.php # Permissions on files and directories From 59c72dd89e75b3cdc3dc4cc04a8df4c4b31ea5f5 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sun, 28 May 2023 00:45:30 +0200 Subject: [PATCH 14/80] Update ADMIN.md Indication for migrate from garradin_yhn with branch migration-garradin --- doc/ADMIN.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index db374e4..7ade12e 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -3,9 +3,13 @@ This package handle the migration from Garradin to Paheko. For that, you will have to upgrade your Garradin application with this repository. This can only be done from the command-line interface - e.g. through SSH. Once you're connected, you simply have to execute the following: ```bash -sudo yunohost app upgrade garradin -u https://github.com/YunoHost-Apps/paheko_ynh --debug +sudo yunohost app upgrade garradin -u https://github.com/YunoHost-Apps/paheko_ynh/tree/garradin-migration --debug ``` The --debug option will let you see the full output. If you encounter any issue, please report it aand paste the logs. **Important**: After the migration, you'll have to wait a couple of minutes (at most 3 minutes) before you can start using Paheko. + +Once the migration is done, you should then upgrade to new release of Paheko. + + From 03b578b865acd89e87129d066f4a0e266e05f7bd Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sun, 28 May 2023 00:47:47 +0200 Subject: [PATCH 15/80] Update ADMIN_fr.md Indication pour migrer depuis garradin avec la branche garradin-migration. --- doc/ADMIN_fr.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index 5bf41c2..dee9f3e 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -3,9 +3,11 @@ Ce paquet supporte la migration de Garradin vers Paheko. Pour ce faire, vous allez devoir mettre à jour l'application Garradin à l'aide de ce dépôt. Cette opération ne peut se faire seulement depuis une interface en ligne de commande, autrement dit en SSH. Une fois connecté/e, vous devez simplement lancer la commande suivante : ```bash -sudo yunohost app upgrade garradin -u https://github.com/YunoHost-Apps/paheko_ynh --debug +sudo yunohost app upgrade garradin -u https://github.com/YunoHost-Apps/paheko_ynh/tree/garradin-migration --debug ``` L'option debug vous permet de voir l'entièreté du journal d'installation. Si vous rencontrez des difficultés, merci de créer un ticket en collant le journal d'erreur. **Important** : Après la migration, veuillez attendre quelques instants (maximum 3 minutes) avant de commencer à utiliser Paheko. + +Une fois la migration terminée, vous pourrez mettre à jour avec la dernière version stable de Paheko. From 0cf806c065f84ae882230a6ce63457b373563d7d Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sun, 28 May 2023 00:54:07 +0200 Subject: [PATCH 16/80] Update manifest.toml last release v1.2.9 --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index a30b1a0..460a331 100644 --- a/manifest.toml +++ b/manifest.toml @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://fossil.kd2.org/paheko/uv/paheko-1.2.8.tar.gz" - sha256 = "d1946fca1a56b03fc59f577fe750aca2e94251a10440eea354b523d553ddd3fa" + url = "https://fossil.kd2.org/paheko/uv/paheko-1.2.9.tar.gz" + sha256 = "e07b51f35fefbe63387dc3f00df107438f224216085f1689a1911afa40438939" autoupdate.strategy = "latest_github_tag" [resources.system_user] From e5ddc25379764bbd1e624eca4d8a6436a90dcf85 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sun, 28 May 2023 00:55:01 +0200 Subject: [PATCH 17/80] Update manifest.toml last release v1.2.9 --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 460a331..2204f4c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Paheko" description.en = "Software to manage association" description.fr = "Logiciel libre de gestion d'association" -version = "1.2.8~ynh1" +version = "1.2.9~ynh1" maintainers = ["rodinux"] From a8743ed07d7643c4d0caff3ff5f91ded129978d3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 27 May 2023 22:55:04 +0000 Subject: [PATCH 18/80] 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 72ede37..7c804ff 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ You can now upgrade Garradin with Paheko ! ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Shipped version:** 1.2.8~ynh1 +**Shipped version:** 1.2.9~ynh1 **Demo:** https://paheko.cloud/essai/ diff --git a/README_fr.md b/README_fr.md index ad33004..6649981 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Version incluse :** 1.2.8~ynh1 +**Version incluse :** 1.2.9~ynh1 **Démo :** https://paheko.cloud/essai/ From cf8c46d30a42199e5e50d22e19ebcd982f7952ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 19 Jul 2023 11:45:32 +0200 Subject: [PATCH 19/80] Update manifest.toml --- manifest.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 2204f4c..7158075 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Paheko" description.en = "Software to manage association" description.fr = "Logiciel libre de gestion d'association" -version = "1.2.9~ynh1" +version = "1.3.0~ynh1" maintainers = ["rodinux"] @@ -17,7 +17,7 @@ admindoc = "https://fossil.kd2.org/paheko/wiki?name=Documentation" code = "https://fossil.kd2.org/paheko/dir?ci=tip" [integration] -yunohost = ">= 11.1.17" +yunohost = ">= 11.1.21" architectures = "all" multi_instance = true ldap = false @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://fossil.kd2.org/paheko/uv/paheko-1.2.9.tar.gz" - sha256 = "e07b51f35fefbe63387dc3f00df107438f224216085f1689a1911afa40438939" + url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc1.tar.gz" + sha256 = "f321bb4e1d4bdf0b412e7fbb820b8e97ee9e672c5c75fb9f007d80638af65014" autoupdate.strategy = "latest_github_tag" [resources.system_user] @@ -54,4 +54,4 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php8.0-sqlite3 php8.0-gd php8.0-intl php8.0-cli php8.0-gnupg" + packages = "php8.2-sqlite3 php8.2-gd php8.2-intl php8.2-cli php8.2-gnupg" From cbaeb096f7a9fe90a52d54c9c7f9029666036d0c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 19 Jul 2023 09:45:38 +0000 Subject: [PATCH 20/80] 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 7c804ff..7b27352 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ You can now upgrade Garradin with Paheko ! ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Shipped version:** 1.2.9~ynh1 +**Shipped version:** 1.3.0~ynh1 **Demo:** https://paheko.cloud/essai/ diff --git a/README_fr.md b/README_fr.md index 6649981..b7338bf 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Version incluse :** 1.2.9~ynh1 +**Version incluse :** 1.3.0~ynh1 **Démo :** https://paheko.cloud/essai/ From 760445a5219d5bdaee77f8c8784c2cf70a781ef3 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Wed, 19 Jul 2023 13:56:08 +0200 Subject: [PATCH 21/80] Update manifest.toml php-mb-string module needed --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 7158075..aa904a9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -54,4 +54,4 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php8.2-sqlite3 php8.2-gd php8.2-intl php8.2-cli php8.2-gnupg" + packages = "php8.2-sqlite3 php8.2-gd php8.2-intl php8.2-cli php8.2-gnupg php8.2-mbstring" From 4020bf0ddd982ba02980aeb7e88b685b23526ad5 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 20 Jul 2023 23:50:32 +0200 Subject: [PATCH 22/80] Update manifest.toml test fix for plugins --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index aa904a9..55f90cf 100644 --- a/manifest.toml +++ b/manifest.toml @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc1.tar.gz" - sha256 = "f321bb4e1d4bdf0b412e7fbb820b8e97ee9e672c5c75fb9f007d80638af65014" + url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc2.tar.gz" + sha256 = "3b6b717442af5aaf96dbd1cf947886ed91c29be3df460408d4da6db7ae6e16cb" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 2b8dcd7cb917a99dca95802cc720549ed9f28b88 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 20 Jul 2023 23:51:15 +0200 Subject: [PATCH 23/80] Update manifest.toml new release --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 55f90cf..c64b8a6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Paheko" description.en = "Software to manage association" description.fr = "Logiciel libre de gestion d'association" -version = "1.3.0~ynh1" +version = "1.3.0~ynh2" maintainers = ["rodinux"] From 9ded78ac36965d10df6fe83b2810be517cec18c3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 20 Jul 2023 21:51:18 +0000 Subject: [PATCH 24/80] 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 7b27352..3ddd7be 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ You can now upgrade Garradin with Paheko ! ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Shipped version:** 1.3.0~ynh1 +**Shipped version:** 1.3.0~ynh2 **Demo:** https://paheko.cloud/essai/ diff --git a/README_fr.md b/README_fr.md index b7338bf..de8f4aa 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Version incluse :** 1.3.0~ynh1 +**Version incluse :** 1.3.0~ynh2 **Démo :** https://paheko.cloud/essai/ From 29ea48c2976f5a27389ac9a10313bd9b3d3dfa58 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Fri, 21 Jul 2023 20:42:13 +0200 Subject: [PATCH 25/80] Update ADMIN_fr.md add a how-to add custom parameters --- doc/ADMIN_fr.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index dee9f3e..fd15045 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -11,3 +11,7 @@ L'option debug vous permet de voir l'entièreté du journal d'installation. Si v **Important** : Après la migration, veuillez attendre quelques instants (maximum 3 minutes) avant de commencer à utiliser Paheko. Une fois la migration terminée, vous pourrez mettre à jour avec la dernière version stable de Paheko. + +### Configurations personnelles + +Vous pouvez si vous le souhaitez ajouter des configurations personnelles en éditant le fichier `/var/www/paheko/config.local.user.php`, pour voir les possibilités vous pouvez lire auparavant le fichier `/var/www/paheko/config.dist.php`. From 42cfd6b59beedf0c95f67ed7f2bf81e71364e4fb Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Fri, 21 Jul 2023 20:43:39 +0200 Subject: [PATCH 26/80] Update ADMIN.md add a how-to customize parameters --- doc/ADMIN.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 7ade12e..1fcf9fc 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -12,4 +12,6 @@ The --debug option will let you see the full output. If you encounter any issue, Once the migration is done, you should then upgrade to new release of Paheko. +If you wish, you can add personal costum configurations by editing the `/var/www/paheko/config.local.user.php` file. To see the possibilities, you can read the `/var/www/paheko/config.dist.php` file first. + From 47b866d4bee1b409bc26b2a3b4b2374824e5a8ea Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Wed, 26 Jul 2023 01:23:42 +0200 Subject: [PATCH 27/80] Update ADMIN_fr.md remove instructions about garradin-migration --- doc/ADMIN_fr.md | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index fd15045..91f7512 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -1,17 +1,4 @@ -### Migrer depuis Garradin +## Configurations personnelles -Ce paquet supporte la migration de Garradin vers Paheko. Pour ce faire, vous allez devoir mettre à jour l'application Garradin à l'aide de ce dépôt. Cette opération ne peut se faire seulement depuis une interface en ligne de commande, autrement dit en SSH. Une fois connecté/e, vous devez simplement lancer la commande suivante : - -```bash -sudo yunohost app upgrade garradin -u https://github.com/YunoHost-Apps/paheko_ynh/tree/garradin-migration --debug -``` - -L'option debug vous permet de voir l'entièreté du journal d'installation. Si vous rencontrez des difficultés, merci de créer un ticket en collant le journal d'erreur. - -**Important** : Après la migration, veuillez attendre quelques instants (maximum 3 minutes) avant de commencer à utiliser Paheko. - -Une fois la migration terminée, vous pourrez mettre à jour avec la dernière version stable de Paheko. - -### Configurations personnelles - -Vous pouvez si vous le souhaitez ajouter des configurations personnelles en éditant le fichier `/var/www/paheko/config.local.user.php`, pour voir les possibilités vous pouvez lire auparavant le fichier `/var/www/paheko/config.dist.php`. +Vous pouvez si vous le souhaitez ajouter des configurations personnelles en éditant le fichier `/var/www/paheko/config.local.user.php`. +Pour voir les possibilités vous pouvez lire auparavant le fichier `/var/www/paheko/config.dist.php`. From ccaf645f06fa054deea7c836793f637b84e58e98 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Wed, 26 Jul 2023 01:39:26 +0200 Subject: [PATCH 28/80] Update ADMIN.md remove the instructions to migrate from Garradin --- doc/ADMIN.md | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 1fcf9fc..52c2052 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1,16 +1,4 @@ -### Migrate from Garradin - -This package handle the migration from Garradin to Paheko. For that, you will have to upgrade your Garradin application with this repository. This can only be done from the command-line interface - e.g. through SSH. Once you're connected, you simply have to execute the following: - -```bash -sudo yunohost app upgrade garradin -u https://github.com/YunoHost-Apps/paheko_ynh/tree/garradin-migration --debug -``` - -The --debug option will let you see the full output. If you encounter any issue, please report it aand paste the logs. - -**Important**: After the migration, you'll have to wait a couple of minutes (at most 3 minutes) before you can start using Paheko. - -Once the migration is done, you should then upgrade to new release of Paheko. +## Custom configurations If you wish, you can add personal costum configurations by editing the `/var/www/paheko/config.local.user.php` file. To see the possibilities, you can read the `/var/www/paheko/config.dist.php` file first. From 95ff390fb44a2df74cfff29531ca47839f48ce42 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Wed, 26 Jul 2023 01:40:42 +0200 Subject: [PATCH 29/80] Update ADMIN.md syntax markdown --- doc/ADMIN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 52c2052..3d98559 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1,4 +1,4 @@ -## Custom configurations +## Custom configurations If you wish, you can add personal costum configurations by editing the `/var/www/paheko/config.local.user.php` file. To see the possibilities, you can read the `/var/www/paheko/config.dist.php` file first. From 1dff540988afdd735345cfc5901a45fd1e1592bb Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Wed, 26 Jul 2023 01:46:07 +0200 Subject: [PATCH 30/80] Update install assuming YunoHost 11.2, we can get rid of this --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index ffb5051..d76907c 100644 --- a/scripts/install +++ b/scripts/install @@ -26,7 +26,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Configuring PHP-FPM..." --weight=5 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config #================================================= # NGINX CONFIGURATION From f98f516615fed85334438c6dfabc575cd523977d Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Wed, 26 Jul 2023 01:47:32 +0200 Subject: [PATCH 31/80] Update upgrade assuming YunoHost 11.2, we can get rid of this --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 251e374..7ced1ef 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -50,7 +50,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config #================================================= # NGINX CONFIGURATION From 2f72817349a33887a29ec171a92d00e195aa48e7 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Wed, 26 Jul 2023 01:48:58 +0200 Subject: [PATCH 32/80] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index c64b8a6..309c25b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://fossil.kd2.org/paheko/wiki?name=Documentation" code = "https://fossil.kd2.org/paheko/dir?ci=tip" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = false From cc044982f19457795d0e0ba4e690f07ee64b9012 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 27 Jul 2023 17:58:53 +0200 Subject: [PATCH 33/80] Update manifest.toml relese rc3 --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 309c25b..11c2819 100644 --- a/manifest.toml +++ b/manifest.toml @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc2.tar.gz" - sha256 = "3b6b717442af5aaf96dbd1cf947886ed91c29be3df460408d4da6db7ae6e16cb" + url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc3.tar.gz" + sha256 = "d1f9587fa00cf0f7aec1ee9b8f7bcbaa4b8c1ac97e37de6da85ee3dfecbc6f39" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 40bd4ce3e9a6e74bf1859edfe22f97915263dc86 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 27 Jul 2023 18:18:45 +0200 Subject: [PATCH 34/80] Update upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 7ced1ef..8b88ebc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -76,6 +76,7 @@ ynh_add_config --template="config.local.yunohost.php" --destination="$install_di # NOTE: Don't overwrite config.local.user.php # Permissions on files and directories +chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" find "$install_dir" -type d -exec chmod 550 {} + From 6503fe20e4f7e440bc911cb560537eab0b90698a Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 27 Jul 2023 18:19:09 +0200 Subject: [PATCH 35/80] Update install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index d76907c..dbc4323 100644 --- a/scripts/install +++ b/scripts/install @@ -53,6 +53,7 @@ ynh_add_config --template="config.local.yunohost.php" --destination="$install_di ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" # Permissions on files and directories +chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" find "$install_dir" -type d -exec chmod 550 {} + From bb7098e137bc5d78eeaef973ead7973ce214478d Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 27 Jul 2023 18:26:32 +0200 Subject: [PATCH 36/80] Update config.local.user.php change namespace --- conf/config.local.user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.local.user.php b/conf/config.local.user.php index 04b8d27..62a146d 100644 --- a/conf/config.local.user.php +++ b/conf/config.local.user.php @@ -10,4 +10,4 @@ */ // Nécessaire pour situer les constantes dans le bon namespace -namespace Garradin; +namespace Paheko; From 99f24a2a3fa7bb77d20818d0c4240e55f4da2c59 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 27 Jul 2023 18:32:02 +0200 Subject: [PATCH 37/80] Update config.local.yunohost.php namepcace rename --- conf/config.local.yunohost.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.local.yunohost.php b/conf/config.local.yunohost.php index 4f97f31..8cbeb9f 100644 --- a/conf/config.local.yunohost.php +++ b/conf/config.local.yunohost.php @@ -10,7 +10,7 @@ */ // Nécessaire pour situer les constantes dans le bon namespace -namespace Garradin; +namespace Paheko; /** * Clé secrète, doit être unique à chaque instance de Garradin From 0351be419ae847de0b527dc62c91b444532ffe09 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 27 Jul 2023 18:35:09 +0200 Subject: [PATCH 38/80] Update install perhaps not needed --- scripts/install | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/install b/scripts/install index dbc4323..d76907c 100644 --- a/scripts/install +++ b/scripts/install @@ -53,7 +53,6 @@ ynh_add_config --template="config.local.yunohost.php" --destination="$install_di ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" # Permissions on files and directories -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" find "$install_dir" -type d -exec chmod 550 {} + From 73f1c2c3ae8df2b5564284c6f8d801a10d6c32aa Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 27 Jul 2023 18:35:38 +0200 Subject: [PATCH 39/80] Update upgrade perhaps not needed --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 8b88ebc..7ced1ef 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -76,7 +76,6 @@ ynh_add_config --template="config.local.yunohost.php" --destination="$install_di # NOTE: Don't overwrite config.local.user.php # Permissions on files and directories -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" find "$install_dir" -type d -exec chmod 550 {} + From eeb1f7db3ac865c734a59fc905e8a723eca96081 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 27 Jul 2023 20:03:06 +0200 Subject: [PATCH 40/80] Create 1.3.0.md display advertisement before upgrading 1.3.0 --- doc/PRE_UPGRADE.d/1.3.0.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/PRE_UPGRADE.d/1.3.0.md diff --git a/doc/PRE_UPGRADE.d/1.3.0.md b/doc/PRE_UPGRADE.d/1.3.0.md new file mode 100644 index 0000000..b8172b7 --- /dev/null +++ b/doc/PRE_UPGRADE.d/1.3.0.md @@ -0,0 +1,3 @@ +We should encourage people to have a look at the [Changelog](https://fossil.kd2.org/paheko/wiki?name=Changelog/1.3) when upgrading to this specific version because there are major changes. + +Take care, if you have installed some plugins, not all are compatibles. Perhaps you need remove them before this upgrade. From b874253298b16be8607aac26a0bec7a8ece4548f Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 27 Jul 2023 20:08:43 +0200 Subject: [PATCH 41/80] Create 1.3.0_fr.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit avertissement avant la mise à jour 1.3.0 --- doc/PRE_UPGRADE.d/1.3.0_fr.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/PRE_UPGRADE.d/1.3.0_fr.md diff --git a/doc/PRE_UPGRADE.d/1.3.0_fr.md b/doc/PRE_UPGRADE.d/1.3.0_fr.md new file mode 100644 index 0000000..cad4990 --- /dev/null +++ b/doc/PRE_UPGRADE.d/1.3.0_fr.md @@ -0,0 +1,3 @@ +Nous vous encourageons à consulter le [journal des modifications](https://fossil.kd2.org/paheko/wiki?name=Changelog/1.3) avant de passer à cette version, car il y a des changements majeurs. + +Attention, si vous avez installé des extensions, elles ne sont pas tous compatibles. Peut-être devrez-vous les supprimer avant cette mise à jour. From 0d46126e6c0c39314f059b462307c52c47e4b661 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 27 Jul 2023 20:31:08 +0200 Subject: [PATCH 42/80] Update 1.3.0_fr.md syntax --- doc/PRE_UPGRADE.d/1.3.0_fr.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/PRE_UPGRADE.d/1.3.0_fr.md b/doc/PRE_UPGRADE.d/1.3.0_fr.md index cad4990..0a3914b 100644 --- a/doc/PRE_UPGRADE.d/1.3.0_fr.md +++ b/doc/PRE_UPGRADE.d/1.3.0_fr.md @@ -1,3 +1 @@ -Nous vous encourageons à consulter le [journal des modifications](https://fossil.kd2.org/paheko/wiki?name=Changelog/1.3) avant de passer à cette version, car il y a des changements majeurs. - -Attention, si vous avez installé des extensions, elles ne sont pas tous compatibles. Peut-être devrez-vous les supprimer avant cette mise à jour. +Nous vous encourageons à consulter le Journal des modifications: https://fossil.kd2.org/paheko/wiki?name=Changelog/1.3 avant de passer à cette version, car il y a des changements majeurs. Si vous avez installé des extensions, elles ne seront pas toutes compatibles. From 489f04d546eca53bb527396f716931f14e6f6355 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 27 Jul 2023 20:32:22 +0200 Subject: [PATCH 43/80] Update 1.3.0.md syntax --- doc/PRE_UPGRADE.d/1.3.0.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/PRE_UPGRADE.d/1.3.0.md b/doc/PRE_UPGRADE.d/1.3.0.md index b8172b7..1225343 100644 --- a/doc/PRE_UPGRADE.d/1.3.0.md +++ b/doc/PRE_UPGRADE.d/1.3.0.md @@ -1,3 +1 @@ -We should encourage people to have a look at the [Changelog](https://fossil.kd2.org/paheko/wiki?name=Changelog/1.3) when upgrading to this specific version because there are major changes. - -Take care, if you have installed some plugins, not all are compatibles. Perhaps you need remove them before this upgrade. +We should encourage people to have a look at the Changelog: https://fossil.kd2.org/paheko/wiki?name=Changelog/1.3 when upgrading to this version because there are major changes. If you have installed some plugins, not all will be compatibles. From 4e7b4b9d47e6e449b51a057c821432b9c216cc34 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 27 Jul 2023 20:53:49 +0200 Subject: [PATCH 44/80] Update upgrade Change namespace --- scripts/upgrade | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 7ced1ef..00868d9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -70,7 +70,9 @@ ynh_script_progression --message="Updating a configuration file..." --weight=5 if ynh_compare_current_package_version --comparison lt --version 1.1.15~ynh1; then ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" fi - +if ynh_compare_current_package_version --comparison lt --version 1.2.9~ynh1; then + ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/config.local.user.php" +fi ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" # NOTE: Don't overwrite config.local.user.php From 3d27fd71339fdd244067a9379f9c4719a4a753c1 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 27 Jul 2023 21:20:01 +0200 Subject: [PATCH 45/80] Update upgrade try fix a sed needed --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 00868d9..e0d3f8e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -68,6 +68,7 @@ ynh_add_nginx_config ynh_script_progression --message="Updating a configuration file..." --weight=5 if ynh_compare_current_package_version --comparison lt --version 1.1.15~ynh1; then + chmod 750 "$install_dir/config.local.user.php" ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" fi if ynh_compare_current_package_version --comparison lt --version 1.2.9~ynh1; then From d9e4059a325e9f65448403e1056c64d84af50cbd Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 27 Jul 2023 21:29:36 +0200 Subject: [PATCH 46/80] Update upgrade explicit comparaison to sed from 1.2.9 --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index e0d3f8e..267a9bd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -71,7 +71,7 @@ if ynh_compare_current_package_version --comparison lt --version 1.1.15~ynh1; th chmod 750 "$install_dir/config.local.user.php" ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" fi -if ynh_compare_current_package_version --comparison lt --version 1.2.9~ynh1; then +if ynh_compare_current_package_version --comparison le --version 1.2.9~ynh1; then ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/config.local.user.php" fi ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" From 4939847d364e74cda30ae409f4794b0d6af49015 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 3 Aug 2023 21:40:37 +0200 Subject: [PATCH 47/80] Update manifest.toml need dependency php-zip --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 11c2819..e6d3eb5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -54,4 +54,4 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php8.2-sqlite3 php8.2-gd php8.2-intl php8.2-cli php8.2-gnupg php8.2-mbstring" + packages = "php8.2-sqlite3 php8.2-gd php8.2-intl php8.2-cli php8.2-gnupg php8.2-mbstring php8.2-zip" From 520a8b0fc4d54a429cadb83703081796e8892e99 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 5 Aug 2023 00:53:18 +0200 Subject: [PATCH 48/80] Update manifest.toml not needed --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index e6d3eb5..11c2819 100644 --- a/manifest.toml +++ b/manifest.toml @@ -54,4 +54,4 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php8.2-sqlite3 php8.2-gd php8.2-intl php8.2-cli php8.2-gnupg php8.2-mbstring php8.2-zip" + packages = "php8.2-sqlite3 php8.2-gd php8.2-intl php8.2-cli php8.2-gnupg php8.2-mbstring" From d0b29fe92ddab74f2dfc46214189e9df1814f177 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 5 Aug 2023 01:07:55 +0200 Subject: [PATCH 49/80] Update config.local.yunohost.php add options --- conf/config.local.yunohost.php | 76 +++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 2 deletions(-) diff --git a/conf/config.local.yunohost.php b/conf/config.local.yunohost.php index 8cbeb9f..6c136c1 100644 --- a/conf/config.local.yunohost.php +++ b/conf/config.local.yunohost.php @@ -28,12 +28,84 @@ namespace Paheko; const SECRET_KEY = '__SECRET_KEY__'; /** - * Adresse URI de la racine du site Garradin + * Répertoire où se situe le code source de Paheko + * + * Défaut : répertoire racine de Paheko (__DIR__) + */ + +const ROOT = ___INSTALL_DIR__; + +/** + * Répertoire où sont situées les données de Paheko + * (incluant la base de données SQLite, les sauvegardes, le cache, les fichiers locaux et les plugins) + * + * Défaut : sous-répertoire "data" de la racine + */ + +const DATA_ROOT = ROOT . '/data'; + +/** + * Répertoire où est situé le cache, + * exemples : graphiques de statistiques, templates Brindille, etc. + * + * Défaut : sous-répertoire 'cache' de DATA_ROOT + */ + +const CACHE_ROOT = DATA_ROOT . '/cache'; + +/** + * Répertoire où est situé le cache partagé entre instances + * Paheko utilisera ce répertoire pour stocker le cache susceptible d'être partagé entre instances, comme + * le code PHP généré à partir des templates Smartyer. + * + * Défaut : sous-répertoire 'shared' de CACHE_ROOT + */ + +const SHARED_CACHE_ROOT = CACHE_ROOT . '/shared'; + +/** + * Motif qui détermine l'emplacement des fichiers de cache du site web. + * + * Le site web peut créer des fichiers de cache pour les pages et catégories. + * Ensuite le serveur web (Apache) servira ces fichiers directement, sans faire + * appel au PHP, permettant de supporter beaucoup de trafic si le site web + * a une vague de popularité. + * + * Certaines valeurs sont remplacées : + * %host% = hash MD5 du hostname (utile en cas d'hébergement de plusieurs instances) + * %host.2% = 2 premiers caractères du hash MD5 du hostname + * + * Utiliser NULL pour désactiver le cache. + * + * Défault : CACHE_ROOT . '/web/%host%' + * + * @var null|string + */ + +//const WEB_CACHE_ROOT = CACHE_ROOT . '/web/%host%'; + +/** + * Emplacement du fichier de base de données de Paheko + * + * Défaut : DATA_ROOT . '/association.sqlite' + */ + +const DB_FILE = DATA_ROOT . '/association.sqlite'; + +/** + * Emplacement de stockage des plugins + * + * Défaut : DATA_ROOT . '/plugins' + */ + +const PLUGINS_ROOT = DATA_ROOT . '/plugins'; + +/** + * Adresse URI de la racine du site Paheko * (doit se terminer par un slash) * * Défaut : découverte automatique à partir de SCRIPT_NAME */ - const WWW_URI = '__PATH__/'; /** From 942281db159f29ede6982d854c179501f7a2db36 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 5 Aug 2023 01:11:41 +0200 Subject: [PATCH 50/80] Update config.local.yunohost.php test again --- conf/config.local.yunohost.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.local.yunohost.php b/conf/config.local.yunohost.php index 6c136c1..4317894 100644 --- a/conf/config.local.yunohost.php +++ b/conf/config.local.yunohost.php @@ -33,7 +33,7 @@ const SECRET_KEY = '__SECRET_KEY__'; * Défaut : répertoire racine de Paheko (__DIR__) */ -const ROOT = ___INSTALL_DIR__; +const ROOT = ___DIR__; /** * Répertoire où sont situées les données de Paheko From da639a98b1f7a083f772de32988124df0e63789c Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 5 Aug 2023 01:15:06 +0200 Subject: [PATCH 51/80] Update config.local.yunohost.php test again --- conf/config.local.yunohost.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/config.local.yunohost.php b/conf/config.local.yunohost.php index 4317894..b6973f1 100644 --- a/conf/config.local.yunohost.php +++ b/conf/config.local.yunohost.php @@ -33,7 +33,7 @@ const SECRET_KEY = '__SECRET_KEY__'; * Défaut : répertoire racine de Paheko (__DIR__) */ -const ROOT = ___DIR__; +//const ROOT = ___DIR__; /** * Répertoire où sont situées les données de Paheko @@ -51,7 +51,7 @@ const DATA_ROOT = ROOT . '/data'; * Défaut : sous-répertoire 'cache' de DATA_ROOT */ -const CACHE_ROOT = DATA_ROOT . '/cache'; +//const CACHE_ROOT = DATA_ROOT . '/cache'; /** * Répertoire où est situé le cache partagé entre instances @@ -61,7 +61,7 @@ const CACHE_ROOT = DATA_ROOT . '/cache'; * Défaut : sous-répertoire 'shared' de CACHE_ROOT */ -const SHARED_CACHE_ROOT = CACHE_ROOT . '/shared'; +//const SHARED_CACHE_ROOT = CACHE_ROOT . '/shared'; /** * Motif qui détermine l'emplacement des fichiers de cache du site web. @@ -90,7 +90,7 @@ const SHARED_CACHE_ROOT = CACHE_ROOT . '/shared'; * Défaut : DATA_ROOT . '/association.sqlite' */ -const DB_FILE = DATA_ROOT . '/association.sqlite'; +//const DB_FILE = DATA_ROOT . '/association.sqlite'; /** * Emplacement de stockage des plugins @@ -98,7 +98,7 @@ const DB_FILE = DATA_ROOT . '/association.sqlite'; * Défaut : DATA_ROOT . '/plugins' */ -const PLUGINS_ROOT = DATA_ROOT . '/plugins'; +//const PLUGINS_ROOT = DATA_ROOT . '/plugins'; /** * Adresse URI de la racine du site Paheko From b20dd0b2b92a4320a6ed7897207ace513edbf990 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 5 Aug 2023 01:24:36 +0200 Subject: [PATCH 52/80] Update config.local.yunohost.php try fix --- conf/config.local.yunohost.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.local.yunohost.php b/conf/config.local.yunohost.php index b6973f1..569c579 100644 --- a/conf/config.local.yunohost.php +++ b/conf/config.local.yunohost.php @@ -33,7 +33,7 @@ const SECRET_KEY = '__SECRET_KEY__'; * Défaut : répertoire racine de Paheko (__DIR__) */ -//const ROOT = ___DIR__; +const ROOT = __INSTALL_DIR__; /** * Répertoire où sont situées les données de Paheko From c9b9baccd648270c1a7bdc74ec11e31c03aca1fd Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 5 Aug 2023 01:25:25 +0200 Subject: [PATCH 53/80] Update config.local.yunohost.php try fix --- conf/config.local.yunohost.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/config.local.yunohost.php b/conf/config.local.yunohost.php index 569c579..927fd4c 100644 --- a/conf/config.local.yunohost.php +++ b/conf/config.local.yunohost.php @@ -33,7 +33,7 @@ const SECRET_KEY = '__SECRET_KEY__'; * Défaut : répertoire racine de Paheko (__DIR__) */ -const ROOT = __INSTALL_DIR__; +const ROOT = '__INSTALL_DIR__'; /** * Répertoire où sont situées les données de Paheko @@ -42,7 +42,7 @@ const ROOT = __INSTALL_DIR__; * Défaut : sous-répertoire "data" de la racine */ -const DATA_ROOT = ROOT . '/data'; +//const DATA_ROOT = ROOT . '/data'; /** * Répertoire où est situé le cache, From 9851e5d3ee48bf7209a4f71523b6b199424b6d30 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 5 Aug 2023 01:31:52 +0200 Subject: [PATCH 54/80] Update config.local.yunohost.php try fix --- conf/config.local.yunohost.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.local.yunohost.php b/conf/config.local.yunohost.php index 927fd4c..6404e19 100644 --- a/conf/config.local.yunohost.php +++ b/conf/config.local.yunohost.php @@ -33,7 +33,7 @@ const SECRET_KEY = '__SECRET_KEY__'; * Défaut : répertoire racine de Paheko (__DIR__) */ -const ROOT = '__INSTALL_DIR__'; +const ROOT = __INSTALL_DIR__; /** * Répertoire où sont situées les données de Paheko From 73309f77cf409bf5921a42b474ec70899c15c19a Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 5 Aug 2023 01:36:25 +0200 Subject: [PATCH 55/80] Update config.local.yunohost.php try fix --- conf/config.local.yunohost.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/config.local.yunohost.php b/conf/config.local.yunohost.php index 6404e19..fffe9e9 100644 --- a/conf/config.local.yunohost.php +++ b/conf/config.local.yunohost.php @@ -33,7 +33,7 @@ const SECRET_KEY = '__SECRET_KEY__'; * Défaut : répertoire racine de Paheko (__DIR__) */ -const ROOT = __INSTALL_DIR__; +//const ROOT = __DIR__; /** * Répertoire où sont situées les données de Paheko @@ -42,7 +42,7 @@ const ROOT = __INSTALL_DIR__; * Défaut : sous-répertoire "data" de la racine */ -//const DATA_ROOT = ROOT . '/data'; +const DATA_ROOT = ROOT . '/data'; /** * Répertoire où est situé le cache, From 93380787da796a647c9da0545d3a16588c5ac672 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 5 Aug 2023 01:41:38 +0200 Subject: [PATCH 56/80] Update config.local.yunohost.php try fix --- conf/config.local.yunohost.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.local.yunohost.php b/conf/config.local.yunohost.php index fffe9e9..3a12ef1 100644 --- a/conf/config.local.yunohost.php +++ b/conf/config.local.yunohost.php @@ -42,7 +42,7 @@ const SECRET_KEY = '__SECRET_KEY__'; * Défaut : sous-répertoire "data" de la racine */ -const DATA_ROOT = ROOT . '/data'; +//const DATA_ROOT = ROOT . '/data'; /** * Répertoire où est situé le cache, From a1e44a3654252868e2c15776112e8bc821317202 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 5 Aug 2023 01:44:58 +0200 Subject: [PATCH 57/80] Update config.local.yunohost.php revert to initial --- conf/config.local.yunohost.php | 73 ---------------------------------- 1 file changed, 73 deletions(-) diff --git a/conf/config.local.yunohost.php b/conf/config.local.yunohost.php index 3a12ef1..a03c16f 100644 --- a/conf/config.local.yunohost.php +++ b/conf/config.local.yunohost.php @@ -27,79 +27,6 @@ namespace Paheko; const SECRET_KEY = '__SECRET_KEY__'; -/** - * Répertoire où se situe le code source de Paheko - * - * Défaut : répertoire racine de Paheko (__DIR__) - */ - -//const ROOT = __DIR__; - -/** - * Répertoire où sont situées les données de Paheko - * (incluant la base de données SQLite, les sauvegardes, le cache, les fichiers locaux et les plugins) - * - * Défaut : sous-répertoire "data" de la racine - */ - -//const DATA_ROOT = ROOT . '/data'; - -/** - * Répertoire où est situé le cache, - * exemples : graphiques de statistiques, templates Brindille, etc. - * - * Défaut : sous-répertoire 'cache' de DATA_ROOT - */ - -//const CACHE_ROOT = DATA_ROOT . '/cache'; - -/** - * Répertoire où est situé le cache partagé entre instances - * Paheko utilisera ce répertoire pour stocker le cache susceptible d'être partagé entre instances, comme - * le code PHP généré à partir des templates Smartyer. - * - * Défaut : sous-répertoire 'shared' de CACHE_ROOT - */ - -//const SHARED_CACHE_ROOT = CACHE_ROOT . '/shared'; - -/** - * Motif qui détermine l'emplacement des fichiers de cache du site web. - * - * Le site web peut créer des fichiers de cache pour les pages et catégories. - * Ensuite le serveur web (Apache) servira ces fichiers directement, sans faire - * appel au PHP, permettant de supporter beaucoup de trafic si le site web - * a une vague de popularité. - * - * Certaines valeurs sont remplacées : - * %host% = hash MD5 du hostname (utile en cas d'hébergement de plusieurs instances) - * %host.2% = 2 premiers caractères du hash MD5 du hostname - * - * Utiliser NULL pour désactiver le cache. - * - * Défault : CACHE_ROOT . '/web/%host%' - * - * @var null|string - */ - -//const WEB_CACHE_ROOT = CACHE_ROOT . '/web/%host%'; - -/** - * Emplacement du fichier de base de données de Paheko - * - * Défaut : DATA_ROOT . '/association.sqlite' - */ - -//const DB_FILE = DATA_ROOT . '/association.sqlite'; - -/** - * Emplacement de stockage des plugins - * - * Défaut : DATA_ROOT . '/plugins' - */ - -//const PLUGINS_ROOT = DATA_ROOT . '/plugins'; - /** * Adresse URI de la racine du site Paheko * (doit se terminer par un slash) From e74680fe889dab5830e7db828de716f3c8ffcb7e Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 5 Aug 2023 02:12:55 +0200 Subject: [PATCH 58/80] Update upgrade remove directory duplicated since upgrade --- scripts/upgrade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 267a9bd..d282bf6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -98,6 +98,8 @@ ynh_local_curl "/admin/index.php" sleep 5 ynh_local_curl "/index.php" +# remove directory duplicated +ynh_secure_remove --file=$install_dir/data/data #================================================= # END OF SCRIPT #================================================= From d98bb755e5757d21b29d5d6ae65547fa69bdfd33 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 5 Aug 2023 02:20:28 +0200 Subject: [PATCH 59/80] Update upgrade try remove directory duplicated --- scripts/upgrade | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index d282bf6..d679b9b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -94,12 +94,13 @@ chmod 660 "$install_dir/config.local.user.php" #================================================= ynh_script_progression --message="Finalise upgrade" --weight=1 +# remove directory duplicated +ynh_secure_remove --file=$install_dir/data/data/ + ynh_local_curl "/admin/index.php" sleep 5 ynh_local_curl "/index.php" -# remove directory duplicated -ynh_secure_remove --file=$install_dir/data/data #================================================= # END OF SCRIPT #================================================= From 2a72e5b2d4dfac048fce874f069cd3ddc362b5a1 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 5 Aug 2023 02:47:25 +0200 Subject: [PATCH 60/80] Update upgrade try delete directory not needed --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index d679b9b..cd9069f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -95,7 +95,7 @@ chmod 660 "$install_dir/config.local.user.php" ynh_script_progression --message="Finalise upgrade" --weight=1 # remove directory duplicated -ynh_secure_remove --file=$install_dir/data/data/ +ynh_secure_remove --file="$install_dir/data/data" ynh_local_curl "/admin/index.php" sleep 5 From 7ff674c9005b84328e80c4b55c758e1992798c8e Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Mon, 21 Aug 2023 00:35:51 +0200 Subject: [PATCH 61/80] Update manifest.toml version rc4 release candidate 4 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 11c2819..8946b7a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Paheko" description.en = "Software to manage association" description.fr = "Logiciel libre de gestion d'association" -version = "1.3.0~ynh2" +version = "1.3.0~ynh3" maintainers = ["rodinux"] @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc3.tar.gz" - sha256 = "d1f9587fa00cf0f7aec1ee9b8f7bcbaa4b8c1ac97e37de6da85ee3dfecbc6f39" + url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc4.tar.gz" + sha256 = "cc5ac68a0c64c7021a9fee008b5c4d6c339de68fc39ed24c2da3ae24d28fbd6c" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 21d03fd831c3fc915128d92d08bb1e5cebf6947a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 20 Aug 2023 22:35:54 +0000 Subject: [PATCH 62/80] 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 3ddd7be..c6fdea9 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ You can now upgrade Garradin with Paheko ! ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Shipped version:** 1.3.0~ynh2 +**Shipped version:** 1.3.0~ynh3 **Demo:** https://paheko.cloud/essai/ diff --git a/README_fr.md b/README_fr.md index de8f4aa..4d80196 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Version incluse :** 1.3.0~ynh2 +**Version incluse :** 1.3.0~ynh3 **Démo :** https://paheko.cloud/essai/ From e83a11828d05b6526155911492eb6711f5db1d9c Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Mon, 28 Aug 2023 23:07:33 +0200 Subject: [PATCH 63/80] Update manifest.toml release RC5 candidate --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 8946b7a..776f4c0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc4.tar.gz" - sha256 = "cc5ac68a0c64c7021a9fee008b5c4d6c339de68fc39ed24c2da3ae24d28fbd6c" + url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc5.tar.gz" + sha256 = "5e99f97fb8ba56a24de317fcb20664fd5245abd03240f167ef6c5f724841c537" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 3e5f092b8876742fd2c3569bf0541d01ed8a2742 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Mon, 28 Aug 2023 23:11:55 +0200 Subject: [PATCH 64/80] Update manifest.toml release RC6 candidate --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 776f4c0..c57ae06 100644 --- a/manifest.toml +++ b/manifest.toml @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc5.tar.gz" - sha256 = "5e99f97fb8ba56a24de317fcb20664fd5245abd03240f167ef6c5f724841c537" + url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc6.tar.gz" + sha256 = "80a4d2eb67e21ab8bce48b4b37ef06421e53239e6fdf927e5b0f1b2f9a458100" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 3c6a1dd23816b852a71cebafe0107a66b08ce602 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Mon, 28 Aug 2023 23:15:45 +0200 Subject: [PATCH 65/80] Update manifest.toml release rc6 candidate --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index c57ae06..13c5aff 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Paheko" description.en = "Software to manage association" description.fr = "Logiciel libre de gestion d'association" -version = "1.3.0~ynh3" +version = "1.3.0~ynh4" maintainers = ["rodinux"] From 97100d1a83ae16678ef4872ebf7e0c2e769f2b05 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 28 Aug 2023 21:15:48 +0000 Subject: [PATCH 66/80] 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 c6fdea9..daf3dd8 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ You can now upgrade Garradin with Paheko ! ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Shipped version:** 1.3.0~ynh3 +**Shipped version:** 1.3.0~ynh4 **Demo:** https://paheko.cloud/essai/ diff --git a/README_fr.md b/README_fr.md index 4d80196..924ba17 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Version incluse :** 1.3.0~ynh3 +**Version incluse :** 1.3.0~ynh4 **Démo :** https://paheko.cloud/essai/ From cda786f4be4e10fb763c369070a734d04d82536e Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Mon, 28 Aug 2023 23:26:01 +0200 Subject: [PATCH 67/80] Update upgrade wait for the construction of the folder data/data before --- scripts/upgrade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index cd9069f..95ee163 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -94,12 +94,12 @@ chmod 660 "$install_dir/config.local.user.php" #================================================= ynh_script_progression --message="Finalise upgrade" --weight=1 -# remove directory duplicated -ynh_secure_remove --file="$install_dir/data/data" - ynh_local_curl "/admin/index.php" sleep 5 ynh_local_curl "/index.php" +sleep 5 +# remove directory duplicated +ynh_secure_remove --file="$install_dir/data/data" #================================================= # END OF SCRIPT From 34b6b75e28b1a510356751dc932fed5616840744 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 1 Sep 2023 20:46:47 +0200 Subject: [PATCH 68/80] Update DESCRIPTION.md : remove explanation about the old name, I doubt people want an explanation about the name which is ... not used anymore ... also no need to include the logo in description.md --- doc/DESCRIPTION.md | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index a06dc9c..2d9c39a 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,14 +1,3 @@ Paheko (we chose the name Paheko, a word from the Māori language meaning "to cooperate", illustrating the purpose of the software: to improve together the daily management of an association) 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. . - -## Garradin becomes Paheko! -### Why change your name? - -It appeared that the pronunciation of "Garradin" in French is sometimes a bit complicated, as is its spelling. - -There is already a commercial software called "Garradin" in Australia, which does finance for large groups. For the moment this was not a problem because our association management solution was only available in French and until then did not have much scope. But we would like to be able to offer the software in other languages in the years to come, and as Garradin (the French project) is starting to be quite well known, it seems necessary to limit the risk of confusion in the future with this commercial solution. - -You can now upgrade Garradin with Paheko ! - -![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) +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.. From 05dd09e5f8e9f55bba4c806c238f24d8bddf2de1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 1 Sep 2023 18:46:51 +0000 Subject: [PATCH 69/80] Auto-update README --- README.md | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/README.md b/README.md index daf3dd8..add05c2 100644 --- a/README.md +++ b/README.md @@ -18,18 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Paheko (we chose the name Paheko, a word from the Māori language meaning "to cooperate", illustrating the purpose of the software: to improve together the daily management of an association) 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. . - -## Garradin becomes Paheko! -### Why change your name? - -It appeared that the pronunciation of "Garradin" in French is sometimes a bit complicated, as is its spelling. - -There is already a commercial software called "Garradin" in Australia, which does finance for large groups. For the moment this was not a problem because our association management solution was only available in French and until then did not have much scope. But we would like to be able to offer the software in other languages in the years to come, and as Garradin (the French project) is starting to be quite well known, it seems necessary to limit the risk of confusion in the future with this commercial solution. - -You can now upgrade Garradin with Paheko ! - -![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) +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.3.0~ynh4 From a7cfbd45d032507693ac40e5103fe057e7aa5b2f Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Fri, 1 Sep 2023 23:47:05 +0200 Subject: [PATCH 70/80] Update manifest.toml Candidate release RC7 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 13c5aff..54a57ad 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Paheko" description.en = "Software to manage association" description.fr = "Logiciel libre de gestion d'association" -version = "1.3.0~ynh4" +version = "1.3.0~ynh5" maintainers = ["rodinux"] @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc6.tar.gz" - sha256 = "80a4d2eb67e21ab8bce48b4b37ef06421e53239e6fdf927e5b0f1b2f9a458100" + url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc7.tar.gz" + sha256 = "c0ef2bb160d6164cf43ead5d10f805b95db3841ce114f72316dcd9d41c1ddc54" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 1c457aa2edb72fa440bc273af6e76599438b70a6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 1 Sep 2023 21:47:08 +0000 Subject: [PATCH 71/80] 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 add05c2..3e24bda 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Paheko (we chose the name Paheko, a word from the Māori language meaning "to co 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.3.0~ynh4 +**Shipped version:** 1.3.0~ynh5 **Demo:** https://paheko.cloud/essai/ diff --git a/README_fr.md b/README_fr.md index 924ba17..56f8dcf 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Version incluse :** 1.3.0~ynh4 +**Version incluse :** 1.3.0~ynh5 **Démo :** https://paheko.cloud/essai/ From 234a4a186fad12cc94e30cf2eae7b78ff1325ad7 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 2 Sep 2023 00:21:28 +0200 Subject: [PATCH 72/80] Update upgrade try debug --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 95ee163..9a35983 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -98,11 +98,11 @@ ynh_local_curl "/admin/index.php" sleep 5 ynh_local_curl "/index.php" sleep 5 -# remove directory duplicated -ynh_secure_remove --file="$install_dir/data/data" #================================================= # END OF SCRIPT #================================================= +# remove directory duplicated +ynh_secure_remove --file="$install_dir/data/data" ynh_script_progression --message="Upgrade of $app completed" --last From c23f698bb60b41e6649d5a2c3de2dd2497a70961 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 5 Sep 2023 22:54:30 +0200 Subject: [PATCH 73/80] Update manifest.toml version 1.2.11 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 54a57ad..41b5e53 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Paheko" description.en = "Software to manage association" description.fr = "Logiciel libre de gestion d'association" -version = "1.3.0~ynh5" +version = "1.2.11~ynh1" maintainers = ["rodinux"] @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc7.tar.gz" - sha256 = "c0ef2bb160d6164cf43ead5d10f805b95db3841ce114f72316dcd9d41c1ddc54" + url = "https://fossil.kd2.org/paheko/uv/paheko-1.2.11.tar.gz" + sha256 = "9d8a505d9165c38ee0d262316ba636536ebddf0a6127b2e731bc231fe053f28d" autoupdate.strategy = "latest_github_tag" [resources.system_user] From c6e233621768af0bf456295dae231bef498b76a3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 5 Sep 2023 20:54:33 +0000 Subject: [PATCH 74/80] 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 3e24bda..809a714 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Paheko (we chose the name Paheko, a word from the Māori language meaning "to co 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.3.0~ynh5 +**Shipped version:** 1.2.11~ynh1 **Demo:** https://paheko.cloud/essai/ diff --git a/README_fr.md b/README_fr.md index 56f8dcf..d48058e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Version incluse :** 1.3.0~ynh5 +**Version incluse :** 1.2.11~ynh1 **Démo :** https://paheko.cloud/essai/ From 5f9ab05dc6ff5ba58da15ee4362884c637018e36 Mon Sep 17 00:00:00 2001 From: rodinux Date: Tue, 5 Sep 2023 23:47:38 +0200 Subject: [PATCH 75/80] keep namespace Garradin until next relaease 1.3 --- conf/config.local.user.php | 2 +- conf/config.local.yunohost.php | 2 +- doc/PRE_UPGRADE.d/1.3.0.md | 1 - doc/PRE_UPGRADE.d/1.3.0_fr.md | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 doc/PRE_UPGRADE.d/1.3.0.md delete mode 100644 doc/PRE_UPGRADE.d/1.3.0_fr.md diff --git a/conf/config.local.user.php b/conf/config.local.user.php index 62a146d..04b8d27 100644 --- a/conf/config.local.user.php +++ b/conf/config.local.user.php @@ -10,4 +10,4 @@ */ // Nécessaire pour situer les constantes dans le bon namespace -namespace Paheko; +namespace Garradin; diff --git a/conf/config.local.yunohost.php b/conf/config.local.yunohost.php index a03c16f..41849cf 100644 --- a/conf/config.local.yunohost.php +++ b/conf/config.local.yunohost.php @@ -10,7 +10,7 @@ */ // Nécessaire pour situer les constantes dans le bon namespace -namespace Paheko; +namespace Garradin; /** * Clé secrète, doit être unique à chaque instance de Garradin diff --git a/doc/PRE_UPGRADE.d/1.3.0.md b/doc/PRE_UPGRADE.d/1.3.0.md deleted file mode 100644 index 1225343..0000000 --- a/doc/PRE_UPGRADE.d/1.3.0.md +++ /dev/null @@ -1 +0,0 @@ -We should encourage people to have a look at the Changelog: https://fossil.kd2.org/paheko/wiki?name=Changelog/1.3 when upgrading to this version because there are major changes. If you have installed some plugins, not all will be compatibles. diff --git a/doc/PRE_UPGRADE.d/1.3.0_fr.md b/doc/PRE_UPGRADE.d/1.3.0_fr.md deleted file mode 100644 index 0a3914b..0000000 --- a/doc/PRE_UPGRADE.d/1.3.0_fr.md +++ /dev/null @@ -1 +0,0 @@ -Nous vous encourageons à consulter le Journal des modifications: https://fossil.kd2.org/paheko/wiki?name=Changelog/1.3 avant de passer à cette version, car il y a des changements majeurs. Si vous avez installé des extensions, elles ne seront pas toutes compatibles. From d6a26a5fb4cf89afe7b4af9e0dc2a5b2e784f8a4 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Fri, 8 Sep 2023 04:37:00 +0200 Subject: [PATCH 76/80] Update ADMIN.md --- doc/ADMIN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 3d98559..7b6bf2e 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1,5 +1,5 @@ ## Custom configurations -If you wish, you can add personal costum configurations by editing the `/var/www/paheko/config.local.user.php` file. To see the possibilities, you can read the `/var/www/paheko/config.dist.php` file first. +If you wish, you can add personal costum configurations by editing the `__INSTALL_DIR__/config.local.user.php` file. To see the possibilities, you can read the `__INSTALL_DIR__/config.dist.php` file first. From a81a848a253805fefd6d0689153674d199b7eaf4 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Fri, 8 Sep 2023 04:37:24 +0200 Subject: [PATCH 77/80] Update ADMIN_fr.md --- doc/ADMIN_fr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index 91f7512..e6e0e37 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -1,4 +1,4 @@ ## Configurations personnelles -Vous pouvez si vous le souhaitez ajouter des configurations personnelles en éditant le fichier `/var/www/paheko/config.local.user.php`. -Pour voir les possibilités vous pouvez lire auparavant le fichier `/var/www/paheko/config.dist.php`. +Vous pouvez si vous le souhaitez ajouter des configurations personnelles en éditant le fichier `__INSTALL_DIR__/config.local.user.php`. +Pour voir les possibilités vous pouvez lire auparavant le fichier `__INSTALL_DIR__/config.dist.php`. From f57f1284b4521f69a801abcb4f59d28829445eb3 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Fri, 8 Sep 2023 09:22:57 +0200 Subject: [PATCH 78/80] Update upgrade naamespace keep with Garradin until 1.3 release changes --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 9a35983..94a536b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -71,7 +71,7 @@ if ynh_compare_current_package_version --comparison lt --version 1.1.15~ynh1; th chmod 750 "$install_dir/config.local.user.php" ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" fi -if ynh_compare_current_package_version --comparison le --version 1.2.9~ynh1; then +if ynh_compare_current_package_version --comparison le --version 1.2.12~ynh1; then ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/config.local.user.php" fi ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" From 66ca9dd00b2baa7da4e760a5682ecf198e2fc783 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 9 Sep 2023 16:19:43 +0200 Subject: [PATCH 79/80] Update manifest.toml repo not hosted on github Co-authored-by: Tagada <36127788+Tagadda@users.noreply.github.com> --- manifest.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 41b5e53..d07b556 100644 --- a/manifest.toml +++ b/manifest.toml @@ -44,7 +44,6 @@ ram.runtime = "50M" [resources.sources.main] url = "https://fossil.kd2.org/paheko/uv/paheko-1.2.11.tar.gz" sha256 = "9d8a505d9165c38ee0d262316ba636536ebddf0a6127b2e731bc231fe053f28d" - autoupdate.strategy = "latest_github_tag" [resources.system_user] From 1f8723b36124eacf94a5415e9f3df8b0c9da3e2a Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Sat, 9 Sep 2023 16:24:07 +0200 Subject: [PATCH 80/80] Update doc/ADMIN.md Co-authored-by: Alexandre Aubin --- doc/ADMIN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 7b6bf2e..1984b74 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1,5 +1,5 @@ ## Custom configurations -If you wish, you can add personal costum configurations by editing the `__INSTALL_DIR__/config.local.user.php` file. To see the possibilities, you can read the `__INSTALL_DIR__/config.dist.php` file first. +If you wish, you can add personal custom configurations by editing the `__INSTALL_DIR__/config.local.user.php` file. To see the possibilities, you can read the `__INSTALL_DIR__/config.dist.php` file first.