Merge pull request #60 from YunoHost-Apps/testing

Testing to master

README.md

@@ -25,7 +25,7 @@ The fastest wiki and knowledge base for growing teams. Beautiful, feature rich,
 - Using Yunohost's built-in SMTP server for notifications
 
 
-**Shipped version:** 0.65.2~ynh2
+**Shipped version:** 0.66.0~ynh1
 
 
 **Demo:** https://app.getoutline.com/create

README_fr.md

@@ -25,7 +25,7 @@ The fastest wiki and knowledge base for growing teams. Beautiful, feature rich,
 - Using Yunohost's built-in SMTP server for notifications
 
 
-**Version incluse :** 0.65.2~ynh2
+**Version incluse :** 0.66.0~ynh1
 
 
 **Démo :** https://app.getoutline.com/create

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

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": [

scripts/_common.sh

@@ -7,7 +7,7 @@
 # dependencies used by the app
 pkg_dependencies="postgresql"
 
-NODEJS_VERSION=14
+NODEJS_VERSION=16
 
 #=================================================
 # PERSONAL HELPERS

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

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

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<Props> {

sources/patches/app-02-email.patch

@@ -1,12 +1,11 @@
 diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx
-index f366391a9..2df962fbc 100644
+index 669d0038..ccc5c047 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
+@@ -121,6 +121,7 @@ export class Mailer {
+         : {
+             rejectUnauthorized: false,
+           },
++          ignoreTLS:true
      };
-   }
- 
+   }