From 6aac7a51ab4fd47a7e4b3e0669052805e30b38e0 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 13 Jun 2020 21:45:06 +0200 Subject: [PATCH 1/4] Upgrade to 2.4.105 --- README.md | 2 +- check_process | 5 ++++- conf/app.src | 4 ++-- conf/config.sample.yml | 12 ------------ manifest.json | 2 +- 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 240a953..3ba5fe6 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview A copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost. -**Shipped version:** 2.4.75 +**Shipped version:** 2.4.105 ## Important points before installing diff --git a/check_process b/check_process index efe3824..e5f1b57 100644 --- a/check_process +++ b/check_process @@ -22,6 +22,8 @@ upgrade=1 from_commit=8c74d870a550e99db4b6cac0a695f3155b28b514 # 2.3.81~ynh1 upgrade=1 from_commit=ddb3a60b6f0f8024169db5a79ea07a9ac936b290 + # 2.4.75~ynh1 + upgrade=1 from_commit=164ef6bac3a65fe075850ec060edcd9c3249f83a backup_restore=1 multi_instance=1 # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. @@ -47,4 +49,5 @@ Notification=yes name=2.3.77 ; commit=ddb3a60b6f0f8024169db5a79ea07a9ac936b290 name=2.3.81~ynh1 -/ + ; commit=164ef6bac3a65fe075850ec060edcd9c3249f83a + name=2.4.75~ynh1 diff --git a/conf/app.src b/conf/app.src index 76cf956..aa975c6 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.4.75/wiki-js.tar.gz -SOURCE_SUM=f4c6849c98e9fe0612c10d515ff5e06221e904ea5a8b6986bc341997ebb1b2e1 +SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.4.105/wiki-js.tar.gz +SOURCE_SUM=ff0a66f6d3c901cb846158c0388510173437d23eca382ae520f2d1c321380bae SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/config.sample.yml b/conf/config.sample.yml index 0606f73..7367e76 100644 --- a/conf/config.sample.yml +++ b/conf/config.sample.yml @@ -105,18 +105,6 @@ bindIP: 0.0.0.0 logLevel: info -# --------------------------------------------------------------------- -# Upload Limits -# --------------------------------------------------------------------- -# If you're using a reverse-proxy in front of Wiki.js, you must also -# change your proxy upload limits! - -uploads: - # Maximum upload size in bytes per file (default: 5242880 (5 MB)) - maxFileSize: 5242880 - # Maximum file uploads per request (default: 10) - maxFiles: 10 - # --------------------------------------------------------------------- # Offline Mode # --------------------------------------------------------------------- diff --git a/manifest.json b/manifest.json index a829ebc..fcb97f8 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "An open source, modern and powerful wiki app built on Node.js, Git and Markdown.", "fr": "Un wiki moderne et open source propulsé Node.js, Git et Markdown." }, - "version": "2.4.75~ynh1", + "version": "2.4.105~ynh1", "url": "https://wiki.js.org/", "license": "AGPL-3.0-or-later", "maintainer": { From acbb99bcfe0a14d94fefb53590679431fe070a5a Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 13 Jun 2020 21:51:57 +0200 Subject: [PATCH 2/4] Typo --- issue_template.md | 4 ++-- pull_request_template.md | 2 +- scripts/install | 6 ++---- scripts/remove | 1 - 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/issue_template.md b/issue_template.md index 382d937..751e1ca 100644 --- a/issue_template.md +++ b/issue_template.md @@ -8,7 +8,7 @@ about: Create a report to help us debug, it would be nice to fill the template a 1. *Read this whole template first.* 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 REPLACEBYYOURAPP itself. Refer to its documentation or repository for help.* + - *Otherwise, the issue may be due to Wiki.js itself. Refer to its documentation or repository for help.* - *If you have a doubt, post here, we will figure it out together.* 3. *Delete the italic comments as you write over them below, and remove this guide.* --- @@ -29,7 +29,7 @@ about: Create a report to help us debug, it would be nice to fill the template a *Steps to reproduce the behavior.* - *If you performed a command from the CLI, the command itself is enough. For example:* ```sh - sudo yunohost app install REPLACEBYYOURAPP + sudo yunohost app install wikijs ``` - *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/pull_request_template.md b/pull_request_template.md index 0287f9f..ccfefad 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -15,4 +15,4 @@ --- *If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/REPLACEBYYOURAPP_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/REPLACEBYYOURAPP_ynh%20PR-NUM-%20(USERNAME)/) +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/wikijs_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/wikijs_ynh%20PR-NUM-%20(USERNAME)/) diff --git a/scripts/install b/scripts/install index a1147e7..b4874a0 100644 --- a/scripts/install +++ b/scripts/install @@ -27,12 +27,11 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC - -app=$YNH_APP_INSTANCE_NAME - ldap_user="svc_${app}_ldap" ldap_password=$(ynh_string_random --length=8) +app=$YNH_APP_INSTANCE_NAME + #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= @@ -52,7 +51,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=path --value=$path_url ynh_app_setting_set --app=$app --key=is_public --value=$is_public - ynh_app_setting_set --app=$app --key=ldap_user --value=$ldap_user ynh_app_setting_set --app=$app --key=ldap_password --value=$ldap_password diff --git a/scripts/remove b/scripts/remove index 769b29d..18e3850 100644 --- a/scripts/remove +++ b/scripts/remove @@ -21,7 +21,6 @@ port=$(ynh_app_setting_get --app=$app --key=port) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name final_path=$(ynh_app_setting_get --app=$app --key=final_path) - ldap_user=$(ynh_app_setting_get --app=$app --key=ldap_user) #================================================= From 1140ec369a249a918b04844b6e48d66eb71ff748 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 14 Jun 2020 23:53:14 +0200 Subject: [PATCH 3/4] reorder --- scripts/install | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index b4874a0..a226c09 100644 --- a/scripts/install +++ b/scripts/install @@ -27,11 +27,12 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC -ldap_user="svc_${app}_ldap" -ldap_password=$(ynh_string_random --length=8) app=$YNH_APP_INSTANCE_NAME +ldap_user="svc_${app}_ldap" +ldap_password=$(ynh_string_random --length=8) + #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= From 75cf881baeb58ac22c3555554fa89a908b522c90 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 15 Jun 2020 03:01:39 +0200 Subject: [PATCH 4/4] Upgrade to 2.4.107 --- README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3ba5fe6..20d5779 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview A copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost. -**Shipped version:** 2.4.105 +**Shipped version:** 2.4.107 ## Important points before installing diff --git a/conf/app.src b/conf/app.src index aa975c6..9b9b6d0 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.4.105/wiki-js.tar.gz -SOURCE_SUM=ff0a66f6d3c901cb846158c0388510173437d23eca382ae520f2d1c321380bae +SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.4.107/wiki-js.tar.gz +SOURCE_SUM=ac5c389015578d145f440763ad68724bdf652691c7334fef5fe4b5c695cdc033 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index fcb97f8..8d8380c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "An open source, modern and powerful wiki app built on Node.js, Git and Markdown.", "fr": "Un wiki moderne et open source propulsé Node.js, Git et Markdown." }, - "version": "2.4.105~ynh1", + "version": "2.4.107~ynh1", "url": "https://wiki.js.org/", "license": "AGPL-3.0-or-later", "maintainer": {