Merge pull request #29 from Limezy/v0.61.1

V0.61.1
2024-09-03 19:56:12 +02:00 · 2022-02-20 15:25:28 +07:00 · 2022-02-20 15:25:28 +07:00 · 7b68b5aee5
commit 7b68b5aee5
parent 937af4c2db 17563d2661
18 changed files with 40 additions and 66 deletions
--- a/README.md
+++ b/README.md
@ -24,7 +24,7 @@ The fastest wiki and knowledge base for growing teams. Beautiful, feature rich,
 - Setup using Yunohost's built-in SMTP server for notifications


-**Shipped version:** 0.60.1~ynh1
+**Shipped version:** 0.61.1~ynh1

 **Demo:** https://app.getoutline.com/create

--- a/README_fr.md
+++ b/README_fr.md
@ -20,7 +20,7 @@ The fastest wiki and knowledge base for growing teams. Beautiful, feature rich,
 - Setup using Yunohost's built-in SMTP server for notifications


-**Version incluse :** 0.60.1~ynh1
+**Version incluse :** 0.61.1~ynh1

 **Démo :** https://app.getoutline.com/create

--- a/2
+++ b/2
@ -18,7 +18,7 @@
 		setup_public=1
 		upgrade=0
 		#upgrade=1	from_commit=CommitHash
-		backup_restore=0
+		backup_restore=1
 		multi_instance=0
 		change_url=0
 ;;; Options
--- a/conf/.env
+++ b/conf/.env
@ -41,7 +41,7 @@ COLLABORATION_URL=
 # A more detailed guide on setting up S3 is available here:
 # => https://wiki.generaloutline.com/share/125de1cc-9ff6-424b-8415-0d58c809a40f
 #
-AWS_ACCESS_KEY_ID=__MINIO_ID__
+AWS_ACCESS_KEY_ID=minio
 AWS_SECRET_ACCESS_KEY=__MINIO_KEY__
 AWS_REGION=fr-ynh-1
 AWS_S3_UPLOAD_BUCKET_URL=https://__MINIO_DOMAIN__
@ -102,6 +102,12 @@ OIDC_SCOPES="openid profile email"

 # –––––––––––––––– OPTIONAL ––––––––––––––––

+# Base64 encoded private key and certificate for HTTPS termination. This is only
+# required if you do not use an external reverse proxy. See documentation:
+# https://wiki.generaloutline.com/share/1c922644-40d8-41fe-98f9-df2b67239d45
+SSL_KEY=
+SSL_CERT=
+
 # If using a Cloudfront/Cloudflare distribution or similar it can be set below.
 # This will cause paths to javascript, stylesheets, and images to be updated to
 # the hostname defined in CDN_URL. In your CDN configuration the origin server
--- a/conf/app.src
+++ b/conf/app.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.60.1.tar.gz
-SOURCE_SUM=f47cb5ab67aff07382cd3470a94397855e12ff965732870af3665a0bc436c1c7
+SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.61.1.tar.gz
+SOURCE_SUM=20231b9a1014efd144f09ff62e68dad8309fe0437fc56c4c4830461d083ceea1
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
--- a/conf/mc.src
+++ b/conf/mc.src
@ -1,7 +0,0 @@
-SOURCE_URL=https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2021-11-05T10-05-06Z
-SOURCE_SUM=9f5ad72fd93678f9f756c6da34a8d4d1e61f7356a96ee327c652ad765975d2b2
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=
-SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=mc
-SOURCE_EXTRACT=false
--- a/manifest.json
+++ b/manifest.json
@ -6,7 +6,7 @@
        "en": "An open, extensible, wiki for your team built using React and Node.js.",
        "fr": "Un wiki open source et évolutif pour votre équipe, conçu avec React et Node.js"
    },
-    "version": "0.60.1~ynh1",
+    "version": "0.61.1~ynh1",
    "url": "www.getoutline.com",
    "upstream": {
        "license": "BSL 1.1",
--- a/scripts/backup
+++ b/scripts/backup
@ -39,7 +39,6 @@ slack_secret=$(ynh_app_setting_get --app=$app --key=slack_secret)
 secret_key=$(ynh_app_setting_get --app=$app --key=secret_key)
 utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret)
 minio_domain=$(ynh_app_setting_get --app="minio" --key=domain)
-minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
 minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
 mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)

--- a/scripts/change_url
+++ b/scripts/change_url
@ -38,7 +38,6 @@ slack_secret=$(ynh_app_setting_get --app=$app --key=slack_secret)
 secret_key=$(ynh_app_setting_get --app=$app --key=secret_key)
 utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret)
 minio_domain=$(ynh_app_setting_get --app="minio" --key=domain)
-minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
 minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
 mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)

--- a/scripts/install
+++ b/scripts/install
@ -57,11 +57,10 @@ if ! yunohost app list | grep -q "id: minio"; then
 	if yunohost app list | grep -q "$YNH_APP_ARG_MINIO_DOMAIN"; then
 		ynh_die "The domain provided for MinIO is already used by another app. Please chose another one !"
 	fi
