From 2ef3cd1fc1a863dd0cda79545b040b1f7095e278 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 4 Sep 2020 20:03:06 +0200 Subject: [PATCH 1/4] Upgrade to 2.5.105 --- 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 20d5779..97c3755 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.107 +**Shipped version:** 2.5.105 ## Important points before installing diff --git a/conf/app.src b/conf/app.src index 9b9b6d0..276b870 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.4.107/wiki-js.tar.gz -SOURCE_SUM=ac5c389015578d145f440763ad68724bdf652691c7334fef5fe4b5c695cdc033 +SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.5.105/wiki-js.tar.gz +SOURCE_SUM=35435a9ba1fbf20fda4ae78ccb19223ed6e2d0f8b86caafa4cf5f97ffbeba484 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 8d8380c..0981272 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.107~ynh1", + "version": "2.5.105~ynh1", "url": "https://wiki.js.org/", "license": "AGPL-3.0-or-later", "maintainer": { From 1b0dd3d6dfdbdcc44e34f5efa3ebd45cfe9f7947 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 6 Sep 2020 14:42:02 +0200 Subject: [PATCH 2/4] Update check_process --- check_process | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/check_process b/check_process index e5f1b57..273c07f 100644 --- a/check_process +++ b/check_process @@ -24,6 +24,8 @@ upgrade=1 from_commit=ddb3a60b6f0f8024169db5a79ea07a9ac936b290 # 2.4.75~ynh1 upgrade=1 from_commit=164ef6bac3a65fe075850ec060edcd9c3249f83a + # 2.4.107~ynh1 + upgrade=1 from_commit=ed3d16ea928155936ecf8753fcc6096a01971e6d 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. @@ -51,3 +53,5 @@ Notification=yes name=2.3.81~ynh1 ; commit=164ef6bac3a65fe075850ec060edcd9c3249f83a name=2.4.75~ynh1 + ; commit=ed3d16ea928155936ecf8753fcc6096a01971e6d + name=2.4.107~ynh1 From e153494b48d4d7f33b9d85ddd5c015e030029c16 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 22 Sep 2020 15:45:01 +0200 Subject: [PATCH 3/4] Upgrade to v.2.5.144 --- README.md | 8 ++++---- conf/app.src | 4 ++-- issue_template.md | 6 +++--- manifest.json | 2 +- scripts/_common.sh | 2 +- scripts/change_url | 16 ++++++++-------- scripts/install | 6 +++--- scripts/remove | 6 +++--- scripts/restore | 4 ++-- scripts/upgrade | 4 ++-- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 20d5779..a7e46b3 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview -A copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost. +Wiki.js is a copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost. -**Shipped version:** 2.4.107 +**Shipped version:** 2.5.144 ## Important points before installing @@ -28,6 +28,7 @@ A copylefted libre software, modern and powerful wiki app built on Node.js, Git ## Documentation * Official documentation: https://docs-beta.requarks.io/ + * YunoHost documentation: https://yunohost.org/#/app_wikijs ## YunoHost specific features @@ -55,8 +56,7 @@ The app can be used by multiple users. --- -Developer info ----------------- +## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/wikijs_ynh/tree/testing). diff --git a/conf/app.src b/conf/app.src index 9b9b6d0..57d7975 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.4.107/wiki-js.tar.gz -SOURCE_SUM=ac5c389015578d145f440763ad68724bdf652691c7334fef5fe4b5c695cdc033 +SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.5.144/wiki-js.tar.gz +SOURCE_SUM=dcfc750da7a931ded8e35249dd806cd7a8e6fe25558ac5bcffea0afac455f30c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/issue_template.md b/issue_template.md index 751e1ca..a26e62b 100644 --- a/issue_template.md +++ b/issue_template.md @@ -7,7 +7,7 @@ about: Create a report to help us debug, it would be nice to fill the template a **How to post a meaningful bug report** 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!* + - *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 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.* @@ -34,8 +34,8 @@ about: Create a report to help us debug, it would be nice to fill the template a - *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 '....'* + 2. *Click on '...'* + 3. *Scroll down to '...'* 4. *See error* **Expected behavior** diff --git a/manifest.json b/manifest.json index 8d8380c..539f125 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.107~ynh1", + "version": "2.5.144~ynh1", "url": "https://wiki.js.org/", "license": "AGPL-3.0-or-later", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 8815e02..9145635 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app pkg_dependencies="postgresql postgresql-contrib" -NODEJS_VERSION=10 +NODEJS_VERSION=12 #================================================= # PERSONAL HELPERS diff --git a/scripts/change_url b/scripts/change_url index 596fe47..972eb62 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -37,7 +37,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its url (may take a while)..." +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." # Backup the current version of the app ynh_backup_before_upgrade @@ -79,23 +79,23 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating nginx web server configuration..." +ynh_script_progression --message="Updating NGINX web server configuration..." nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf -# Change the path in the nginx config file +# Change the path in the NGINX config file if [ $change_path -eq 1 ] then - # Make a backup of the original nginx config file if modified + # Make a backup of the original NGINX config file if modified ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for nginx helper + # Set global variables for NGINX helper domain="$old_domain" path_url="$new_path" - # Create a dedicated nginx config + # Create a dedicated NGINX config ynh_add_nginx_config fi -# Change the domain for nginx +# Change the domain for NGINX if [ $change_domain -eq 1 ] then # Delete file checksum for the old conf file location @@ -118,7 +118,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --lin #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/install b/scripts/install index a226c09..4697f68 100644 --- a/scripts/install +++ b/scripts/install @@ -101,9 +101,9 @@ ynh_setup_source --dest_dir="$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." +ynh_script_progression --message="Configuring NGINX web server..." -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -191,7 +191,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/remove b/scripts/remove index 18e3850..3fb0543 100644 --- a/scripts/remove +++ b/scripts/remove @@ -72,9 +72,9 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." +ynh_script_progression --message="Removing NGINX web server configuration..." -# Remove the dedicated nginx config +# Remove the dedicated NGINX config ynh_remove_nginx_config #================================================= @@ -92,7 +92,7 @@ fi #================================================= # REMOVE LDAP USER #================================================= -ynh_script_progression --message="Removing ldap user..." +ynh_script_progression --message="Removing LDAP user..." yunohost user delete $ldap_user --purge diff --git a/scripts/restore b/scripts/restore index 7cdea2d..8d72989 100644 --- a/scripts/restore +++ b/scripts/restore @@ -51,7 +51,7 @@ test ! -d $final_path \ #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the nginx configuration..." +ynh_script_progression --message="Restoring the NGINX configuration..." ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -134,7 +134,7 @@ yunohost user create $ldap_user --firstname "SvcWikijsLdap" --lastname "SvcWikij #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 62b584f..0e66432 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -147,7 +147,7 @@ fi #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading nginx web server configuration..." +ynh_script_progression --message="Upgrading NGINX web server configuration..." # Create a dedicated nginx config ynh_add_nginx_config @@ -227,7 +227,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --lin #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload From 3a5ace2febb476ce874b41dd2b4f4ded844a5d79 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 7 Oct 2020 23:08:58 +0200 Subject: [PATCH 4/4] Upgrade 2.5.159 --- 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 a7e46b3..10d3dfe 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 Wiki.js is a copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost. -**Shipped version:** 2.5.144 +**Shipped version:** 2.5.159 ## Important points before installing diff --git a/conf/app.src b/conf/app.src index 57d7975..192bdba 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.5.144/wiki-js.tar.gz -SOURCE_SUM=dcfc750da7a931ded8e35249dd806cd7a8e6fe25558ac5bcffea0afac455f30c +SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.5.159/wiki-js.tar.gz +SOURCE_SUM=e3f424ac1c9fc2bd99a09825c08500aacccf734a198a143a45bdb4e617d4259f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 539f125..919fec8 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.5.144~ynh1", + "version": "2.5.159~ynh1", "url": "https://wiki.js.org/", "license": "AGPL-3.0-or-later", "maintainer": {