From 14f55c2de6c2a217a5a272194ef9b69c3fb016a6 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 17 Mar 2019 22:16:03 +0100 Subject: [PATCH 1/3] upgrade to 2.0.0-beta.68 --- README.md | 2 +- conf/app.src | 2 +- manifest.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dd99c9b..423ff51 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ An open source, modern and powerful wiki app built on Node.js, Git and Markdown **Wiki.js is still under development, all features not already implemented.** -**Shipped version:** 2.0.0-beta.42 +**Shipped version:** 2.0.0-beta.68 ## Screenshots diff --git a/conf/app.src b/conf/app.src index f979fc2..4f8e09e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,4 +1,4 @@ -SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.0.0-beta.42/wiki-js.tar.gz +SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.0.0-beta.68/wiki-js.tar.gz SOURCE_SUM=e53edc10b7a187b8418acbc069de7560b580540fab51a37e902010152fad2a6d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz diff --git a/manifest.json b/manifest.json index b72937f..288286a 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.0.0-beta.42~ynh3", + "version": "2.0.0-beta.68~ynh1", "url": "https://wiki.js.org/", "license": "AGPL-3.0-or-later", "maintainer": { From f85f9332c4b561f9d3d8113279e6cab774364d83 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 17 Mar 2019 22:28:09 +0100 Subject: [PATCH 2/3] Fix beta.68 --- conf/app.src | 2 +- conf/config.sample.yml | 4 ++++ scripts/backup | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/conf/app.src b/conf/app.src index 4f8e09e..568b3a0 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.0.0-beta.68/wiki-js.tar.gz -SOURCE_SUM=e53edc10b7a187b8418acbc069de7560b580540fab51a37e902010152fad2a6d +SOURCE_SUM=fb2b55eb562bd13425ba29ab717698c969e703605b8f00993fe6edb9b9c5b54d 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 6768afc..0522400 100644 --- a/conf/config.sample.yml +++ b/conf/config.sample.yml @@ -66,6 +66,10 @@ ssl: # to 1024 bits (default: null): dhparam: null + # Listen on this HTTP port and redirect all requests to HTTPS. + # Set to false to disable (default: 80): + redirectNonSSLPort: 80 + # --------------------------------------------------------------------- # IP address the server should listen to # --------------------------------------------------------------------- diff --git a/scripts/backup b/scripts/backup index 297bfde..1fc48f0 100644 --- a/scripts/backup +++ b/scripts/backup @@ -6,6 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= +#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source ../settings/scripts/ynh_systemd_action source /usr/share/yunohost/helpers From 2e3fb5caf47c88fc7fc2d5bfa3e3560c10677832 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 18 Mar 2019 00:26:23 +0100 Subject: [PATCH 3/3] Add upgrade check --- check_process | 1 + 1 file changed, 1 insertion(+) diff --git a/check_process b/check_process index d771fb6..a43d9ce 100644 --- a/check_process +++ b/check_process @@ -15,6 +15,7 @@ setup_private=1 setup_public=1 upgrade=1 + upgrade=1 from_commit=ad5db1af11dfa2502ab0f214ec8e929e1eecbec8 backup_restore=1 multi_instance=1 incorrect_path=1