Merge pull request #75 from YunoHost-Apps/testing

Testing to master

README.md

@@ -6,6 +6,7 @@ It shall NOT be edited by hand.
 # Outline for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/outline.svg)](https://dash.yunohost.org/appci/app/outline) ![Working status](https://ci-apps.yunohost.org/ci/badges/outline.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/outline.maintain.svg)
+
 [![Install Outline with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=outline)
 
 *[Lire ce readme en français.](./README_fr.md)*
@@ -25,7 +26,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.67.2~ynh1
+**Shipped version:** 0.69.2.2~ynh1
 
 **Demo:** https://app.getoutline.com/create
 
@@ -38,7 +39,7 @@ The fastest wiki and knowledge base for growing teams. Beautiful, feature rich,
 ### Not totally free licence
 Outline is a softwared licenced under [BUSL 1.1 licence](https://spdx.org/licenses/BUSL-1.1.html). 
 ⚠️ That licence **is not totally free**. Please read it very carefully if you have any commercial use in mind.
-The Outline version shipped with this package (v0.65.2) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE).
+The Outline version shipped with this package (v0.68.0) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE).
 
 ### Known limitations
 
@@ -55,6 +56,10 @@ The Outline version shipped with this package (v0.65.2) will be released under A
 The first user to login will automatically be granted admin rights
 You can then change the user rights by default and/or change the admin user afterwards from the Outline settings page
 
+## :red_circle: Antifeatures
+
+- **Not totally free upstream**: The packaged app is under an overall free licence, but with clauses that restrict its use.
+
 ## Documentation and resources
 
 * Official app website: <https://www.getoutline.com>

README_fr.md

@@ -6,6 +6,7 @@ It shall NOT be edited by hand.
 # Outline pour YunoHost
 
 [![Niveau d’intégration](https://dash.yunohost.org/integration/outline.svg)](https://dash.yunohost.org/appci/app/outline) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/outline.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/outline.maintain.svg)
+
 [![Installer Outline avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=outline)
 
 *[Read this readme in english.](./README.md)*
@@ -25,7 +26,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.67.2~ynh1
+**Version incluse :** 0.69.2.2~ynh1
 
 **Démo :** https://app.getoutline.com/create
 
@@ -38,7 +39,7 @@ The fastest wiki and knowledge base for growing teams. Beautiful, feature rich,
 ### Not totally free licence
 Outline is a softwared licenced under [BUSL 1.1 licence](https://spdx.org/licenses/BUSL-1.1.html). 
 ⚠️ That licence **is not totally free**. Please read it very carefully if you have any commercial use in mind.
-The Outline version shipped with this package (v0.65.2) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE).
+The Outline version shipped with this package (v0.68.0) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE).
 
 ### Known limitations
 
@@ -55,6 +56,10 @@ The Outline version shipped with this package (v0.65.2) will be released under A
 The first user to login will automatically be granted admin rights
 You can then change the user rights by default and/or change the admin user afterwards from the Outline settings page
 
+## :red_circle: Fonctions indésirables
+
+- **Not totally free upstream**: The packaged app is under an overall free licence, but with clauses that restrict its use.
+
 ## Documentations et ressources
 
 * Site officiel de l’app : <https://www.getoutline.com>

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/outline/outline/archive/f0d9bb4898642ca65bde42c8c53d1a4c6dc72e0d.zip
+SOURCE_URL=https://github.com/outline/outline/archive/25e8c32b8403042b6813e2a6861f4cd16586ed69.zip
-SOURCE_SUM=0788a176da28b52433a19d7144878ad8c2fad3b2893a22aa69285a1f6c356731
+SOURCE_SUM=8bb592ae014e653752311eb0664cc7741faaeb14b7101b06c5b55d878b616658
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true

conf/policy.json

@@ -0,0 +1,20 @@
+{
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Sid": "AllowPublicRead",
+            "Effect": "Allow",
+            "Principal": {
+                "AWS": [
+                    "*"
+                ]
+            },
+            "Action": [
+                "s3:GetObject"
+            ],
+            "Resource": [
+                "arn:aws:s3:::outlinestorage/public/*"
+            ]
+        }
+    ]
+}

doc/DISCLAIMER.md