-	yunohost app install https://github.com/limezy/minio_ynh --force --args "domain=$YNH_APP_ARG_MINIO_DOMAIN&is_public=true&language=en"
+	yunohost app install https://github.com/YunoHost-Apps/minio_ynh --force --args "domain=$YNH_APP_ARG_MINIO_DOMAIN&is_public=true&language=en"
 fi

 minio_domain=$(ynh_app_setting_get --app="minio" --key=domain)
-minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
 minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
 mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)

--- a/scripts/remove
+++ b/scripts/remove
@ -28,7 +28,6 @@ utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret)


 minio_domain=$(ynh_app_setting_get --app="minio" --key=domain)
-minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
 minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
 mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)

--- a/scripts/restore
+++ b/scripts/restore
@ -48,7 +48,6 @@ slack_secret=$(ynh_app_setting_get --app=$app --key=slack_secret)
 secret_key=$(ynh_app_setting_get --app=$app --key=secret_key)
 utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret)
 minio_domain=$(ynh_app_setting_get --app="minio" --key=domain)
-minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
 minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
 mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)

--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -27,7 +27,6 @@ slack_secret=$(ynh_app_setting_get --app=$app --key=slack_secret)
 secret_key=$(ynh_app_setting_get --app=$app --key=secret_key)
 utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret)
 minio_domain=$(ynh_app_setting_get --app="minio" --key=domain)
-minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
 minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
 mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)

--- a/sources/patches/app-01-branding.patch
+++ b/sources/patches/app-01-branding.patch
@ -0,0 +1,14 @@
+diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx
+index 038bd1df..76ea51a7 100644
+--- a/app/scenes/Document/components/Document.tsx
+++ b/app/scenes/Document/components/Document.tsx
+@@ -600,9 +600,6 @@ class DocumentScene extends React.Component<Props> {
+             </MaxWidth>
+           </Container>
+         </Background>
+-        {isShare && !isCustomDomain() && (
+-          <Branding href="//www.getoutline.com?ref=sharelink" />
+-        )}
+         {!isShare && (
+           <>
+             <KeyboardShortcutsButton />
--- a/sources/patches/app-01-email.patch
+++ b/sources/patches/app-01-email.patch
@ -1,14 +0,0 @@
-diff --git a/server/mailer.js b/server/mailer.js
-index eeedb5ac..d979bab7 100644
--- a/server/mailer.js
-+++ b/server/mailer.js
-@@ -85,6 +85,7 @@ export class Mailer {
-           "SMTP_TLS_CIPHERS" in process.env
-             ? { ciphers: process.env.SMTP_TLS_CIPHERS }
-             : undefined,
-+        ignoreTLS:true
-       };
- 
-       if (process.env.SMTP_USERNAME) {
-- 
-2.18.0
--- a/sources/patches/app-02-email.patch
+++ b/sources/patches/app-02-email.patch
@ -0,0 +1,12 @@
+diff --git a/server/mailer.tsx b/server/mailer.tsx
+index 058e43f6..b7652b19 100644
+--- a/server/mailer.tsx
+++ b/server/mailer.tsx
+@@ -85,6 +85,7 @@ export class Mailer {
+                 ciphers: process.env.SMTP_TLS_CIPHERS,
+               }
+             : undefined,
+          ignoreTLS:true
+       };
+ 
+       if (process.env.SMTP_USERNAME) {
--- a/sources/patches/app-02-email2.patch
+++ b/sources/patches/app-02-email2.patch
@ -1,15 +0,0 @@
-diff --git a/server/presenters/env.js b/server/presenters/env.js
-index adf16ac9..54e009c8 100644
--- a/server/presenters/env.js
-+++ b/server/presenters/env.js
-@@ -17,7 +17,7 @@ export default function present(env: Object): Object {
-     SLACK_APP_ID: env.SLACK_APP_ID,
-     MAXIMUM_IMPORT_SIZE: env.MAXIMUM_IMPORT_SIZE || 1024 * 1000 * 5,
-     SUBDOMAINS_ENABLED: env.SUBDOMAINS_ENABLED === "true",
-    EMAIL_ENABLED: !!env.SMTP_USERNAME || env.NODE_ENV === "development",
-+    EMAIL_ENABLED: !!env.SMTP_HOST || env.NODE_ENV === "development",
-     GOOGLE_ANALYTICS_ID: env.GOOGLE_ANALYTICS_ID,
-     RELEASE: env.SOURCE_COMMIT || env.SOURCE_VERSION || undefined,
-   };
-- 
-2.18.0
--- a/sources/patches/app-03-branding.patch
+++ b/sources/patches/app-03-branding.patch
@ -1,16 +0,0 @@
-diff --git a/app/scenes/Document/components/Document.js b/app/scenes/Document/components/Document.js
-index 2c5bf69b..599bd4f6 100644
--- a/app/scenes/Document/components/Document.js
-+++ b/app/scenes/Document/components/Document.js
-@@ -593,9 +593,6 @@ class DocumentScene extends React.Component<Props> {
-             </MaxWidth>
-           </Container>
-         </Background>
-        {isShare && !isCustomDomain() && (
-          <Branding href="//www.getoutline.com?ref=sharelink" />
-        )}
-         {!isShare && (
-           <>
-             <KeyboardShortcutsButton />
-- 
-2.18.0