From c33ffccc6974e6ccc71a9f19d27924984ec2b192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 00:08:37 +0200 Subject: [PATCH 01/24] Update manifest.toml --- manifest.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.toml b/manifest.toml index 2e06c03..d44c71d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -56,6 +56,7 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" + main.auth_header = false ics.url = "/?controller=ICalendarController" ics.show_tile = false ics.allowed = "visitors" From d2d694caedbc400a00c382857531d7a8c40d94a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 00:13:55 +0200 Subject: [PATCH 02/24] fix --- conf/config.php | 6 +++--- manifest.toml | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/conf/config.php b/conf/config.php index 1060ce3..f38a763 100644 --- a/conf/config.php +++ b/conf/config.php @@ -42,7 +42,7 @@ define('FILES_DIR', DATA_DIR.DIRECTORY_SEPARATOR.'files'); define('MAIL_CONFIGURATION', true); // E-mail address used for the "From" header (notifications) -define('MAIL_FROM', '__EMAIL__'); +define('MAIL_FROM', '__APP__@__DOMAIN__'); // E-mail address used for the "Bcc" header to send a copy of all notifications define('MAIL_BCC', ''); @@ -53,8 +53,8 @@ define('MAIL_TRANSPORT', 'mail'); // SMTP configuration to use when the "smtp" transport is chosen define('MAIL_SMTP_HOSTNAME', 'localhost'); define('MAIL_SMTP_PORT', 25); -define('MAIL_SMTP_USERNAME', ''); -define('MAIL_SMTP_PASSWORD', ''); +define('MAIL_SMTP_USERNAME', '__APP__'); +define('MAIL_SMTP_PASSWORD', '__MAIL_PWD__'); define('MAIL_SMTP_ENCRYPTION', null); // Valid values are "null", "ssl" or "tls" // Sendmail command to use when the transport is "sendmail" diff --git a/manifest.toml b/manifest.toml index d44c71d..c2a3df8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -51,7 +51,8 @@ ram.runtime = "50M" autoupdate.strategy = "latest_github_tag" [resources.system_user] - + allow_email = true + [resources.install_dir] [resources.permissions] From f30ad61ab3cb1865ef4d90a92612b78166d62e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 00:15:19 +0200 Subject: [PATCH 03/24] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index d44c71d..b2fae68 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Kanboard" description.en = "Kanban project management software" description.fr = "Logiciel de gestion de projet Kanban" -version = "1.2.33~ynh2" +version = "1.2.33~ynh3" maintainers = [] From d0a4b393ad3cad013e1c17cee2934e1f7a8d32e9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 23 Oct 2023 22:15:24 +0000 Subject: [PATCH 04/24] 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 065dc13..15ecdda 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Kanboard is a free and open source Kanban project management software. - Drag and drop tasks to manage your project -**Shipped version:** 1.2.33~ynh2 +**Shipped version:** 1.2.33~ynh3 **Demo:** https://demo.yunohost.org/kanboard/ diff --git a/README_fr.md b/README_fr.md index 3ede8f7..196ddb9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,7 @@ Kanboard est un logiciel de gestion de projet Kanban gratuit et open source. - Glisser et déposez des tâches pour gérer votre projet -**Version incluse :** 1.2.33~ynh2 +**Version incluse :** 1.2.33~ynh3 **Démo :** https://demo.yunohost.org/kanboard/ From f1d7e7a3b63169062834b9dcb5775108cbe6c77a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:06:06 +0200 Subject: [PATCH 05/24] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index b2fae68..b195ca3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -36,7 +36,7 @@ ram.runtime = "50M" [install.init_main_permission] type = "group" - default = false + default = "visitors" [install.admin] type = "user" From 239de9d8f09c42934610c2ff61fb1dd489e55260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:14:32 +0200 Subject: [PATCH 06/24] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index b195ca3..28dccd4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -56,7 +56,7 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - main.auth_header = false + #main.auth_header = false ics.url = "/?controller=ICalendarController" ics.show_tile = false ics.allowed = "visitors" From 8e84dd99f03fad66ead74a6bb92bf96a9edfb7be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:15:10 +0200 Subject: [PATCH 07/24] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 1af8129..d6b79f8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -57,7 +57,7 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - main.auth_header = false + #main.auth_header = false ics.url = "/?controller=ICalendarController" ics.show_tile = false ics.allowed = "visitors" From 7ca19cb1b06103e960e9f96a0e374f320e407334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:21:43 +0200 Subject: [PATCH 08/24] 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 f38a763..74318d9 100644 --- a/conf/config.php +++ b/conf/config.php @@ -48,7 +48,7 @@ define('MAIL_FROM', '__APP__@__DOMAIN__'); define('MAIL_BCC', ''); // Mail transport available: "smtp", "sendmail", "mail" (PHP mail function), "postmark", "mailgun", "sendgrid" -define('MAIL_TRANSPORT', 'mail'); +define('MAIL_TRANSPORT', 'smtp'); // SMTP configuration to use when the "smtp" transport is chosen define('MAIL_SMTP_HOSTNAME', 'localhost'); From 5e74e7e2e960d2eb5c2cd4e728dec36cb13b4444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:30:24 +0200 Subject: [PATCH 09/24] Update config.php --- conf/config.php | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/conf/config.php b/conf/config.php index 1060ce3..80d68d0 100644 --- a/conf/config.php +++ b/conf/config.php @@ -53,9 +53,16 @@ define('MAIL_TRANSPORT', 'mail'); // SMTP configuration to use when the "smtp" transport is chosen define('MAIL_SMTP_HOSTNAME', 'localhost'); define('MAIL_SMTP_PORT', 25); +<<<<<<< Updated upstream define('MAIL_SMTP_USERNAME', ''); define('MAIL_SMTP_PASSWORD', ''); define('MAIL_SMTP_ENCRYPTION', null); // Valid values are "null", "ssl" or "tls" +======= +define('MAIL_SMTP_USERNAME', '__APP__'); +define('MAIL_SMTP_PASSWORD', '__MAIL_PWD__'); +define('MAIL_SMTP_HELO_NAME', null); // valid: null (default), or FQDN +define('MAIL_SMTP_ENCRYPTION', null); // Valid values are null (not a string "null"), "ssl" or "tls" +>>>>>>> Stashed changes // Sendmail command to use when the transport is "sendmail" define('MAIL_SENDMAIL_COMMAND', '/usr/sbin/sendmail -bs'); @@ -65,22 +72,22 @@ define('MAIL_SENDMAIL_COMMAND', '/usr/sbin/sendmail -bs'); // Do not run the migrations from multiple processes at the same time (example: web page + background worker) define('DB_RUN_MIGRATIONS', false); -// Database driver: sqlite, mysql or postgres (sqlite by default) +// Database driver: sqlite, mysql, postgres, odbc, dblib, or mssql (sqlite by default) define('DB_DRIVER', 'mysql'); -// Mysql/Postgres username +// Database username define('DB_USERNAME', '__DB_USER__'); -// Mysql/Postgres password +// Database password define('DB_PASSWORD', '__DB_PWD__'); -// Mysql/Postgres hostname +// Database hostname define('DB_HOSTNAME', 'localhost'); -// Mysql/Postgres database name +// Database database name define('DB_NAME', '__DB_NAME__'); -// Mysql/Postgres custom port (null = default port) +// Database custom port (null = default port) define('DB_PORT', null); // Mysql SSL key @@ -98,11 +105,17 @@ define('DB_VERIFY_SERVER_CERT', null); // Timeout value for PDO attribute define('DB_TIMEOUT', null); +// ODBC DSN (default: kanboard) +define('DB_ODBC_DSN', 'kanboard'); + // Enable LDAP authentication (false by default) define('LDAP_AUTH', false); // LDAP server protocol, hostname and port URL (ldap[s]://hostname:port) -define('LDAP_SERVER', 'ldap://127.0.0.1:389'); +define('LDAP_SERVER', ''); + +// LDAP server port (389 by default) +define('LDAP_PORT', 389); // By default, require certificate to be verified for ldaps:// style URL. Set to false to skip the verification define('LDAP_SSL_VERIFY', true); @@ -135,7 +148,7 @@ define('LDAP_USER_BASE_DN', 'ou=users,dc=yunohost,dc=org'); define('LDAP_USER_FILTER', 'uid=%s'); // LDAP attribute for username -// Example for ActiveDirectory: 'samaccountname' +// Example for ActiveDirectory: 'sAMAccountName' // Example for OpenLDAP: 'uid' define('LDAP_USER_ATTRIBUTE_USERNAME', 'uid'); @@ -207,9 +220,12 @@ define('REVERSE_PROXY_USER_HEADER', 'REMOTE_USER'); // Username of the admin, by default blank define('REVERSE_PROXY_DEFAULT_ADMIN', '__ADMIN__'); -// Header name to use for the username +// Header name to use for the user email define('REVERSE_PROXY_EMAIL_HEADER', 'REMOTE_EMAIL'); +// Header name to use for the user full name +define('REVERSE_PROXY_FULLNAME_HEADER', 'REMOTE_NAME'); + // Default domain to use for setting the email address define('REVERSE_PROXY_DEFAULT_DOMAIN', '__DOMAIN__'); From 5692d8df14a99d525ac8f1a34a2972a046afb9a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:31:45 +0200 Subject: [PATCH 10/24] Update config.php --- conf/config.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/conf/config.php b/conf/config.php index 80d68d0..32da5ae 100644 --- a/conf/config.php +++ b/conf/config.php @@ -53,16 +53,9 @@ define('MAIL_TRANSPORT', 'mail'); // SMTP configuration to use when the "smtp" transport is chosen define('MAIL_SMTP_HOSTNAME', 'localhost'); define('MAIL_SMTP_PORT', 25); -<<<<<<< Updated upstream define('MAIL_SMTP_USERNAME', ''); define('MAIL_SMTP_PASSWORD', ''); define('MAIL_SMTP_ENCRYPTION', null); // Valid values are "null", "ssl" or "tls" -======= -define('MAIL_SMTP_USERNAME', '__APP__'); -define('MAIL_SMTP_PASSWORD', '__MAIL_PWD__'); -define('MAIL_SMTP_HELO_NAME', null); // valid: null (default), or FQDN -define('MAIL_SMTP_ENCRYPTION', null); // Valid values are null (not a string "null"), "ssl" or "tls" ->>>>>>> Stashed changes // Sendmail command to use when the transport is "sendmail" define('MAIL_SENDMAIL_COMMAND', '/usr/sbin/sendmail -bs'); From 4a489302ac55c3f097be11bb1eda0b23f718a42f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:47:47 +0200 Subject: [PATCH 11/24] 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 e9be97b..4e4fdd3 100644 --- a/conf/config.php +++ b/conf/config.php @@ -42,7 +42,7 @@ define('FILES_DIR', DATA_DIR.DIRECTORY_SEPARATOR.'files'); define('MAIL_CONFIGURATION', true); // E-mail address used for the "From" header (notifications) -define('MAIL_FROM', '__APP__@__DOMAIN__'); +define('MAIL_FROM', 'noreply@__DOMAIN__'); // E-mail address used for the "Bcc" header to send a copy of all notifications define('MAIL_BCC', ''); From f27d05ca6dad0d858168b0dbf81455da83827913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:52:14 +0200 Subject: [PATCH 12/24] fix --- conf/config.php | 2 +- manifest.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/config.php b/conf/config.php index 4e4fdd3..fefd269 100644 --- a/conf/config.php +++ b/conf/config.php @@ -205,7 +205,7 @@ define('LDAP_GROUP_ATTRIBUTE_NAME', 'cn'); define('LDAP_GROUP_SYNC', true); // Enable/disable the reverse proxy authentication -define('REVERSE_PROXY_AUTH', true); +define('REVERSE_PROXY_AUTH', false); // Header name to use for the username define('REVERSE_PROXY_USER_HEADER', 'REMOTE_USER'); diff --git a/manifest.toml b/manifest.toml index d6b79f8..1af8129 100644 --- a/manifest.toml +++ b/manifest.toml @@ -57,7 +57,7 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - #main.auth_header = false + main.auth_header = false ics.url = "/?controller=ICalendarController" ics.show_tile = false ics.allowed = "visitors" From d7b51e7fbb61ca5eb55af77c0ecebf0f425592be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:54:32 +0200 Subject: [PATCH 13/24] Update manifest.toml --- manifest.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 1af8129..b04c07d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -57,7 +57,6 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - main.auth_header = false ics.url = "/?controller=ICalendarController" ics.show_tile = false ics.allowed = "visitors" From dd9f30978468159e01af7554608f3c19b7e22f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:56:57 +0200 Subject: [PATCH 14/24] 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 fefd269..4e4fdd3 100644 --- a/conf/config.php +++ b/conf/config.php @@ -205,7 +205,7 @@ define('LDAP_GROUP_ATTRIBUTE_NAME', 'cn'); define('LDAP_GROUP_SYNC', true); // Enable/disable the reverse proxy authentication -define('REVERSE_PROXY_AUTH', false); +define('REVERSE_PROXY_AUTH', true); // Header name to use for the username define('REVERSE_PROXY_USER_HEADER', 'REMOTE_USER'); From d6fb8b4ca01cd670846eeaa5f424d8c69938ee2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:57:59 +0200 Subject: [PATCH 15/24] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 160ea05..3840432 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -65,7 +65,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=5 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint # Create a dedicated NGINX config ynh_add_nginx_config From ad558e7a5718364727facfbfd1bd988d8c07aa4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 10:11:57 +0200 Subject: [PATCH 16/24] 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 4e4fdd3..03b79e6 100644 --- a/conf/config.php +++ b/conf/config.php @@ -105,7 +105,7 @@ define('DB_ODBC_DSN', 'kanboard'); define('LDAP_AUTH', false); // LDAP server protocol, hostname and port URL (ldap[s]://hostname:port) -define('LDAP_SERVER', ''); +define('LDAP_SERVER', 'ldap://127.0.0.1:389'); // LDAP server port (389 by default) define('LDAP_PORT', 389); From a3843c02236781fb3dcacbfb6b5747b62dfa9529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 10:15:40 +0200 Subject: [PATCH 17/24] Update install --- scripts/install | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/install b/scripts/install index d27de19..699ae44 100644 --- a/scripts/install +++ b/scripts/install @@ -13,7 +13,6 @@ source /usr/share/yunohost/helpers # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -email=$(ynh_user_get_info --username=$admin --key=mail) fpm_footprint="low" fpm_free_footprint=0 fpm_usage="low" From 61c11a03a1979ae9f730a2c22c275bd147216900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 10:16:09 +0200 Subject: [PATCH 18/24] Update restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 8ca511f..e6a9c09 100644 --- a/scripts/restore +++ b/scripts/restore @@ -47,7 +47,7 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" # Recreate a dedicated php-fpm config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint ynh_restore_file --origin_path="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" From 75f82c9caf81d3462eff53e1629d3e7fd76a9ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 10:16:29 +0200 Subject: [PATCH 19/24] Update restore --- scripts/restore | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/restore b/scripts/restore index e6a9c09..a54ac47 100644 --- a/scripts/restore +++ b/scripts/restore @@ -38,16 +38,13 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./ #================================================= ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 -ynh_restore_file --origin_path="/etc/fail2ban/jail.d/$app.conf" -ynh_restore_file --origin_path="/etc/fail2ban/filter.d/$app.conf" -ynh_systemd_action --action=restart --service_name=fail2ban - ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -# Recreate a dedicated php-fpm config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_restore_file --origin_path="/etc/fail2ban/jail.d/$app.conf" +ynh_restore_file --origin_path="/etc/fail2ban/filter.d/$app.conf" +ynh_systemd_action --action=restart --service_name=fail2ban ynh_restore_file --origin_path="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" From 1a15dd96ece85cff8a2bec6a8b83be21e3af3d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 10:17:12 +0200 Subject: [PATCH 20/24] Update upgrade --- scripts/upgrade | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3840432..d7a21e8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -70,6 +70,13 @@ ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint # Create a dedicated NGINX config ynh_add_nginx_config +# Create a dedicated Fail2Ban config +ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="^.*authentication failure\" while reading response header from upstream, client: ,.*$" --max_retry=5 + +ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +chown root: "/etc/cron.d/$app" +chmod 644 "/etc/cron.d/$app" + #================================================= # SPECIFIC UPGRADE #================================================= @@ -84,25 +91,6 @@ pushd $install_dir php$phpversion cli plugin:upgrade --no-interaction --verbose popd -#================================================= -# SETUP CRON -#================================================= -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" - -#================================================= -# GENERIC FINALIZATION -#================================================= -# UPGRADE FAIL2BAN -#================================================= -ynh_script_progression --message="Reconfiguring Fail2Ban..." --weight=7 - -# Create a dedicated Fail2Ban config -ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="^.*authentication failure\" while reading response header from upstream, client: ,.*$" --max_retry=5 - #================================================= # END OF SCRIPT #================================================= From 7b0066eca729d8513006cad2c0bc9ec58082ec3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 10:18:22 +0200 Subject: [PATCH 21/24] Update install --- scripts/install | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/scripts/install b/scripts/install index 699ae44..9bc25ac 100644 --- a/scripts/install +++ b/scripts/install @@ -51,6 +51,13 @@ ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint # Create a dedicated NGINX config ynh_add_nginx_config +ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +chown root: "/etc/cron.d/$app" +chmod 644 "/etc/cron.d/$app" + +# Create a dedicated Fail2Ban config +ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="^.*authentication failure\" while reading response header from upstream, client: ,.*$" --max_retry=5 + #================================================= # SPECIFIC SETUP #================================================= @@ -76,25 +83,6 @@ pushd $install_dir php$phpversion cli db:migrate --no-interaction --verbose popd -#================================================= -# SETUP CRON -#================================================= -ynh_script_progression --message="Setuping a cron..." --weight=1 - -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" -chown root: "/etc/cron.d/$app" -chmod 644 "/etc/cron.d/$app" - -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP FAIL2BAN -#================================================= -ynh_script_progression --message="Configuring Fail2Ban..." --weight=10 - -# Create a dedicated Fail2Ban config -ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="^.*authentication failure\" while reading response header from upstream, client: ,.*$" --max_retry=5 - #================================================= # END OF SCRIPT #================================================= From 65888453c1c7f5833c33532926073ce9f6a2f9b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 10:50:03 +0200 Subject: [PATCH 22/24] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index d7a21e8..7fde12f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -88,7 +88,7 @@ pushd $install_dir # Launch database migration php$phpversion cli db:migrate --no-interaction --verbose # Launch plugins migration - php$phpversion cli plugin:upgrade --no-interaction --verbose + #php$phpversion cli plugin:upgrade --no-interaction --verbose popd #================================================= From 71eee721e05a8ef7aead2c78527b1e42e961a056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 11:00:39 +0200 Subject: [PATCH 23/24] Update manifest.toml --- manifest.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index b04c07d..60cec35 100644 --- a/manifest.toml +++ b/manifest.toml @@ -13,8 +13,9 @@ maintainers = [] license = "MIT" website = "https://kanboard.net" demo = "https://demo.yunohost.org/kanboard/" -admindoc = "https://docs.kanboard.org/en/latest/" +admindoc = "https://docs.kanboard.org/" code = "https://github.com/kanboard/kanboard" +fund = "https://kanboard.org/#donations" [integration] yunohost = ">= 11.2" From d8c050457dd479f83557b047f2cdeffecc858e82 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 24 Oct 2023 09:00:48 +0000 Subject: [PATCH 24/24] 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 15ecdda..a502c56 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Kanboard is a free and open source Kanban project management software. ## Documentation and resources * Official app website: -* Official admin documentation: +* Official admin documentation: * Upstream app code repository: * Report a bug: diff --git a/README_fr.md b/README_fr.md index 196ddb9..647559e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -36,7 +36,7 @@ Kanboard est un logiciel de gestion de projet Kanban gratuit et open source. ## Documentations et ressources * Site officiel de l’app : -* Documentation officielle de l’admin : +* Documentation officielle de l’admin : * Dépôt de code officiel de l’app : * Signaler un bug :