@@ -1,7 +1,7 @@
 ### Not totally free licence
 Outline is a softwared licenced under [BUSL 1.1 licence](https://spdx.org/licenses/BUSL-1.1.html). 
 ⚠️ That licence **is not totally free**. Please read it very carefully if you have any commercial use in mind.
-The Outline version shipped with this package (v0.65.2) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE).
+The Outline version shipped with this package (v0.68.0) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE).
 
 ### Known limitations
 

manifest.json

@@ -6,7 +6,7 @@
         "en": "Wiki and knowledge base for teams",
         "fr": "Wiki et base de connaissances pour les équipes"
     },
-    "version": "0.67.2~ynh1",
+    "version": "0.69.2.2~ynh1",
     "url": "www.getoutline.com",
     "upstream": {
         "license": "BUSL-1.1",

scripts/_common.sh

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

scripts/install

@@ -194,9 +194,12 @@ chown -R $app:www-data "$final_path"
 #=================================================
 ynh_script_progression --message="Setting up MinIO bucket for Outline..." --weight=1
 
+ynh_add_config --template="../conf/policy.json" --destination="$mc_path/policy.json"
+chown minio:www-data "$mc_path/policy.json"
+
 pushd "$mc_path"
 	ynh_exec_warn_less sudo -u minio ./mc mb minio/outlinestorage --region "fr-ynh-1"
-	ynh_exec_warn_less sudo -u minio ./mc policy set public minio/outlinestorage
+	ynh_exec_warn_less sudo -u minio ./mc anonymous set-json ./policy.json minio/outlinestorage
 popd
 
 #=================================================
@@ -214,14 +217,10 @@ 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 --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 --network-timeout 1000000000 2>&1
+	ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --frozen-lockfile --network-timeout 1000000000 2>&1
+	ynh_script_progression --message="Building... 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="Cleaning cache... " --weight=3
 	ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean 2>&1
 popd

scripts/restore

@@ -122,11 +122,15 @@ chown -R $app:www-data "$final_path"
 
 mv "$final_path/outlinestorage" "$mc_path/outlinestorage"
 chown -R minio:www-data "$mc_path/outlinestorage"
+
+ynh_add_config --template="../conf/policy.json" --destination="$mc_path/policy.json"
+chown minio:www-data "$mc_path/policy.json"
+
 pushd "$mc_path"
 	ynh_exec_warn_less sudo -u minio ./mc mb minio/outlinestorage --region "fr-ynh-1"
-	ynh_exec_warn_less sudo -u minio ./mc policy set public minio/outlinestorage
+	ynh_exec_warn_less sudo -u minio ./mc anonymous set-json ./policy.json minio/outlinestorage
-	ynh_exec_warn_less sudo -u minio ./mc mirror --a ./outlinestorage/ minio/outlinestorage
 popd
+
 ynh_secure_remove --file="$mc_path/outlinestorage"
 
 #=================================================

scripts/upgrade

@@ -95,6 +95,18 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
+#=================================================
+# UPDATE MINIO BUCKET
+#=================================================
+ynh_script_progression --message="Updating outlinestorage MinIO bucket access policy..." --weight=1
+
+ynh_add_config --template="../conf/policy.json" --destination="$mc_path/policy.json"
+chown minio:www-data "$mc_path/policy.json"
+
+pushd "$mc_path"
+	ynh_exec_warn_less sudo -u minio ./mc anonymous set-json ./policy.json minio/outlinestorage
+popd
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -123,15 +135,11 @@ 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_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 --no-optional --frozen-lockfile --network-timeout 1000000000 2>&1
+	ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --frozen-lockfile --network-timeout 1000000000 2>&1
-	ynh_script_progression --message="Cleaning cache... " --weight=1
+	ynh_script_progression --message="Building... This can be very long, be patient !" --weight=18
-	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_script_progression --message="Cleaning cache... " --weight=3
-	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-email.patch

@@ -1,8 +1,8 @@
 diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx
-index 0d4dea367..5857ccb8a 100644
+index 3584f03b4..c72e6f3fb 100644
 --- a/server/emails/mailer.tsx
 +++ b/server/emails/mailer.tsx
-@@ -123,6 +123,7 @@ export class Mailer {
+@@ -138,6 +138,7 @@ export class Mailer {
          : {
              rejectUnauthorized: false,
            },