From b1247f5df28e56494563cc86609de802645b3846 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 26 Feb 2021 12:26:48 +0100 Subject: [PATCH 01/20] Simplify config --- conf/config.php | 2 +- manifest.json | 4 ++-- scripts/install | 32 +++++++++++--------------------- scripts/upgrade | 30 ++++++++++-------------------- 4 files changed, 24 insertions(+), 44 deletions(-) diff --git a/conf/config.php b/conf/config.php index 49ef0ad..2a097d3 100644 --- a/conf/config.php +++ b/conf/config.php @@ -183,7 +183,7 @@ define('REVERSE_PROXY_AUTH', true); define('REVERSE_PROXY_USER_HEADER', 'REMOTE_USER'); // Username of the admin, by default blank -define('REVERSE_PROXY_DEFAULT_ADMIN', '__USER__'); +define('REVERSE_PROXY_DEFAULT_ADMIN', '__ADMIN__'); // Default domain to use for setting the email address define('REVERSE_PROXY_DEFAULT_DOMAIN', '__DOMAIN__'); diff --git a/manifest.json b/manifest.json index 6c012c3..55b259d 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "apps@yunohost.org" }, "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.0.0" }, "previous_maintainers": [{ "name": "mbugeia", @@ -27,7 +27,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.0-fpm", + "php7.3-fpm", "mysql" ], "arguments": { diff --git a/scripts/install b/scripts/install index 5ca045b..c7f2713 100644 --- a/scripts/install +++ b/scripts/install @@ -23,6 +23,7 @@ domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC +email=$(ynh_user_get_info --username=$admin --key=mail) app=$YNH_APP_INSTANCE_NAME @@ -45,7 +46,6 @@ ynh_script_progression --message="Storing installation settings..." 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=is_public --value=$is_public #================================================= # STANDARD MODIFICATIONS @@ -101,18 +101,10 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Configuring Kanboard..." -# Retrieve admin email -email=$(ynh_user_get_info --username=$admin --key=mail) - # Copy and edit config.php -config_php="${final_path}/config.php" +config_php="$final_path/config.php" -cp ../conf/config.php "$config_php" -ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$config_php" -ynh_replace_string --match_string="__DB_NAME__" --replace_string=$db_name --target_file="$config_php" -ynh_replace_string --match_string="__USER__" --replace_string=$admin --target_file="$config_php" -ynh_replace_string --match_string="__EMAIL__" --replace_string=$email --target_file="$config_php" -ynh_replace_string --match_string="__DOMAIN__" --replace_string=$domain --target_file="$config_php" +ynh_add_config --template="../conf/config.php" --destination="$config_php" #================================================= # DATABASE INITIALIZATION @@ -120,11 +112,11 @@ ynh_replace_string --match_string="__DOMAIN__" --replace_string=$domain --targ 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" -( - cd "$final_path" + +pushd $final_path # Launch database migration - php$YNH_PHP_VERSION cli db:migrate --no-interaction --verbose -) + php$phpversion cli db:migrate --no-interaction --verbose +popd #================================================= # GENERIC FINALIZATION @@ -147,12 +139,10 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-error.log" --failregex #================================================= # SETUP CRON #================================================= -ynh_script_progression --message="Setuping a cron..." +ynh_script_progression --message="Setuping a cron..." --weight=1 + +ynh_add_config --template="../conf/cron_kanboard" --destination="$/etc/cron.d/$app" -cp ../conf/cron_kanboard /etc/cron.d/$app -ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path/" --target_file="/etc/cron.d/$app" -ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="/etc/cron.d/$app" -ynh_replace_string --match_string="__PHPVERSION__" --replace_string="$phpversion" --target_file="/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" #================================================= @@ -178,7 +168,7 @@ ynh_store_file_checksum --file="$config_php" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 22f3485..e4a37dd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,7 +22,9 @@ admin=$(ynh_app_setting_get --app=$app --key=adminusername) 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 @@ -117,34 +119,24 @@ ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= ynh_script_progression --message="Reconfiguring Kanboard..." --weight=2 -# Retrieve admin email -email=$(ynh_user_get_info --username=$admin --key=mail) - # Copy and edit config.php -config_php="${final_path}/config.php" +config_php="$final_path/config.php" ynh_backup_if_checksum_is_different --file="$config_php" -cp ../conf/config.php "$config_php" -db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$config_php" -ynh_replace_string --match_string="__DB_NAME__" --replace_string=$db_name --target_file="$config_php" -ynh_replace_string --match_string="__USER__" --replace_string=$admin --target_file="$config_php" -ynh_replace_string --match_string="__EMAIL__" --replace_string=$email --target_file="$config_php" -ynh_replace_string --match_string="__DOMAIN__" --replace_string=$domain --target_file="$config_php" +ynh_add_config --template="../conf/config.php" --destination="$config_php" #================================================= # UPGRADE KANBOARD #================================================= ynh_script_progression --message="Upgrading Kanboard..." --weight=2 -( - cd "$final_path" +pushd $final_path # Launch database migration - php$YNH_PHP_VERSION cli db:migrate --no-interaction --verbose + php$phpversion cli db:migrate --no-interaction --verbose # Launch plugins migration - php$YNH_PHP_VERSION cli plugin:upgrade --no-interaction --verbose -) + php$phpversion cli plugin:upgrade --no-interaction --verbose +popd #================================================= # GENERIC FINALIZATION @@ -169,10 +161,8 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-error.log" --failregex #================================================= ynh_script_progression --message="Setuping a cron..." -cp ../conf/cron_kanboard /etc/cron.d/$app -ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path/" --target_file="/etc/cron.d/$app" -ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="/etc/cron.d/$app" -ynh_replace_string --match_string="__PHPVERSION__" --replace_string="$phpversion" --target_file="/etc/cron.d/$app" +ynh_add_config --template="../conf/cron_kanboard" --destination="$/etc/cron.d/$app" + chmod 644 "/etc/cron.d/$app" #================================================= From 170f6ab93d0802797712f3f0c1ecf5f035f31f7e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 15 Mar 2021 22:36:42 +0100 Subject: [PATCH 02/20] Fix linter --- manifest.json | 18 +----------------- pull_request_template.md | 12 ++---------- scripts/install | 16 ++++++++++++---- scripts/upgrade | 2 +- 4 files changed, 16 insertions(+), 32 deletions(-) diff --git a/manifest.json b/manifest.json index 55b259d..16a038e 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "apps@yunohost.org" }, "requirements": { - "yunohost": ">= 4.0.0" + "yunohost": ">= 4.1.7" }, "previous_maintainers": [{ "name": "mbugeia", @@ -35,38 +35,22 @@ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain name for Kanboard", - "fr": "Choisissez un nom de domaine pour Kanboard" - }, "example": "domain.org" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for Kanboard", - "fr": "Choisissez un chemin pour Kanboard" - }, "example": "/kanboard", "default": "/kanboard" }, { "name": "admin", "type": "user", - "ask": { - "en": "Choose the admin user", - "fr": "Choisissez l'administrateur" - }, "example": "johndoe" }, { "name": "is_public", "type": "boolean", - "ask": { - "en": "Is it a public application?", - "fr": "Est-ce une application publique ?" - }, "default": false } ] diff --git a/pull_request_template.md b/pull_request_template.md index cde4a25..0a198cf 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -11,14 +11,6 @@ - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. -## Validation +## Package_check results --- -*Minor decision* -- **Upgrade previous version** : -- [ ] **Code review** : -- [ ] **Approval (LGTM)** : -- [ ] **Approval (LGTM)** : -- **CI succeeded** : -[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/kanboard_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/kanboard_ynh%20PR-NUM-/) -*Please replace '-NUM-' in this link by the PR number.* -When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. +* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* diff --git a/scripts/install b/scripts/install index c7f2713..2333b50 100644 --- a/scripts/install +++ b/scripts/install @@ -101,10 +101,18 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Configuring Kanboard..." -# Copy and edit config.php -config_php="$final_path/config.php" +# Retrieve admin email +email=$(ynh_user_get_info --username=$admin --key=mail) -ynh_add_config --template="../conf/config.php" --destination="$config_php" +# Copy and edit config.php +config_php="${final_path}/config.php" + +cp ../conf/config.php "$config_php" +ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$config_php" +ynh_replace_string --match_string="__DB_NAME__" --replace_string=$db_name --target_file="$config_php" +ynh_replace_string --match_string="__USER__" --replace_string=$admin --target_file="$config_php" +ynh_replace_string --match_string="__EMAIL__" --replace_string=$email --target_file="$config_php" +ynh_replace_string --match_string="__DOMAIN__" --replace_string=$domain --target_file="$config_php" #================================================= # DATABASE INITIALIZATION @@ -153,7 +161,7 @@ ynh_script_progression --message="Configuring SSOwat..." --weight=2 # Make app public or private if [ $is_public -eq 1 ] then - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" + ynh_permission_update --permission="main" --add="visitors" ynh_replace_string --match_string="define('LDAP_AUTH'.*$" --replace_string="define('LDAP_AUTH', true);" --target_file="$config_php" ynh_replace_string --match_string="define('HIDE_LOGIN_FORM'.*$" --replace_string="define('HIDE_LOGIN_FORM', false);" --target_file="$config_php" ynh_replace_string --match_string="define('REMEMBER_ME_AUTH'.*$" --replace_string="define('REMEMBER_ME_AUTH', true);" --target_file="$config_php" diff --git a/scripts/upgrade b/scripts/upgrade index e4a37dd..d137cc1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -173,7 +173,7 @@ ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=2 # Make app public or private if [ $is_public -eq 1 ] then - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" + ynh_permission_update --permission="main" --add="visitors" ynh_replace_string --match_string="define('LDAP_AUTH'.*$" --replace_string="define('LDAP_AUTH', true);" --target_file="$config_php" ynh_replace_string --match_string="define('HIDE_LOGIN_FORM'.*$" --replace_string="define('HIDE_LOGIN_FORM', false);" --target_file="$config_php" ynh_replace_string --match_string="define('REMEMBER_ME_AUTH'.*$" --replace_string="define('REMEMBER_ME_AUTH', true);" --target_file="$config_php" From 26571eb1172a0a33cb816b2fe4b3ee96826da32d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 16 Mar 2021 07:21:30 +0100 Subject: [PATCH 03/20] Update install --- scripts/install | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/scripts/install b/scripts/install index 2333b50..3af19da 100644 --- a/scripts/install +++ b/scripts/install @@ -101,18 +101,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Configuring Kanboard..." -# Retrieve admin email -email=$(ynh_user_get_info --username=$admin --key=mail) - -# Copy and edit config.php -config_php="${final_path}/config.php" - -cp ../conf/config.php "$config_php" -ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$config_php" -ynh_replace_string --match_string="__DB_NAME__" --replace_string=$db_name --target_file="$config_php" -ynh_replace_string --match_string="__USER__" --replace_string=$admin --target_file="$config_php" -ynh_replace_string --match_string="__EMAIL__" --replace_string=$email --target_file="$config_php" -ynh_replace_string --match_string="__DOMAIN__" --replace_string=$domain --target_file="$config_php" +ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php" #================================================= # DATABASE INITIALIZATION From 7f351319f369ba17b2dddbb6db769c607a995b7b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 16 Mar 2021 07:26:45 +0100 Subject: [PATCH 04/20] Update upgrade --- scripts/upgrade | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index d137cc1..3393ba5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -37,15 +37,6 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -# Fix is_public as a boolean value -if [ "$is_public" = "Yes" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=1 - is_public=1 -elif [ "$is_public" = "No" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=0 - is_public=0 -fi - # If db_name doesn't exist, create it if [ -z "$db_name" ]; then db_name=$(ynh_sanitize_dbid --db_name=$app) @@ -58,6 +49,13 @@ if [ -z "$final_path" ]; then ynh_app_setting_set --app=$app --key=final_path --value=$final_path fi +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= From a6b10c3e8fa6970a277869082d02a3981d38c9c7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 8 May 2021 23:40:27 +0200 Subject: [PATCH 05/20] Update install --- scripts/install | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 3af19da..faade8e 100644 --- a/scripts/install +++ b/scripts/install @@ -101,7 +101,12 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Configuring Kanboard..." -ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php" +cp ../conf/config.php "$config_php" +ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$config_php" +ynh_replace_string --match_string="__DB_NAME__" --replace_string=$db_name --target_file="$config_php" +ynh_replace_string --match_string="__USER__" --replace_string=$admin --target_file="$config_php" +ynh_replace_string --match_string="__EMAIL__" --replace_string=$email --target_file="$config_php" +ynh_replace_string --match_string="__DOMAIN__" --replace_string=$domain --target_file="$config_php" #================================================= # DATABASE INITIALIZATION From e2645cf82590c2be792030d1eac1ed79f59b4f86 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 13 May 2021 17:48:19 +0200 Subject: [PATCH 06/20] [autopatch] Update issue and PR templates --- .../ISSUE_TEMPLATE.md | 8 +++---- .github/PULL_REQUEST_TEMPLATE.md | 16 +++++++++++++ pull_request_template.md | 24 ------------------- 3 files changed, 20 insertions(+), 28 deletions(-) rename issue_template.md => .github/ISSUE_TEMPLATE.md (91%) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 pull_request_template.md diff --git a/issue_template.md b/.github/ISSUE_TEMPLATE.md similarity index 91% rename from issue_template.md rename to .github/ISSUE_TEMPLATE.md index 53d9f38..2729a6b 100644 --- a/issue_template.md +++ b/.github/ISSUE_TEMPLATE.md @@ -6,11 +6,11 @@ about: When creating a bug report, please use the following template to provide **How to post a meaningful bug report** 1. *Read this whole template first.* -2. *Make sure you are on the right place:* +2. *Determine if you are on the right place:* - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* - - *In doubt, ask here and we will figure it out together.* -3. *Delete these italic comments as you write over them below, and remove this guide.* + - *When in doubt, post here and we will figure it out together.* +3. *Delete the italic comments as you write over them below, and remove this guide.* --- ### Describe the bug @@ -31,7 +31,7 @@ about: When creating a bug report, please use the following template to provide - *If you performed a command from the CLI, the command itself is enough. For example:* ```sh - sudo yunohost app install kanboard + sudo yunohost app install the_app ``` - *If you used the webadmin, please perform the equivalent command from the CLI first.* - *If the error occurs in your browser, explain what you did:* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index cde4a25..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,24 +0,0 @@ -## Problem -- *Description of why you made this PR* - -## Solution -- *And how you fix that* - -## PR Status -- [ ] Code finished. -- [ ] Tested with Package_check. -- [ ] Fix or enhancement tested. -- [ ] Upgrade from last version tested. -- [ ] Can be reviewed and tested. - -## Validation ---- -*Minor decision* -- **Upgrade previous version** : -- [ ] **Code review** : -- [ ] **Approval (LGTM)** : -- [ ] **Approval (LGTM)** : -- **CI succeeded** : -[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/kanboard_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/kanboard_ynh%20PR-NUM-/) -*Please replace '-NUM-' in this link by the PR number.* -When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. From a6de2a74ab71265afecd5b2dceaa2135b8a4d323 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 7 Jun 2021 23:37:20 +0200 Subject: [PATCH 07/20] Remove templates --- issue_template.md | 55 ---------------------------------------- pull_request_template.md | 16 ------------ 2 files changed, 71 deletions(-) delete mode 100644 issue_template.md delete mode 100644 pull_request_template.md diff --git a/issue_template.md b/issue_template.md deleted file mode 100644 index 53d9f38..0000000 --- a/issue_template.md +++ /dev/null @@ -1,55 +0,0 @@ ---- -name: Bug report -about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. - ---- - -**How to post a meaningful bug report** -1. *Read this whole template first.* -2. *Make sure you are on the right place:* - - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* - - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* - - *In doubt, ask here and we will figure it out together.* -3. *Delete these italic comments as you write over them below, and remove this guide.* ---- - -### Describe the bug - -*A clear and concise description of what the bug is.* - -### Context - -- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* -- YunoHost version: x.x.x -- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* -- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* - - If yes, please explain: -- Using, or trying to install package version/branch: -- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* - -### Steps to reproduce - -- *If you performed a command from the CLI, the command itself is enough. For example:* - ```sh - sudo yunohost app install kanboard - ``` -- *If you used the webadmin, please perform the equivalent command from the CLI first.* -- *If the error occurs in your browser, explain what you did:* - 1. *Go to '...'* - 2. *Click on '...'* - 3. *Scroll down to '...'* - 4. *See error* - -### Expected behavior - -*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* - -### Logs - -*When an operation fails, YunoHost provides a simple way to share the logs.* -- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* -- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* - -*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* - -*If applicable and useful, add screenshots to help explain your problem.* diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index 0a198cf..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,16 +0,0 @@ -## Problem -- *Description of why you made this PR* - -## Solution -- *And how you fix that* - -## PR Status -- [ ] Code finished. -- [ ] Tested with Package_check. -- [ ] Fix or enhancement tested. -- [ ] Upgrade from last version tested. -- [ ] Can be reviewed and tested. - -## Package_check results ---- -* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* From d98068094d6e8c79adc8052fbf91bbd21b41a271 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 7 Jun 2021 23:50:22 +0200 Subject: [PATCH 08/20] Upgrade version to 1.2.19 --- check_process | 9 ++++---- conf/app.src | 4 ++-- issue_template.md | 55 +++++++++++++++++++++++++++++++++++++++++++++++ manifest.json | 4 ++-- scripts/install | 43 ++++++++++++++++-------------------- scripts/restore | 24 ++++++++++----------- scripts/upgrade | 49 +++++++++++++---------------------------- 7 files changed, 107 insertions(+), 81 deletions(-) create mode 100644 issue_template.md diff --git a/check_process b/check_process index 3ecab30..ea3f665 100644 --- a/check_process +++ b/check_process @@ -1,9 +1,9 @@ ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - admin="john" (USER) - is_public=1 (PUBLIC|public=1|private=0) + domain="domain.tld" + path="/path" + admin="john" + is_public=1 ; Checks pkg_linter=1 setup_sub_dir=1 @@ -15,7 +15,6 @@ upgrade=1 from_commit=f159f7a9bdbe470ec026edf09a6eebf10f23425e backup_restore=1 multi_instance=1 - port_already_use=0 change_url=1 ;;; Upgrade options ; commit=f159f7a9bdbe470ec026edf09a6eebf10f23425e diff --git a/conf/app.src b/conf/app.src index bcdcbda..5a82481 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/kanboard/kanboard/archive/v1.2.18.tar.gz -SOURCE_SUM=10851cdc42c66b2bc742ac5b656a09da1b60c65c1f73876fc6c689e9385d5811 +SOURCE_URL=https://github.com/kanboard/kanboard/archive/refs/tags/v1.2.19.tar.gz +SOURCE_SUM=8c2ee5394ab23a71c71525081b2738a86f1592d40d814e679791c09cede562d0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/issue_template.md b/issue_template.md new file mode 100644 index 0000000..53d9f38 --- /dev/null +++ b/issue_template.md @@ -0,0 +1,55 @@ +--- +name: Bug report +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. + +--- + +**How to post a meaningful bug report** +1. *Read this whole template first.* +2. *Make sure you are on the right place:* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* + - *In doubt, ask here and we will figure it out together.* +3. *Delete these italic comments as you write over them below, and remove this guide.* +--- + +### Describe the bug + +*A clear and concise description of what the bug is.* + +### Context + +- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* +- YunoHost version: x.x.x +- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* + - If yes, please explain: +- Using, or trying to install package version/branch: +- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* + +### Steps to reproduce + +- *If you performed a command from the CLI, the command itself is enough. For example:* + ```sh + sudo yunohost app install kanboard + ``` +- *If you used the webadmin, please perform the equivalent command from the CLI first.* +- *If the error occurs in your browser, explain what you did:* + 1. *Go to '...'* + 2. *Click on '...'* + 3. *Scroll down to '...'* + 4. *See error* + +### Expected behavior + +*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* + +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + +*If applicable and useful, add screenshots to help explain your problem.* diff --git a/manifest.json b/manifest.json index 86623ed..3806f44 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.18~ynh2", + "version": "1.2.19~ynh1", "url": "https://kanboard.net/", "license": "MIT", "maintainer": { @@ -14,7 +14,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.1.7" + "yunohost": ">= 4.2.0" }, "previous_maintainers": [{ "name": "mbugeia", diff --git a/scripts/install b/scripts/install index faade8e..992b3ab 100644 --- a/scripts/install +++ b/scripts/install @@ -58,6 +58,14 @@ db_name=$(ynh_sanitize_dbid --db_name=$app) ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Configuring system user..." --weight=2 + +# Create a system user +ynh_system_user_create --username=$app --home_dir="$final_path" + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -69,6 +77,12 @@ ynh_setup_source --dest_dir="$final_path" mkdir -p $final_path/sessions/ +chmod 750 "$final_path" +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" + #================================================= # NGINX CONFIGURATION #================================================= @@ -77,14 +91,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated nginx config ynh_add_nginx_config -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Configuring system user..." --weight=2 - -# Create a system user -ynh_system_user_create --username=$app - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -101,12 +107,10 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Configuring Kanboard..." -cp ../conf/config.php "$config_php" -ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$config_php" -ynh_replace_string --match_string="__DB_NAME__" --replace_string=$db_name --target_file="$config_php" -ynh_replace_string --match_string="__USER__" --replace_string=$admin --target_file="$config_php" -ynh_replace_string --match_string="__EMAIL__" --replace_string=$email --target_file="$config_php" -ynh_replace_string --match_string="__DOMAIN__" --replace_string=$domain --target_file="$config_php" +ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php" + +chmod 400 "$final_path/config.php" +chown $app "$final_path/config.php" #================================================= # DATABASE INITIALIZATION @@ -120,17 +124,6 @@ pushd $final_path php$phpversion cli db:migrate --no-interaction --verbose popd -#================================================= -# GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================ - -# Set permissions to app files -chown -R root: $final_path -chown -R $app $final_path/{data,plugins,sessions} -chmod -R 700 $final_path/sessions - #================================================= # SETUP FAIL2BAN #================================================= diff --git a/scripts/restore b/scripts/restore index e29c830..3ca47c6 100644 --- a/scripts/restore +++ b/scripts/restore @@ -46,6 +46,14 @@ test ! -d $final_path \ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +#================================================= +# RECREATE THE DEDICATED USER +#================================================= +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" + #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -53,19 +61,9 @@ ynh_script_progression --message="Restoring Kanboard main directory..." --weight ynh_restore_file --origin_path="$final_path" -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --weight=3 - -# Create the dedicated user (if not existing) -ynh_system_user_create --username=$app - -#================================================= -# RESTORE USER RIGHTS -#================================================= - -# Restore permissions to app files +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" chown -R $app $final_path/{data,plugins,sessions} #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 3393ba5..cf3091c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -70,6 +70,14 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors +#================================================= +# CREATE DEDICATED USER +#================================================= +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" + #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -81,11 +89,17 @@ 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" + ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config.php" fi mkdir -p $final_path/sessions/ +chmod 750 "$final_path" +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" + #================================================= # NGINX CONFIGURATION #================================================= @@ -94,14 +108,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# CREATE DEDICATED USER -#================================================= -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 - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -110,20 +116,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=5 # Create a dedicated PHP-FPM config ynh_add_fpm_config --package="$extra_php_dependencies" -#================================================= -# SPECIFIC UPGRADE -#================================================= -# CREATE CONFIG.PHP -#================================================= -ynh_script_progression --message="Reconfiguring Kanboard..." --weight=2 - -# Copy and edit config.php -config_php="$final_path/config.php" - -ynh_backup_if_checksum_is_different --file="$config_php" - -ynh_add_config --template="../conf/config.php" --destination="$config_php" - #================================================= # UPGRADE KANBOARD #================================================= @@ -136,17 +128,6 @@ pushd $final_path php$phpversion cli plugin:upgrade --no-interaction --verbose popd -#================================================= -# GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= - -# Set permissions to app files -chown -R root: $final_path -chown -R $app $final_path/{data,plugins,sessions} -chmod -R 700 $final_path/sessions - #================================================= # SETUP FAIL2BAN #================================================= From 6b801e9dffed57996fdfe0a83e24eea8975aef27 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 7 Jun 2021 23:52:42 +0200 Subject: [PATCH 09/20] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 3806f44..f545057 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.2.0" + "yunohost": ">= 4.2.4" }, "previous_maintainers": [{ "name": "mbugeia", From b410246988aa4bd4a00b23f8b6031cb31abe19ff Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 8 Jun 2021 08:56:15 +0200 Subject: [PATCH 10/20] Fix --- scripts/install | 8 +++++++- scripts/upgrade | 3 --- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 992b3ab..4dead3c 100644 --- a/scripts/install +++ b/scripts/install @@ -107,7 +107,13 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Configuring Kanboard..." -ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php" +cp ../conf/config.php "$final_path/config.php" + +ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$final_path/config.php" +ynh_replace_string --match_string="__DB_NAME__" --replace_string=$db_name --target_file="$final_path/config.php" +ynh_replace_string --match_string="__ADMIN__" --replace_string=$admin --target_file="$final_path/config.php" +ynh_replace_string --match_string="__EMAIL__" --replace_string=$email --target_file="$final_path/config.php" +ynh_replace_string --match_string="__DOMAIN__" --replace_string=$domain --target_file="$final_path/config.php" chmod 400 "$final_path/config.php" chown $app "$final_path/config.php" diff --git a/scripts/upgrade b/scripts/upgrade index cf3091c..da0784c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -161,9 +161,6 @@ 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="$config_php" - #================================================= # RELOAD NGINX #================================================= From 1ae8103669626d08860e098af161958a1ce44cc4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 8 Jun 2021 09:03:10 +0200 Subject: [PATCH 11/20] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 4dead3c..58cb447 100644 --- a/scripts/install +++ b/scripts/install @@ -142,7 +142,7 @@ 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_kanboard" --destination="/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" From 0bddc8ad50ac089c109279ff2070910ddd4aae67 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 8 Jun 2021 09:39:47 +0200 Subject: [PATCH 12/20] Update install --- scripts/install | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index 58cb447..a6af722 100644 --- a/scripts/install +++ b/scripts/install @@ -155,16 +155,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="$config_php" - ynh_replace_string --match_string="define('HIDE_LOGIN_FORM'.*$" --replace_string="define('HIDE_LOGIN_FORM', false);" --target_file="$config_php" - ynh_replace_string --match_string="define('REMEMBER_ME_AUTH'.*$" --replace_string="define('REMEMBER_ME_AUTH', true);" --target_file="$config_php" - ynh_replace_string --match_string="define('DISABLE_LOGOUT'.*$" --replace_string="define('DISABLE_LOGOUT', false);" --target_file="$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="$config_php" +ynh_store_file_checksum --file="$final_path/config.php" #================================================= # RELOAD NGINX From 791d1851d482d8de83d672040f8f3322f9a58829 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 8 Jun 2021 10:19:18 +0200 Subject: [PATCH 13/20] Update upgrade --- scripts/upgrade | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index da0784c..815fbec 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -140,7 +140,7 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-error.log" --failregex #================================================= ynh_script_progression --message="Setuping a cron..." -ynh_add_config --template="../conf/cron_kanboard" --destination="$/etc/cron.d/$app" +ynh_add_config --template="../conf/cron_kanboard" --destination="/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" @@ -153,10 +153,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="$config_php" - ynh_replace_string --match_string="define('HIDE_LOGIN_FORM'.*$" --replace_string="define('HIDE_LOGIN_FORM', false);" --target_file="$config_php" - ynh_replace_string --match_string="define('REMEMBER_ME_AUTH'.*$" --replace_string="define('REMEMBER_ME_AUTH', true);" --target_file="$config_php" - ynh_replace_string --match_string="define('DISABLE_LOGOUT'.*$" --replace_string="define('DISABLE_LOGOUT', false);" --target_file="$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 d965e3124f00bd1c933f11245d509daf9f91649f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 8 Jun 2021 10:24:08 +0200 Subject: [PATCH 14/20] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index a6af722..c5fe364 100644 --- a/scripts/install +++ b/scripts/install @@ -113,7 +113,7 @@ ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --targ ynh_replace_string --match_string="__DB_NAME__" --replace_string=$db_name --target_file="$final_path/config.php" ynh_replace_string --match_string="__ADMIN__" --replace_string=$admin --target_file="$final_path/config.php" ynh_replace_string --match_string="__EMAIL__" --replace_string=$email --target_file="$final_path/config.php" -ynh_replace_string --match_string="__DOMAIN__" --replace_string=$domain --target_file="$final_path/config.php" +ynh_replace_string --match_string="__DOMAIN__" --replace_string=$domain --target_file="$final_path/config.php" chmod 400 "$final_path/config.php" chown $app "$final_path/config.php" From aeda7b9f66e1a48d93513f1a5f2fb54a69b92888 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 8 Jun 2021 10:52:23 +0200 Subject: [PATCH 15/20] Fix --- check_process | 6 +++--- issue_template.md | 55 ----------------------------------------------- 2 files changed, 3 insertions(+), 58 deletions(-) delete mode 100644 issue_template.md diff --git a/check_process b/check_process index ea3f665..82cfcb1 100644 --- a/check_process +++ b/check_process @@ -12,11 +12,11 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=f159f7a9bdbe470ec026edf09a6eebf10f23425e + upgrade=1 from_commit=c20bdd69644de72736cdc4438a36faab9ab24c72 backup_restore=1 multi_instance=1 change_url=1 ;;; Upgrade options - ; commit=f159f7a9bdbe470ec026edf09a6eebf10f23425e - name=Create check_process + ; commit=c20bdd69644de72736cdc4438a36faab9ab24c72 + name=Merge pull request #114 from YunoHost-Apps/testing manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=Yes& diff --git a/issue_template.md b/issue_template.md deleted file mode 100644 index 53d9f38..0000000 --- a/issue_template.md +++ /dev/null @@ -1,55 +0,0 @@ ---- -name: Bug report -about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. - ---- - -**How to post a meaningful bug report** -1. *Read this whole template first.* -2. *Make sure you are on the right place:* - - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* - - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* - - *In doubt, ask here and we will figure it out together.* -3. *Delete these italic comments as you write over them below, and remove this guide.* ---- - -### Describe the bug - -*A clear and concise description of what the bug is.* - -### Context - -- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* -- YunoHost version: x.x.x -- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* -- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* - - If yes, please explain: -- Using, or trying to install package version/branch: -- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* - -### Steps to reproduce - -- *If you performed a command from the CLI, the command itself is enough. For example:* - ```sh - sudo yunohost app install kanboard - ``` -- *If you used the webadmin, please perform the equivalent command from the CLI first.* -- *If the error occurs in your browser, explain what you did:* - 1. *Go to '...'* - 2. *Click on '...'* - 3. *Scroll down to '...'* - 4. *See error* - -### Expected behavior - -*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* - -### Logs - -*When an operation fails, YunoHost provides a simple way to share the logs.* -- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* -- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* - -*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* - -*If applicable and useful, add screenshots to help explain your problem.* From aec43dbe71badd1eb1e59b6f080da1026b835f71 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 8 Jun 2021 11:01:17 +0200 Subject: [PATCH 16/20] Fix --- doc/DISCLAIMER.md | 13 +++++++++++++ doc/DISCLAIMER_fr.md | 13 +++++++++++++ doc/screenshots/board.png | Bin 0 -> 42564 bytes manifest.json | 10 +++++++++- 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 doc/DISCLAIMER.md create mode 100644 doc/DISCLAIMER_fr.md create mode 100644 doc/screenshots/board.png diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..45d0412 --- /dev/null +++ b/doc/DISCLAIMER.md @@ -0,0 +1,13 @@ +## Limitations + +## Additional information + +### How to connect as external (non-SSOwat) users + +You have to edit this file `/var/www/kanboard/config.php`, find the line `define('REVERSE_PROXY_AUTH', true);` and change it from `true` to `false`. +**Warning** this disables the possibility to connect with SSOwat users. You will *only* be able to connect with Kanboard users created inside of Kanboard. +Then you can connect. + +**NB**: if you don't make that change, you will get the following error message "Access Forbidden". + +This is due to a Kanboard limitation. diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md new file mode 100644 index 0000000..7ea5b57 --- /dev/null +++ b/doc/DISCLAIMER_fr.md @@ -0,0 +1,13 @@ +## Limitations + +## Informations additionnelles + +### Comment se connecter en tant qu'utilisateurs externes (non SSOwat) + +Vous devez éditer ce fichier `/var/www/kanboard/config.php`, trouver la ligne `define('REVERSE_PROXY_AUTH', true);` et la changer de `true` à `false`. +**Attention** cela désactive la possibilité de se connecter avec les utilisateurs SSOwat. Vous ne pourrez *que* vous connecter avec les utilisateurs Kanboard créés à l'intérieur de Kanboard. +Ensuite, vous pouvez vous connecter. + +**NB**: si vous n'effectuez pas cette modification, vous obtiendrez le message d'erreur suivant "Accès interdit". + +Cela est dû à une limitation de Kanboard. diff --git a/doc/screenshots/board.png b/doc/screenshots/board.png new file mode 100644 index 0000000000000000000000000000000000000000..4109deff6b6eb61d5a3e11f264dc67e4dee277b6 GIT binary patch literal 42564 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 literal 0 HcmV?d00001 diff --git a/manifest.json b/manifest.json index f545057..17fff64 100644 --- a/manifest.json +++ b/manifest.json @@ -7,7 +7,15 @@ "fr": "Logiciel de gestion de projet Kanban" }, "version": "1.2.19~ynh1", - "url": "https://kanboard.net/", + "url": "https://kanboard.net", + "upstream": { + "license": "MIT", + "website": "https://kanboard.net", + "demo": "https://demo.yunohost.org/kanboard/", + "admindoc": "https://docs.kanboard.org/en/latest/", + "userdoc": "https://yunohost.org/#/app_kanboard", + "code": "https://github.com/kanboard/kanboard" + }, "license": "MIT", "maintainer": { "name": "", From a625e5330de5ab4ef401ea16f40e79425b16a281 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 8 Jun 2021 09:01:27 +0000 Subject: [PATCH 17/20] Auto-update README --- README.md | 61 +++++++++++++++++++++------------------------------- README_fr.md | 57 ++++++++++++++++++------------------------------ 2 files changed, 46 insertions(+), 72 deletions(-) diff --git a/README.md b/README.md index 18f48c4..3679653 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ + + # 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) @@ -5,40 +10,22 @@ *[Lire ce readme en français.](./README_fr.md)* -> *This package allow you to install Kanboard quickly and simply on a YunoHost server. -If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* +> *This package allows you to install Kanboard quickly and simply on a YunoHost server. +If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview -Kanboard is a visual task manager that makes it easy to manage small projects in a collaborative way. The tool is particularly suitable for people who use the Kanban method. Kanboard can be seen as a (Simplified) alternative to the proprietary Trello software. Kanboard is a minimalist software, it focuses only on the features that are really necessary. The user interface is simple and clear. The tool is designed to run on a small machine such as a Raspberry Pi or a Virtual Private Server (VPS). There are no external dependencies, drag and drop of tasks uses the new HTML5 APIs. -**Shipped version:** 1.2.18 +Kanban project management software + +**Shipped version:** 1.2.19~ynh1 + +**Demo:** https://demo.yunohost.org/kanboard/ ## Screenshots -![](https://kanboard.org/assets/img/board.png) +![](./doc/screenshots/board.png) -## Demo - -* [YunoHost demo](https://demo.yunohost.org/kanboard/) - -## Configuration - -## Documentation - - * Official documentation: https://docs.kanboard.org/en/latest/ - * YunoHost documentation: https://yunohost.org/#/app_kanboard - -## YunoHost specific features - -#### Multi-users support - - * Are LDAP and HTTP auth supported? **No** - * Can the app be used by multiple users? **Yes** - -#### Supported architectures - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/kanboard%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/kanboard/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/kanboard%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/kanboard/) +## Disclaimers / important information ## Limitations @@ -54,18 +41,18 @@ Then you can connect. This is due to a Kanboard limitation. -## Links +## Documentation and resources - * Report a bug: https://github.com/YunoHost-Apps/kanboard_ynh/issues - * Kanboard website: https://kanboard.org - * Upstream app repository: https://github.com/kanboard/kanboard - * YunoHost website: https://yunohost.org/ +* Official app website: https://kanboard.net +* Official user documentation: https://yunohost.org/#/app_kanboard +* 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 ---- +## Developer info -## Developers info - -Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/kanboard_ynh/tree/testing). +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. ``` @@ -73,3 +60,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/kanboard_ynh/tree/tes 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 diff --git a/README_fr.md b/README_fr.md index 67db2dc..05c364f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,44 +1,27 @@ # Kanboard pour 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) +[![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) [![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)* +*[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, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* +> *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.* ## Vue d'ensemble -Kanboard est un gestionnaire de tâches visuel qui permet de gérer facilement des petits projets de manière collaborative. L'outil est particulièrement adapté aux personnes qui utilisent la méthode Kanban. On peut voir Kanboard comme une alternative (simplifiée) au logiciel propriétaire Trello. Kanboard est un logiciel minimaliste, il se concentre uniquement sur les fonctionnalités réellement nécessaires. L'interface utilisateur est simple et clair. L'outil est prévu pour fonctionner sur une petite machine tel qu'un Raspberry Pi ou un serveur virtuel privé (VPS). Il n'y a aucune dépendance externe, le glisser-déposer des tâches utilise les nouvelles API de HTML5. -**Version incluse :** 1.2.18 +Logiciel de gestion de projet Kanban + +**Version incluse :** 1.2.19~ynh1 + +**Démo :** https://demo.yunohost.org/kanboard/ ## Captures d'écran -![](https://kanboard.org/assets/img/board.png) +![](./doc/screenshots/board.png) -## Démo - -* [Démo YunoHost](https://demo.yunohost.org/kanboard/) - -## Configuration - -## Documentation - - * Documentation officielle : https://docs.kanboard.org/fr/latest/ - * Documentation YunoHost : https://yunohost.org/#/app_kanboard_fr - -## Caractéristiques spécifiques YunoHost - -#### Support multi-utilisateur - -* L'authentification LDAP et HTTP est-elle prise en charge ? **Non** -* L'application peut-elle être utilisée par plusieurs utilisateurs ? **Oui** - -#### Architectures supportées - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/kanboard%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/kanboard/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/kanboard%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/kanboard/) +## Avertissements / informations importantes ## Limitations @@ -54,14 +37,14 @@ Ensuite, vous pouvez vous connecter. Cela est dû à une limitation de Kanboard. -## Liens +## Documentations et ressources - * Signaler un bug : https://github.com/YunoHost-Apps/kanboard_ynh/issues - * Site de l'application : https://kanboard.org - * Dépôt de l'application principale : https://github.com/kanboard/kanboard - * Site web YunoHost : https://yunohost.org/ - ---- +* Site officiel de l'app : https://kanboard.net +* Documentation officielle utilisateur : https://yunohost.org/#/app_kanboard +* 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 ## Informations pour les développeurs @@ -73,3 +56,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/kanboard_ynh/tree/tes 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 From dd87cb49c355f37aa9592d6380001f9be5804037 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 8 Jun 2021 11:15:22 +0200 Subject: [PATCH 18/20] 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 f1689fc..acf6565 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -14,7 +14,7 @@ location __PATH__/ { try_files $uri $uri/ /index.php?$args; # Override CSP header to make SSOWAT user panel compatible with kanboard - more_set_headers Content-Security-Policy "default-src 'self' 'unsafe-eval' data:;"; + more_set_headers 'Content-Security-Policy: default-src self unsafe-eval data:'; location __PATH__/(?:kanboard|config.php|config.default.php) { deny all; From e7ec2f7cef083138742e7e81a939c4053c500322 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 9 Jun 2021 08:36:21 +0200 Subject: [PATCH 19/20] 1.2.20 --- 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 5a82481..e4223ab 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.19.tar.gz -SOURCE_SUM=8c2ee5394ab23a71c71525081b2738a86f1592d40d814e679791c09cede562d0 +SOURCE_URL=https://github.com/kanboard/kanboard/archive/refs/tags/v1.2.20.tar.gz +SOURCE_SUM=ac401a9884b7c56d62faa3efda0402498dfa7ab6a60fc7cba4512a453b70c2ec SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 17fff64..8e96838 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.19~ynh1", + "version": "1.2.20~ynh1", "url": "https://kanboard.net", "upstream": { "license": "MIT", From 852487f2e4de9be409e1c2d21f2d5024cd3d5cbe Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 9 Jun 2021 06:36:30 +0000 Subject: [PATCH 20/20] 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 3679653..a9d93e7 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Kanban project management software -**Shipped version:** 1.2.19~ynh1 +**Shipped version:** 1.2.20~ynh1 **Demo:** https://demo.yunohost.org/kanboard/ diff --git a/README_fr.md b/README_fr.md index 05c364f..62a47dd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Logiciel de gestion de projet Kanban -**Version incluse :** 1.2.19~ynh1 +**Version incluse :** 1.2.20~ynh1 **Démo :** https://demo.yunohost.org/kanboard/