From 14ace2c0324b06d09ff72cd17a61d98000f70f39 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 27 May 2022 23:13:59 +0200 Subject: [PATCH 01/26] 1.2.22 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 754d316..6e82cd9 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/kanboard/kanboard/archive/refs/tags/v1.2.21.tar.gz -SOURCE_SUM=5ae2dc9591b7223eba5b83e4ae8855a806b6be3c7b78bb92093632f2e6572f97 +SOURCE_URL=https://github.com/kanboard/kanboard/archive/refs/tags/v1.2.22.tar.gz +SOURCE_SUM=f609a23eb6e755297fee1b534b43ba8a913baaf60ece31840786b788cba2e641 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index e7c1445..20a935f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Kanban project management software", "fr": "Logiciel de gestion de projet Kanban" }, - "version": "1.2.21~ynh4", + "version": "1.2.22~ynh1", "url": "https://kanboard.net", "upstream": { "license": "MIT", From c7ace194d1dc300f29e5e71020fcc76f75593be1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 27 May 2022 21:14:07 +0000 Subject: [PATCH 02/26] Auto-update README --- README.md | 21 +++++++++++---------- README_fr.md | 27 ++++++++++++++++----------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 5ab7748..4ebae31 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Kanboard for YunoHost -[![Integration level](https://dash.yunohost.org/integration/kanboard.svg)](https://dash.yunohost.org/appci/app/kanboard) ![](https://ci-apps.yunohost.org/ci/badges/kanboard.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/kanboard.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/kanboard.svg)](https://dash.yunohost.org/appci/app/kanboard) ![Working status](https://ci-apps.yunohost.org/ci/badges/kanboard.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/kanboard.maintain.svg) [![Install Kanboard with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kanboard) *[Lire ce readme en français.](./README_fr.md)* @@ -17,13 +17,13 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Kanban project management software -**Shipped version:** 1.2.21~ynh4 +**Shipped version:** 1.2.22~ynh1 **Demo:** https://demo.yunohost.org/kanboard/ ## Screenshots -![](./doc/screenshots/board.png) +![Screenshot of Kanboard](./doc/screenshots/board.png) ## Disclaimers / important information @@ -43,21 +43,22 @@ This is due to a Kanboard limitation. ## Documentation and resources -* Official app website: https://kanboard.net -* Official admin documentation: https://docs.kanboard.org/en/latest/ -* Upstream app code repository: https://github.com/kanboard/kanboard -* YunoHost documentation for this app: https://yunohost.org/app_kanboard -* Report a bug: https://github.com/YunoHost-Apps/kanboard_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/kanboard_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/kanboard_ynh/tree/testing --debug or sudo yunohost app upgrade kanboard -u https://github.com/YunoHost-Apps/kanboard_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 3fe02a8..a2f3ae1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Kanboard pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/kanboard.svg)](https://dash.yunohost.org/appci/app/kanboard) ![](https://ci-apps.yunohost.org/ci/badges/kanboard.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/kanboard.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/kanboard.svg)](https://dash.yunohost.org/appci/app/kanboard) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/kanboard.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/kanboard.maintain.svg) [![Installer Kanboard avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kanboard) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Kanboard rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -13,13 +17,13 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Logiciel de gestion de projet Kanban -**Version incluse :** 1.2.21~ynh4 +**Version incluse :** 1.2.22~ynh1 **Démo :** https://demo.yunohost.org/kanboard/ ## Captures d'écran -![](./doc/screenshots/board.png) +![Capture d'écran de Kanboard](./doc/screenshots/board.png) ## Avertissements / informations importantes @@ -39,21 +43,22 @@ Cela est dû à une limitation de Kanboard. ## Documentations et ressources -* Site officiel de l'app : https://kanboard.net -* Documentation officielle de l'admin : https://docs.kanboard.org/en/latest/ -* Dépôt de code officiel de l'app : https://github.com/kanboard/kanboard -* Documentation YunoHost pour cette app : https://yunohost.org/app_kanboard -* Signaler un bug : https://github.com/YunoHost-Apps/kanboard_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/kanboard_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/kanboard_ynh/tree/testing --debug ou sudo yunohost app upgrade kanboard -u https://github.com/YunoHost-Apps/kanboard_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From 07332b0ca11e88627e182ede56e453a6da31e018 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 27 May 2022 23:17:20 +0200 Subject: [PATCH 03/26] Upgrade to 7.4 --- manifest.json | 2 +- scripts/_common.sh | 2 +- scripts/backup | 2 +- scripts/change_url | 2 +- scripts/install | 2 +- scripts/remove | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest.json b/manifest.json index 20a935f..31e1196 100644 --- a/manifest.json +++ b/manifest.json @@ -34,7 +34,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.3-fpm", + "php7.4-fpm", "mysql" ], "arguments": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 6eb3532..85d65c3 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="7.4" pkg_dependencies="php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-opcache php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql" diff --git a/scripts/backup b/scripts/backup index 4ddf7a7..cdeb5d9 100644 --- a/scripts/backup +++ b/scripts/backup @@ -74,4 +74,4 @@ ynh_mysql_dump_db --database="$db_name" > db.sql # END OF SCRIPT #================================================= -ynh_print_info --message="Backup script completed for Kanboard. (YunoHost will then actually copy those files to the archive)." +ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url index 6d24ff0..32a4874 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -127,4 +127,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for Kanboard" --last +ynh_script_progression --message="Change of URL completed for $app" --last diff --git a/scripts/install b/scripts/install index e306a83..0ccb23b 100644 --- a/scripts/install +++ b/scripts/install @@ -179,4 +179,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of Kanboard completed" --last +ynh_script_progression --message="Installation of $app completed" --last diff --git a/scripts/remove b/scripts/remove index 2284ff9..9c2ecc8 100644 --- a/scripts/remove +++ b/scripts/remove @@ -99,4 +99,4 @@ ynh_system_user_delete --username=$app # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of Kanboard completed" --last +ynh_script_progression --message="Removal of $app completed" --last diff --git a/scripts/restore b/scripts/restore index fa63911..c40700f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -124,4 +124,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for Kanboard" --last +ynh_script_progression --message="Restoration completed for $app" --last diff --git a/scripts/upgrade b/scripts/upgrade index 676f89d..4d104c9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -179,4 +179,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of Kanboard completed" --last +ynh_script_progression --message="Installation of $app completed" --last From 285a1fca3a9957f02c8ad37089c0da9a21a1a3ef Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 27 May 2022 23:18:48 +0200 Subject: [PATCH 04/26] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 85d65c3..6a5f725 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ YNH_PHP_VERSION="7.4" -pkg_dependencies="php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-opcache php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql" +pkg_dependencies="php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-opcache php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-ldap" #================================================= # PERSONAL HELPERS From a02bf6723799c4a8c9e502b4ff7d9ac6925bea64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 12:08:05 +0200 Subject: [PATCH 05/26] Fix --- conf/config.php | 2 +- scripts/_common.sh | 4 ++-- scripts/install | 18 ++++++++++++------ scripts/remove | 3 ++- scripts/restore | 15 +++++++-------- scripts/upgrade | 4 +--- 6 files changed, 25 insertions(+), 21 deletions(-) diff --git a/conf/config.php b/conf/config.php index 2a097d3..ecbb48a 100644 --- a/conf/config.php +++ b/conf/config.php @@ -61,7 +61,7 @@ define('DB_RUN_MIGRATIONS', false); define('DB_DRIVER', 'mysql'); // Mysql/Postgres username -define('DB_USERNAME', '__DB_NAME__'); +define('DB_USERNAME', '__DB_USER__'); // Mysql/Postgres password define('DB_PASSWORD', '__DB_PWD__'); diff --git a/scripts/_common.sh b/scripts/_common.sh index 6a5f725..96711e7 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,9 +4,9 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.4" +YNH_PHP_VERSION="8.0" -pkg_dependencies="php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-opcache php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-ldap" +pkg_dependencies="php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-opcache php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-ldap" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 0ccb23b..cf5e235 100644 --- a/scripts/install +++ b/scripts/install @@ -13,6 +13,11 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= +ynh_clean_setup () { + ### Remove this function if there's nothing to clean before calling the remove script. + true +} +# Exit if an error occurs during the execution of the script ynh_abort_if_errors #================================================= @@ -21,8 +26,8 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH -admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC +admin=$YNH_APP_ARG_ADMIN email=$(ynh_user_get_info --username=$admin --key=mail) app=$YNH_APP_INSTANCE_NAME @@ -30,7 +35,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -ynh_script_progression --message="Validating installation parameters..." +ynh_script_progression --message="Validating installation parameters..." --weight=1 # Check destination directory final_path=/var/www/$app @@ -42,10 +47,10 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_script_progression --message="Storing installation settings..." +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=adminusername --value=$admin +ynh_app_setting_set --app=$app --key=admin --value=$admin #================================================= # INSTALL DEPENDENCIES @@ -62,8 +67,9 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Creating a MySQL database..." --weight=2 db_name=$(ynh_sanitize_dbid --db_name=$app) +db_user=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name -ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name +ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name #================================================= # CREATE DEDICATED USER @@ -125,7 +131,7 @@ chown $app "$final_path/config.php" #================================================= ynh_script_progression --message="Initializing database..." --weight=7 -ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < "${final_path}/app/Schema/Sql/mysql.sql" +ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" < "$final_path/app/Schema/Sql/mysql.sql" pushd $final_path # Launch database migration diff --git a/scripts/remove b/scripts/remove index 9c2ecc8..cfcdb59 100644 --- a/scripts/remove +++ b/scripts/remove @@ -19,6 +19,7 @@ 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) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name #================================================= # STANDARD REMOVE @@ -36,7 +37,7 @@ ynh_remove_app_dependencies ynh_script_progression --message="Removing the MySQL database..." --weight=4 # Remove a database if it exists, along with the associated user -ynh_mysql_remove_db --db_user=$db_name --db_name=$db_name +ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name #================================================= # REMOVE APP MAIN DIR diff --git a/scripts/restore b/scripts/restore index c40700f..d060594 100644 --- a/scripts/restore +++ b/scripts/restore @@ -26,6 +26,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= @@ -33,13 +34,15 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path \ + || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= +ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -66,14 +69,10 @@ chown -R $app $final_path/{data,plugins,sessions} #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=6 +ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=5 -# Restore the file first, so it can have a backup if different ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -# Recreate a dedicated PHP-FPM config -ynh_add_fpm_config - #================================================= # SPECIFIC RESTORATION #================================================= @@ -82,8 +81,8 @@ ynh_add_fpm_config ynh_script_progression --message="Restoring the MySQL database..." --weight=3 db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name --db_pwd=$db_pwd -ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ./db.sql +ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd +ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= # RESTORE FAIL2BAN CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 4d104c9..8eb4e88 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,13 +18,11 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) -admin=$(ynh_app_setting_get --app=$app --key=adminusername) +admin=$(ynh_app_setting_get --app=$app --key=admin) is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -email=$(ynh_user_get_info --username=$admin --key=mail) #================================================= # CHECK VERSION From c51a44dc2d7f4907c10e89c628af00ab3cbeb4a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 12:14:31 +0200 Subject: [PATCH 06/26] Fix --- conf/config.php | 2 +- scripts/install | 6 +++--- scripts/upgrade | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/config.php b/conf/config.php index ecbb48a..98b383e 100644 --- a/conf/config.php +++ b/conf/config.php @@ -43,7 +43,7 @@ define('MAIL_BCC', ''); define('MAIL_TRANSPORT', 'mail'); // SMTP configuration to use when the "smtp" transport is chosen -define('MAIL_SMTP_HOSTNAME', ''); +define('MAIL_SMTP_HOSTNAME', 'localhost'); define('MAIL_SMTP_PORT', 25); define('MAIL_SMTP_USERNAME', ''); define('MAIL_SMTP_PASSWORD', ''); diff --git a/scripts/install b/scripts/install index cf5e235..97b04c5 100644 --- a/scripts/install +++ b/scripts/install @@ -121,10 +121,10 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) ynh_script_progression --message="Configuring Kanboard..." dir="__DIR__" -ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php" +ynh_add_config --template="../conf/config.php" --destination="$final_path/data/config.php" -chmod 400 "$final_path/config.php" -chown $app "$final_path/config.php" +chmod 400 "$final_path/data/config.php" +chown $app "$final_path/data/config.php" #================================================= # DATABASE INITIALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 8eb4e88..10fab7c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -87,7 +87,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=3 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config.php" + ynh_setup_source --dest_dir="$final_path" --keep="$final_path/data/config.php" fi mkdir -p $final_path/sessions/ From a34a1f9eada7caaf51650200d476d538c698cf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 12:17:40 +0200 Subject: [PATCH 07/26] Fix --- scripts/install | 10 +++++----- scripts/upgrade | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/install b/scripts/install index 97b04c5..7d22d53 100644 --- a/scripts/install +++ b/scripts/install @@ -163,16 +163,16 @@ ynh_script_progression --message="Configuring SSOwat..." --weight=2 if [ $is_public -eq 1 ] then ynh_permission_update --permission="main" --add="visitors" - ynh_replace_string --match_string="define('LDAP_AUTH'.*$" --replace_string="define('LDAP_AUTH', true);" --target_file="$final_path/config.php" - ynh_replace_string --match_string="define('HIDE_LOGIN_FORM'.*$" --replace_string="define('HIDE_LOGIN_FORM', false);" --target_file="$final_path/config.php" - ynh_replace_string --match_string="define('REMEMBER_ME_AUTH'.*$" --replace_string="define('REMEMBER_ME_AUTH', true);" --target_file="$final_path/config.php" - ynh_replace_string --match_string="define('DISABLE_LOGOUT'.*$" --replace_string="define('DISABLE_LOGOUT', false);" --target_file="$final_path/config.php" + ynh_replace_string --match_string="define('LDAP_AUTH'.*$" --replace_string="define('LDAP_AUTH', true);" --target_file="$final_path/data/config.php" + ynh_replace_string --match_string="define('HIDE_LOGIN_FORM'.*$" --replace_string="define('HIDE_LOGIN_FORM', false);" --target_file="$final_path/data/config.php" + ynh_replace_string --match_string="define('REMEMBER_ME_AUTH'.*$" --replace_string="define('REMEMBER_ME_AUTH', true);" --target_file="$final_path/data/config.php" + ynh_replace_string --match_string="define('DISABLE_LOGOUT'.*$" --replace_string="define('DISABLE_LOGOUT', false);" --target_file="$final_path/data/config.php" else ynh_app_setting_set --app=$app --key=unprotected_uris --value="/jsonrpc.php" fi # Calculate and store the config file checksum into the app settings -ynh_store_file_checksum --file="$final_path/config.php" +ynh_store_file_checksum --file="$final_path/data/config.php" #================================================= # RELOAD NGINX diff --git a/scripts/upgrade b/scripts/upgrade index 10fab7c..1336efd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -158,10 +158,10 @@ ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=2 if [ $is_public -eq 1 ] then ynh_permission_update --permission="main" --add="visitors" - ynh_replace_string --match_string="define('LDAP_AUTH'.*$" --replace_string="define('LDAP_AUTH', true);" --target_file="$final_path/config.php" - ynh_replace_string --match_string="define('HIDE_LOGIN_FORM'.*$" --replace_string="define('HIDE_LOGIN_FORM', false);" --target_file="$final_path/config.php" - ynh_replace_string --match_string="define('REMEMBER_ME_AUTH'.*$" --replace_string="define('REMEMBER_ME_AUTH', true);" --target_file="$final_path/config.php" - ynh_replace_string --match_string="define('DISABLE_LOGOUT'.*$" --replace_string="define('DISABLE_LOGOUT', false);" --target_file="$final_path/config.php" + ynh_replace_string --match_string="define('LDAP_AUTH'.*$" --replace_string="define('LDAP_AUTH', true);" --target_file="$final_path/data/config.php" + ynh_replace_string --match_string="define('HIDE_LOGIN_FORM'.*$" --replace_string="define('HIDE_LOGIN_FORM', false);" --target_file="$final_path/data/config.php" + ynh_replace_string --match_string="define('REMEMBER_ME_AUTH'.*$" --replace_string="define('REMEMBER_ME_AUTH', true);" --target_file="$final_path/data/config.php" + ynh_replace_string --match_string="define('DISABLE_LOGOUT'.*$" --replace_string="define('DISABLE_LOGOUT', false);" --target_file="$final_path/data/config.php" else ynh_app_setting_set --app=$app --key=unprotected_uris --value="/jsonrpc.php" fi From 724d488c7ef58720a4b2131ec75bdc17112029b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 12:20:17 +0200 Subject: [PATCH 08/26] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 4731a80..63d1f6b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -6,7 +6,7 @@ location __PATH__/ { index index.php; client_max_body_size 50M; - try_files $uri $uri/ /index.php?$args; + try_files $uri $uri/ __PATH__/index.php; # Override CSP header to make SSOWAT user panel compatible with kanboard more_set_headers "Content-Security-Policy: default-src 'self' 'unsafe-eval' data:; style-src 'self' 'unsafe-inline'"; From 35377ddb024b08a1543ec367b8b777fb067654a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 12:21:17 +0200 Subject: [PATCH 09/26] Update config.php --- conf/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.php b/conf/config.php index 98b383e..99a69b6 100644 --- a/conf/config.php +++ b/conf/config.php @@ -204,7 +204,7 @@ define('MARKDOWN_ESCAPE_HTML', true); define('API_AUTHENTICATION_HEADER', ''); // Enable/disable url rewrite -define('ENABLE_URL_REWRITE', false); +define('ENABLE_URL_REWRITE', true); // Hide login form, useful if all your users use Google/Github/ReverseProxy authentication define('HIDE_LOGIN_FORM', true); From 08041d85e1ee6363db0a5b22b2abe1a73a3acd4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 12:28:58 +0200 Subject: [PATCH 10/26] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 31e1196..187388e 100644 --- a/manifest.json +++ b/manifest.json @@ -34,7 +34,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.4-fpm", + "php8.0-fpm", "mysql" ], "arguments": { From a564b285675113ddd095f5109781bf2f5788c140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 12:33:13 +0200 Subject: [PATCH 11/26] Fix --- scripts/install | 8 ++++---- scripts/upgrade | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index 7d22d53..bd2c9cc 100644 --- a/scripts/install +++ b/scripts/install @@ -91,7 +91,7 @@ ynh_setup_source --dest_dir="$final_path" mkdir -p $final_path/sessions/ chmod 750 "$final_path" -chown -R $app $final_path/{data,plugins,sessions} +#chown -R $app $final_path/{data,plugins,sessions} chmod -R 700 $final_path/sessions chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" @@ -163,10 +163,10 @@ ynh_script_progression --message="Configuring SSOwat..." --weight=2 if [ $is_public -eq 1 ] then ynh_permission_update --permission="main" --add="visitors" - ynh_replace_string --match_string="define('LDAP_AUTH'.*$" --replace_string="define('LDAP_AUTH', true);" --target_file="$final_path/data/config.php" - ynh_replace_string --match_string="define('HIDE_LOGIN_FORM'.*$" --replace_string="define('HIDE_LOGIN_FORM', false);" --target_file="$final_path/data/config.php" + ynh_replace_string --match_string="define('LDAP_AUTH'.*$" --replace_string="define('LDAP_AUTH', true);" --target_file="$final_path/data/config.php" + ynh_replace_string --match_string="define('HIDE_LOGIN_FORM'.*$" --replace_string="define('HIDE_LOGIN_FORM', false);" --target_file="$final_path/data/config.php" ynh_replace_string --match_string="define('REMEMBER_ME_AUTH'.*$" --replace_string="define('REMEMBER_ME_AUTH', true);" --target_file="$final_path/data/config.php" - ynh_replace_string --match_string="define('DISABLE_LOGOUT'.*$" --replace_string="define('DISABLE_LOGOUT', false);" --target_file="$final_path/data/config.php" + ynh_replace_string --match_string="define('DISABLE_LOGOUT'.*$" --replace_string="define('DISABLE_LOGOUT', false);" --target_file="$final_path/data/config.php" else ynh_app_setting_set --app=$app --key=unprotected_uris --value="/jsonrpc.php" fi diff --git a/scripts/upgrade b/scripts/upgrade index 1336efd..7695f52 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -158,10 +158,10 @@ ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=2 if [ $is_public -eq 1 ] then ynh_permission_update --permission="main" --add="visitors" - ynh_replace_string --match_string="define('LDAP_AUTH'.*$" --replace_string="define('LDAP_AUTH', true);" --target_file="$final_path/data/config.php" - ynh_replace_string --match_string="define('HIDE_LOGIN_FORM'.*$" --replace_string="define('HIDE_LOGIN_FORM', false);" --target_file="$final_path/data/config.php" + ynh_replace_string --match_string="define('LDAP_AUTH'.*$" --replace_string="define('LDAP_AUTH', true);" --target_file="$final_path/data/config.php" + ynh_replace_string --match_string="define('HIDE_LOGIN_FORM'.*$" --replace_string="define('HIDE_LOGIN_FORM', false);" --target_file="$final_path/data/config.php" ynh_replace_string --match_string="define('REMEMBER_ME_AUTH'.*$" --replace_string="define('REMEMBER_ME_AUTH', true);" --target_file="$final_path/data/config.php" - ynh_replace_string --match_string="define('DISABLE_LOGOUT'.*$" --replace_string="define('DISABLE_LOGOUT', false);" --target_file="$final_path/data/config.php" + ynh_replace_string --match_string="define('DISABLE_LOGOUT'.*$" --replace_string="define('DISABLE_LOGOUT', false);" --target_file="$final_path/data/config.php" else ynh_app_setting_set --app=$app --key=unprotected_uris --value="/jsonrpc.php" fi From 9a2da621b4666c8381e0bf97059c59fcc11017f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 12:36:32 +0200 Subject: [PATCH 12/26] Cron --- conf/cron | 2 ++ conf/cron_kanboard | 2 -- scripts/install | 4 ++-- scripts/restore | 1 + scripts/upgrade | 6 +++--- 5 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 conf/cron delete mode 100644 conf/cron_kanboard diff --git a/conf/cron b/conf/cron new file mode 100644 index 0000000..fcdcbf0 --- /dev/null +++ b/conf/cron @@ -0,0 +1,2 @@ +# Execute the daily cronjob at 8am +0 8 * * * __APP__ /usr/bin/php__PHPVERSION__ __FINALPATH__/cli cronjob > /dev/null diff --git a/conf/cron_kanboard b/conf/cron_kanboard deleted file mode 100644 index 9d2d511..0000000 --- a/conf/cron_kanboard +++ /dev/null @@ -1,2 +0,0 @@ -# Execute the daily cronjob at 8am -0 8 * * * __APP__ cd "__FINALPATH__" && PHP__PHPVERSION__ ./cli cronjob >/dev/null 2>&1 diff --git a/scripts/install b/scripts/install index bd2c9cc..d23958d 100644 --- a/scripts/install +++ b/scripts/install @@ -150,8 +150,8 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-error.log" --failregex #================================================= ynh_script_progression --message="Setuping a cron..." --weight=1 -ynh_add_config --template="../conf/cron_kanboard" --destination="/etc/cron.d/$app" - +ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" #================================================= diff --git a/scripts/restore b/scripts/restore index d060594..80f53a3 100644 --- a/scripts/restore +++ b/scripts/restore @@ -107,6 +107,7 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Restoring the cron file..." --weight=2 ynh_restore_file --origin_path="/etc/cron.d/$app" +chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 7695f52..64d87f1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -143,10 +143,10 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-error.log" --failregex #================================================= # SETUP CRON #================================================= -ynh_script_progression --message="Setuping a cron..." - -ynh_add_config --template="../conf/cron_kanboard" --destination="/etc/cron.d/$app" +ynh_script_progression --message="Setuping a cron..." --weight=2 +ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" #================================================= From ce4b5bf2e76e3694a5e48734a6443737dfdc773a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 13:25:31 +0200 Subject: [PATCH 13/26] Fix --- scripts/install | 18 +++++++++--------- scripts/upgrade | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/scripts/install b/scripts/install index d23958d..5665632 100644 --- a/scripts/install +++ b/scripts/install @@ -91,7 +91,7 @@ ynh_setup_source --dest_dir="$final_path" mkdir -p $final_path/sessions/ chmod 750 "$final_path" -#chown -R $app $final_path/{data,plugins,sessions} +chown -R $app $final_path/{data,plugins,sessions} chmod -R 700 $final_path/sessions chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" @@ -121,10 +121,10 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) ynh_script_progression --message="Configuring Kanboard..." dir="__DIR__" -ynh_add_config --template="../conf/config.php" --destination="$final_path/data/config.php" +ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php" -chmod 400 "$final_path/data/config.php" -chown $app "$final_path/data/config.php" +chmod 400 "$final_path/config.php" +chown $app "$final_path/config.php" #================================================= # DATABASE INITIALIZATION @@ -163,16 +163,16 @@ ynh_script_progression --message="Configuring SSOwat..." --weight=2 if [ $is_public -eq 1 ] then ynh_permission_update --permission="main" --add="visitors" - ynh_replace_string --match_string="define('LDAP_AUTH'.*$" --replace_string="define('LDAP_AUTH', true);" --target_file="$final_path/data/config.php" - ynh_replace_string --match_string="define('HIDE_LOGIN_FORM'.*$" --replace_string="define('HIDE_LOGIN_FORM', false);" --target_file="$final_path/data/config.php" - ynh_replace_string --match_string="define('REMEMBER_ME_AUTH'.*$" --replace_string="define('REMEMBER_ME_AUTH', true);" --target_file="$final_path/data/config.php" - ynh_replace_string --match_string="define('DISABLE_LOGOUT'.*$" --replace_string="define('DISABLE_LOGOUT', false);" --target_file="$final_path/data/config.php" + ynh_replace_string --match_string="define('LDAP_AUTH'.*$" --replace_string="define('LDAP_AUTH', true);" --target_file="$final_path/config.php" + ynh_replace_string --match_string="define('HIDE_LOGIN_FORM'.*$" --replace_string="define('HIDE_LOGIN_FORM', false);" --target_file="$final_path/config.php" + ynh_replace_string --match_string="define('REMEMBER_ME_AUTH'.*$" --replace_string="define('REMEMBER_ME_AUTH', true);" --target_file="$final_path/config.php" + ynh_replace_string --match_string="define('DISABLE_LOGOUT'.*$" --replace_string="define('DISABLE_LOGOUT', false);" --target_file="$final_path/config.php" else ynh_app_setting_set --app=$app --key=unprotected_uris --value="/jsonrpc.php" fi # Calculate and store the config file checksum into the app settings -ynh_store_file_checksum --file="$final_path/data/config.php" +ynh_store_file_checksum --file="$final_path/config.php" #================================================= # RELOAD NGINX diff --git a/scripts/upgrade b/scripts/upgrade index 64d87f1..5c72a38 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -87,7 +87,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=3 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="$final_path/data/config.php" + ynh_setup_source --dest_dir="$final_path" --keep="$final_path/data $final_path/config.php" fi mkdir -p $final_path/sessions/ @@ -158,10 +158,10 @@ ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=2 if [ $is_public -eq 1 ] then ynh_permission_update --permission="main" --add="visitors" - ynh_replace_string --match_string="define('LDAP_AUTH'.*$" --replace_string="define('LDAP_AUTH', true);" --target_file="$final_path/data/config.php" - ynh_replace_string --match_string="define('HIDE_LOGIN_FORM'.*$" --replace_string="define('HIDE_LOGIN_FORM', false);" --target_file="$final_path/data/config.php" - ynh_replace_string --match_string="define('REMEMBER_ME_AUTH'.*$" --replace_string="define('REMEMBER_ME_AUTH', true);" --target_file="$final_path/data/config.php" - ynh_replace_string --match_string="define('DISABLE_LOGOUT'.*$" --replace_string="define('DISABLE_LOGOUT', false);" --target_file="$final_path/data/config.php" + ynh_replace_string --match_string="define('LDAP_AUTH'.*$" --replace_string="define('LDAP_AUTH', true);" --target_file="$final_path/config.php" + ynh_replace_string --match_string="define('HIDE_LOGIN_FORM'.*$" --replace_string="define('HIDE_LOGIN_FORM', false);" --target_file="$final_path/config.php" + ynh_replace_string --match_string="define('REMEMBER_ME_AUTH'.*$" --replace_string="define('REMEMBER_ME_AUTH', true);" --target_file="$final_path/config.php" + ynh_replace_string --match_string="define('DISABLE_LOGOUT'.*$" --replace_string="define('DISABLE_LOGOUT', false);" --target_file="$final_path/config.php" else ynh_app_setting_set --app=$app --key=unprotected_uris --value="/jsonrpc.php" fi From 0e53cfe1d522b7123b3b6c3b6cc547dcfed51398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 13:33:28 +0200 Subject: [PATCH 14/26] Fix --- check_process | 7 ++++--- doc/DESCRIPTION.md | 9 +++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 doc/DESCRIPTION.md diff --git a/check_process b/check_process index 82cfcb1..5ca5d45 100644 --- a/check_process +++ b/check_process @@ -12,11 +12,12 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=c20bdd69644de72736cdc4438a36faab9ab24c72 + #1.2.21~ynh3 + upgrade=1 from_commit=b667e4d5fd9cc860f706ad7e4e41208cf1d04f2a backup_restore=1 multi_instance=1 change_url=1 ;;; Upgrade options - ; commit=c20bdd69644de72736cdc4438a36faab9ab24c72 - name=Merge pull request #114 from YunoHost-Apps/testing + ; commit=b667e4d5fd9cc860f706ad7e4e41208cf1d04f2a + name=Merge pull request #133 from YunoHost-Apps/testing manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=Yes& diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..f5d50c7 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1,9 @@ +Kanboard is a free and open source Kanban project management software. + +### Features + +- Visualize your work +- Limit your work in progress to focus on your goal +- Drag and drop tasks to manage your project +- Self-hosted +- Super simple installation From 6da68755a037b11b7b9eddeeb5121e378a1361b6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 6 Jun 2022 11:33:35 +0000 Subject: [PATCH 15/26] Auto-update README --- README.md | 11 ++++++++++- README_fr.md | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4ebae31..a45afa4 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,16 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Kanban project management software +Kanboard is a free and open source Kanban project management software. + +### Features + +- Visualize your work +- Limit your work in progress to focus on your goal +- Drag and drop tasks to manage your project +- Self-hosted +- Super simple installation + **Shipped version:** 1.2.22~ynh1 diff --git a/README_fr.md b/README_fr.md index a2f3ae1..4cbdb49 100644 --- a/README_fr.md +++ b/README_fr.md @@ -15,7 +15,16 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Logiciel de gestion de projet Kanban +Kanboard is a free and open source Kanban project management software. + +### Features + +- Visualize your work +- Limit your work in progress to focus on your goal +- Drag and drop tasks to manage your project +- Self-hosted +- Super simple installation + **Version incluse :** 1.2.22~ynh1 From b5cc3a37f876ecc3fcea47efa0f0ebf2e59246d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 13:34:26 +0200 Subject: [PATCH 16/26] Create DESCRIPTION_fr.md --- doc/DESCRIPTION_fr.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/DESCRIPTION_fr.md diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..9f3a2a6 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1,8 @@ +Kanboard est un logiciel de gestion de projet Kanban gratuit et open source. + +### Fonctionnalités + +- Visualisez votre travail +- Limitez votre travail en cours pour vous concentrer sur votre objectif +- Glisser et déposez des tâches pour gérer votre projet +- Auto-hébergé From a26dc1e9ea2d925838d2a30aaa22e5a0ee35f5c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 13:37:27 +0200 Subject: [PATCH 17/26] Update config.php --- conf/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.php b/conf/config.php index 99a69b6..4a618f1 100644 --- a/conf/config.php +++ b/conf/config.php @@ -7,7 +7,7 @@ define('DATA_DIR', __DIR__.DIRECTORY_SEPARATOR.'data'); define('DEBUG', false); // Available log drivers: syslog, stderr, stdout or file -define('LOG_DRIVER', ''); +define('LOG_DRIVER', 'file'); // Log filename if the log driver is "file" define('LOG_FILE', DATA_DIR.DIRECTORY_SEPARATOR.'debug.log'); From 5f389ffa74ffff0f470967cf8d930c2e203f8ce5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 6 Jun 2022 11:37:33 +0000 Subject: [PATCH 18/26] Auto-update README --- README_fr.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/README_fr.md b/README_fr.md index 4cbdb49..dbe147d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -15,15 +15,14 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Kanboard is a free and open source Kanban project management software. +Kanboard est un logiciel de gestion de projet Kanban gratuit et open source. -### Features +### Fonctionnalités -- Visualize your work -- Limit your work in progress to focus on your goal -- Drag and drop tasks to manage your project -- Self-hosted -- Super simple installation +- Visualisez votre travail +- Limitez votre travail en cours pour vous concentrer sur votre objectif +- Glisser et déposez des tâches pour gérer votre projet +- Auto-hébergé **Version incluse :** 1.2.22~ynh1 From 65f4ea023ed341e00f1f800e890916a5458e6a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 14:44:35 +0200 Subject: [PATCH 19/26] Update config.php --- conf/config.php | 52 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/conf/config.php b/conf/config.php index 4a618f1..e47840a 100644 --- a/conf/config.php +++ b/conf/config.php @@ -1,24 +1,32 @@ Date: Mon, 6 Jun 2022 14:50:11 +0200 Subject: [PATCH 20/26] Update config.php --- conf/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.php b/conf/config.php index e47840a..1060ce3 100644 --- a/conf/config.php +++ b/conf/config.php @@ -102,7 +102,7 @@ define('DB_TIMEOUT', null); define('LDAP_AUTH', false); // LDAP server protocol, hostname and port URL (ldap[s]://hostname:port) -define('LDAP_SERVER', 'ldap://hostname:389'); +define('LDAP_SERVER', 'ldap://127.0.0.1:389'); // By default, require certificate to be verified for ldaps:// style URL. Set to false to skip the verification define('LDAP_SSL_VERIFY', true); From 7038a4803d09eb9937937258f8f20b559deca692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 15:19:52 +0200 Subject: [PATCH 21/26] Fix --- scripts/install | 16 ++++++++-------- scripts/restore | 14 +++++++------- scripts/upgrade | 36 +++++++++--------------------------- 3 files changed, 24 insertions(+), 42 deletions(-) diff --git a/scripts/install b/scripts/install index 5665632..cd143a6 100644 --- a/scripts/install +++ b/scripts/install @@ -96,14 +96,6 @@ chmod -R 700 $final_path/sessions chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=2 - -# Create a dedicated nginx config -ynh_add_nginx_config - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -113,6 +105,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=16 ynh_add_fpm_config phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Configuring NGINX web server..." --weight=2 + +# Create a dedicated nginx config +ynh_add_nginx_config + #================================================= # SPECIFIC SETUP #================================================= diff --git a/scripts/restore b/scripts/restore index 80f53a3..439307e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -39,13 +39,6 @@ test ! -d $final_path \ #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -73,6 +66,13 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # SPECIFIC RESTORATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 5c72a38..2a2c2f1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,10 +19,9 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) -is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +phpversion=$YNH_PHP_VERSION #================================================= # CHECK VERSION @@ -98,6 +97,14 @@ chmod -R 700 $final_path/sessions chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" +#================================================= +# PHP-FPM CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=5 + +# Create a dedicated PHP-FPM config +ynh_add_fpm_config + #================================================= # NGINX CONFIGURATION #================================================= @@ -113,14 +120,6 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=3 ynh_install_app_dependencies $pkg_dependencies -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=5 - -# Create a dedicated PHP-FPM config -ynh_add_fpm_config - #================================================= # UPGRADE KANBOARD #================================================= @@ -149,23 +148,6 @@ ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=2 - -# Make app public or private -if [ $is_public -eq 1 ] -then - ynh_permission_update --permission="main" --add="visitors" - ynh_replace_string --match_string="define('LDAP_AUTH'.*$" --replace_string="define('LDAP_AUTH', true);" --target_file="$final_path/config.php" - ynh_replace_string --match_string="define('HIDE_LOGIN_FORM'.*$" --replace_string="define('HIDE_LOGIN_FORM', false);" --target_file="$final_path/config.php" - ynh_replace_string --match_string="define('REMEMBER_ME_AUTH'.*$" --replace_string="define('REMEMBER_ME_AUTH', true);" --target_file="$final_path/config.php" - ynh_replace_string --match_string="define('DISABLE_LOGOUT'.*$" --replace_string="define('DISABLE_LOGOUT', false);" --target_file="$final_path/config.php" -else - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/jsonrpc.php" -fi - #================================================= # RELOAD NGINX #================================================= From 8407b85abe154778db571a6cbbed236de825980c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 15:20:12 +0200 Subject: [PATCH 22/26] Update install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index cd143a6..9cd4e64 100644 --- a/scripts/install +++ b/scripts/install @@ -29,6 +29,7 @@ path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC admin=$YNH_APP_ARG_ADMIN email=$(ynh_user_get_info --username=$admin --key=mail) +phpversion=$YNH_PHP_VERSION app=$YNH_APP_INSTANCE_NAME From 9aeaf6183822b117bf9593d013e046e12d5839cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 15:58:25 +0200 Subject: [PATCH 23/26] Update upgrade --- scripts/upgrade | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 2a2c2f1..6ab10ff 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -97,6 +97,14 @@ chmod -R 700 $final_path/sessions chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" + +#================================================= +# UPGRADE DEPENDENCIES +#================================================= +ynh_script_progression --message="Upgrading dependencies..." --weight=3 + +ynh_install_app_dependencies $pkg_dependencies + #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -113,13 +121,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=3 - -ynh_install_app_dependencies $pkg_dependencies - #================================================= # UPGRADE KANBOARD #================================================= From de0c4df18b5fffeaa0e511b54ea1930434267bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 15:58:42 +0200 Subject: [PATCH 24/26] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 96711e7..168ac6c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ YNH_PHP_VERSION="8.0" -pkg_dependencies="php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-opcache php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-ldap" +pkg_dependencies="php${YNH_PHP_VERSION}-fpm php${YNH_PHP_VERSION}-opcache php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-ldap" #================================================= # PERSONAL HELPERS From 0b3fe969e19d31c6af07db3ac1af57be2015aa1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Jun 2022 16:13:41 +0200 Subject: [PATCH 25/26] Fix --- scripts/install | 7 ++++--- scripts/remove | 2 +- scripts/restore | 2 +- scripts/upgrade | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index 9cd4e64..b2426e7 100644 --- a/scripts/install +++ b/scripts/install @@ -119,7 +119,7 @@ ynh_add_nginx_config #================================================= # CREATE CONFIG.PHP #================================================= -ynh_script_progression --message="Configuring Kanboard..." +ynh_script_progression --message="Configuring the app..." dir="__DIR__" ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php" @@ -158,7 +158,7 @@ chmod 644 "/etc/cron.d/$app" #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." --weight=2 +ynh_script_progression --message="Configuring permissions..." --weight=2 # Make app public or private if [ $is_public -eq 1 ] @@ -169,7 +169,8 @@ then ynh_replace_string --match_string="define('REMEMBER_ME_AUTH'.*$" --replace_string="define('REMEMBER_ME_AUTH', true);" --target_file="$final_path/config.php" ynh_replace_string --match_string="define('DISABLE_LOGOUT'.*$" --replace_string="define('DISABLE_LOGOUT', false);" --target_file="$final_path/config.php" else - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/jsonrpc.php" + ynh_permission_update --permission="main" --url="/jsonrpc.php" --add="visitors" + #ynh_app_setting_set --app=$app --key=unprotected_uris --value="/jsonrpc.php" fi # Calculate and store the config file checksum into the app settings diff --git a/scripts/remove b/scripts/remove index cfcdb59..0ea5c65 100644 --- a/scripts/remove +++ b/scripts/remove @@ -42,7 +42,7 @@ ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing Kanboard main directory..." +ynh_script_progression --message="Removing the app main directory..." # Remove the app directory securely ynh_secure_remove --file="$final_path" diff --git a/scripts/restore b/scripts/restore index 439307e..925e75f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -50,7 +50,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring Kanboard main directory..." --weight=5 +ynh_script_progression --message="Restoring the app main directory..." --weight=5 ynh_restore_file --origin_path="$final_path" diff --git a/scripts/upgrade b/scripts/upgrade index 6ab10ff..e8c7d16 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -32,7 +32,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up Kanboard before upgrading (may take a while)..." --weight=5 +ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=5 # Backup the current version of the app ynh_backup_before_upgrade @@ -124,7 +124,7 @@ ynh_add_nginx_config #================================================= # UPGRADE KANBOARD #================================================= -ynh_script_progression --message="Upgrading Kanboard..." --weight=2 +ynh_script_progression --message="Upgrading the app..." --weight=2 pushd $final_path # Launch database migration From f52ae4d0738945a955004b649565acb04b3176c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 9 Jun 2022 13:51:38 +0200 Subject: [PATCH 26/26] Update install --- scripts/install | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index b2426e7..cb74c22 100644 --- a/scripts/install +++ b/scripts/install @@ -169,8 +169,7 @@ then ynh_replace_string --match_string="define('REMEMBER_ME_AUTH'.*$" --replace_string="define('REMEMBER_ME_AUTH', true);" --target_file="$final_path/config.php" ynh_replace_string --match_string="define('DISABLE_LOGOUT'.*$" --replace_string="define('DISABLE_LOGOUT', false);" --target_file="$final_path/config.php" else - ynh_permission_update --permission="main" --url="/jsonrpc.php" --add="visitors" - #ynh_app_setting_set --app=$app --key=unprotected_uris --value="/jsonrpc.php" + ynh_app_setting_set --app=$app --key=unprotected_uris --value="/jsonrpc.php" fi # Calculate and store the config file checksum into the app settings