From 94010cced41ad3a3b85f0349fe14886467765859 Mon Sep 17 00:00:00 2001 From: Limezy Date: Mon, 5 Sep 2022 08:31:09 +0700 Subject: [PATCH 1/6] Upgrade to v0.66 --- conf/app.src | 4 ++-- manifest.json | 4 ++-- scripts/_common.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/app.src b/conf/app.src index 801dabb..4746a63 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.65.2.tar.gz -SOURCE_SUM=6c3b78313724abe567f7af48439257c9f95628e9e0209fa5652110c393aafc1a +SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.66.0.tar.gz +SOURCE_SUM=956bb0dec2445b355b3d9e02af56049d934a90ea29826ef12e0773cb878b4758 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 27f7e67..743b9d7 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Wiki and knowledge base for teams", "fr": "Wiki et base de connaissances pour les équipes" }, - "version": "0.65.2~ynh2", + "version": "0.66.0~ynh1", "url": "www.getoutline.com", "upstream": { "license": "BUSL-1.1", @@ -21,7 +21,7 @@ "name": "Raoul de Limezy" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": false, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 5116958..f507ae3 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app pkg_dependencies="postgresql" -NODEJS_VERSION=14 +NODEJS_VERSION=16 #================================================= # PERSONAL HELPERS From 9eeb9cce52ae3b2a462c62b20e1f539fffabddd2 Mon Sep 17 00:00:00 2001 From: Limezy Date: Mon, 5 Sep 2022 10:59:04 +0700 Subject: [PATCH 2/6] Updated patches --- sources/patches/app-01-branding.patch | 2 +- sources/patches/app-02-email.patch | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/sources/patches/app-01-branding.patch b/sources/patches/app-01-branding.patch index 6923853..1db6f08 100644 --- a/sources/patches/app-01-branding.patch +++ b/sources/patches/app-01-branding.patch @@ -1,5 +1,5 @@ diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx -index 9d86f4782..25b456532 100644 +index 9d86f478..25b45653 100644 --- a/app/scenes/Document/components/Document.tsx +++ b/app/scenes/Document/components/Document.tsx @@ -617,9 +617,6 @@ class DocumentScene extends React.Component { diff --git a/sources/patches/app-02-email.patch b/sources/patches/app-02-email.patch index ef88a4f..20cc1d4 100644 --- a/sources/patches/app-02-email.patch +++ b/sources/patches/app-02-email.patch @@ -1,12 +1,14 @@ diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx -index f366391a9..2df962fbc 100644 +index 669d0038..0b31e7f1 100644 --- a/server/emails/mailer.tsx +++ b/server/emails/mailer.tsx -@@ -108,6 +108,7 @@ export class Mailer { - ciphers: env.SMTP_TLS_CIPHERS, - } - : undefined, -+ ignoreTLS:true - }; - } - \ No newline at end of file +@@ -117,7 +117,8 @@ export class Mailer { + ? { + ciphers: env.SMTP_TLS_CIPHERS, + } +- : undefined ++ : undefined, ++ ignoreTLS:true, + : { + rejectUnauthorized: false, + }, \ No newline at end of file From cfda0f90ef288b5621071583b76ee5ff245ce323 Mon Sep 17 00:00:00 2001 From: Limezy Date: Mon, 5 Sep 2022 11:43:45 +0700 Subject: [PATCH 3/6] Update app-02-email.patch --- sources/patches/app-02-email.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/patches/app-02-email.patch b/sources/patches/app-02-email.patch index 20cc1d4..1b0c67f 100644 --- a/sources/patches/app-02-email.patch +++ b/sources/patches/app-02-email.patch @@ -1,5 +1,5 @@ diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx -index 669d0038..0b31e7f1 100644 +index 669d0038..b5ece163 100644 --- a/server/emails/mailer.tsx +++ b/server/emails/mailer.tsx @@ -117,7 +117,8 @@ export class Mailer { @@ -8,7 +8,7 @@ index 669d0038..0b31e7f1 100644 } - : undefined + : undefined, -+ ignoreTLS:true, ++ ignoreTLS:true : { rejectUnauthorized: false, }, \ No newline at end of file From c9095e1381584572eacb8a052b84db342fdd697c Mon Sep 17 00:00:00 2001 From: Limezy Date: Mon, 5 Sep 2022 20:04:45 +0700 Subject: [PATCH 4/6] Update timeout value --- scripts/install | 4 ++-- scripts/upgrade | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 14b2ddf..f8b2395 100755 --- a/scripts/install +++ b/scripts/install @@ -215,13 +215,13 @@ ynh_add_nginx_config pushd "$final_path" ynh_use_nodejs ynh_script_progression --message="Fetching Yarn dev dependencies... This can be very long, be patient !" --weight=18 - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --no-optional --frozen-lockfile 2>&1 + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --no-optional --frozen-lockfile --network-timeout 1000000000 2>&1 ynh_script_progression --message="Cleaning cache... " --weight=3 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean 2>&1 ynh_script_progression --message="Building Yarn dev dependencies... This can be very long, be patient !" --weight=18 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn build 2>&1 ynh_script_progression --message="Fetching Yarn production dependencies... This can be very long, be patient !" --weight=18 - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --production=true --frozen-lockfile 2>&1 + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --production=true --frozen-lockfile --network-timeout 1000000000 2>&1 ynh_script_progression --message="Cleaning cache... " --weight=3 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean 2>&1 popd diff --git a/scripts/upgrade b/scripts/upgrade index 1faef63..43593a4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -124,13 +124,13 @@ ynh_script_progression --message="Building Yarn dependencies... This can be very pushd "$final_path" ynh_use_nodejs ynh_script_progression --message="Fetching Yarn dev dependencies... This can be very long, be patient !" --weight=5 - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --no-optional --frozen-lockfile 2>&1 + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --no-optional --frozen-lockfile --network-timeout 1000000000 2>&1 ynh_script_progression --message="Cleaning cache... " --weight=1 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean 2>&1 ynh_script_progression --message="Building Yarn dev dependencies... This can be very long, be patient !" --weight=5 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn build 2>&1 ynh_script_progression --message="Fetching Yarn production dependencies... This can be very long, be patient !" --weight=5 - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --production=true --frozen-lockfile 2>&1 + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --production=true --frozen-lockfile --network-timeout 1000000000 2>&1 ynh_script_progression --message="Cleaning cache... " --weight=1 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean 2>&1 popd From 1b191bfc70502bf260966944553418a9098cb157 Mon Sep 17 00:00:00 2001 From: Limezy Date: Mon, 5 Sep 2022 20:56:52 +0700 Subject: [PATCH 5/6] Update app-02-email.patch --- sources/patches/app-02-email.patch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sources/patches/app-02-email.patch b/sources/patches/app-02-email.patch index 1b0c67f..49a8e12 100644 --- a/sources/patches/app-02-email.patch +++ b/sources/patches/app-02-email.patch @@ -1,13 +1,11 @@ diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx -index 669d0038..b5ece163 100644 +index 669d0038..524b74a8 100644 --- a/server/emails/mailer.tsx +++ b/server/emails/mailer.tsx -@@ -117,7 +117,8 @@ export class Mailer { - ? { +@@ -118,6 +118,7 @@ export class Mailer { ciphers: env.SMTP_TLS_CIPHERS, } -- : undefined -+ : undefined, + : undefined + ignoreTLS:true : { rejectUnauthorized: false, From 03b5cdf0a76a2f7fb4fbe8b4f8cf3a866e264511 Mon Sep 17 00:00:00 2001 From: Limezy Date: Mon, 5 Sep 2022 22:03:32 +0700 Subject: [PATCH 6/6] Update app-02-email.patch --- sources/patches/app-02-email.patch | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sources/patches/app-02-email.patch b/sources/patches/app-02-email.patch index 49a8e12..dbbf9b2 100644 --- a/sources/patches/app-02-email.patch +++ b/sources/patches/app-02-email.patch @@ -1,12 +1,11 @@ diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx -index 669d0038..524b74a8 100644 +index 669d0038..ccc5c047 100644 --- a/server/emails/mailer.tsx +++ b/server/emails/mailer.tsx -@@ -118,6 +118,7 @@ export class Mailer { - ciphers: env.SMTP_TLS_CIPHERS, - } - : undefined -+ ignoreTLS:true +@@ -121,6 +121,7 @@ export class Mailer { : { rejectUnauthorized: false, - }, \ No newline at end of file + }, ++ ignoreTLS:true + }; + } \ No newline at end of file