From 97753fb13301ef09675af20432136a09d32ee5bf Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 17 Feb 2022 12:03:17 +0700 Subject: [PATCH 1/8] First test v0.61.1 --- README.md | 2 +- README_fr.md | 2 +- check_process | 2 +- conf/.env | 6 ++++++ conf/app.src | 4 ++-- conf/mc.src | 7 ------- manifest.json | 2 +- 7 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 conf/mc.src diff --git a/README.md b/README.md index d8a8db5..b59bb5e 100644 --- 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 diff --git a/README_fr.md b/README_fr.md index 26a7776..656b138 100644 --- 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 diff --git a/check_process b/check_process index df8be15..8c37c43 100644 --- a/check_process +++ b/check_process @@ -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 diff --git a/conf/.env b/conf/.env index fca1012..dd4323a 100644 --- a/conf/.env +++ b/conf/.env @@ -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 diff --git a/conf/app.src b/conf/app.src index eb5e573..f6186e5 100644 --- 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 diff --git a/conf/mc.src b/conf/mc.src deleted file mode 100644 index 8f12cdd..0000000 --- a/conf/mc.src +++ /dev/null @@ -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 diff --git a/manifest.json b/manifest.json index 143b5e8..e8e1013 100644 --- 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", From a77cb2d79ff55e54101e086aa014412927fab750 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 17 Feb 2022 12:04:12 +0700 Subject: [PATCH 2/8] Redirect to official Minio_ynh repo --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 5ff4e54..789eb8a 100755 --- a/scripts/install +++ b/scripts/install @@ -57,7 +57,7 @@ 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) From 6a288a8bff5cdaf35106933b87d4b692110b0262 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 17 Feb 2022 12:11:48 +0700 Subject: [PATCH 3/8] Temporary remove patches --- sources/patches/app-01-email.patch | 14 -------------- sources/patches/app-02-email2.patch | 15 --------------- sources/patches/app-03-branding.patch | 16 ---------------- 3 files changed, 45 deletions(-) delete mode 100644 sources/patches/app-01-email.patch delete mode 100644 sources/patches/app-02-email2.patch delete mode 100644 sources/patches/app-03-branding.patch diff --git a/sources/patches/app-01-email.patch b/sources/patches/app-01-email.patch deleted file mode 100644 index 9014eef..0000000 --- a/sources/patches/app-01-email.patch +++ /dev/null @@ -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 \ No newline at end of file diff --git a/sources/patches/app-02-email2.patch b/sources/patches/app-02-email2.patch deleted file mode 100644 index d5068b6..0000000 --- a/sources/patches/app-02-email2.patch +++ /dev/null @@ -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 \ No newline at end of file diff --git a/sources/patches/app-03-branding.patch b/sources/patches/app-03-branding.patch deleted file mode 100644 index 1204b85..0000000 --- a/sources/patches/app-03-branding.patch +++ /dev/null @@ -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 { - - - -- {isShare && !isCustomDomain() && ( -- -- )} - {!isShare && ( - <> - --- -2.18.0 \ No newline at end of file From ff5664514020483cee4ee063b21ff10320c33f00 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 17 Feb 2022 13:28:38 +0700 Subject: [PATCH 4/8] Update install minio_id was removed from minio app --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 789eb8a..899fb4d 100755 --- a/scripts/install +++ b/scripts/install @@ -61,7 +61,7 @@ if ! yunohost app list | grep -q "id: minio"; then fi minio_domain=$(ynh_app_setting_get --app="minio" --key=domain) -minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id) +minio_id=$(ynh_app_setting_get --app="minio" --key=app) minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key) mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path) From 6a2e19bf089d8872aabb18508dcb8f5c72249518 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 17 Feb 2022 15:01:40 +0700 Subject: [PATCH 5/8] Removal of minio_id --- conf/.env | 2 +- scripts/backup | 1 - scripts/change_url | 1 - scripts/install | 1 - scripts/remove | 1 - scripts/restore | 1 - scripts/upgrade | 1 - 7 files changed, 1 insertion(+), 7 deletions(-) diff --git a/conf/.env b/conf/.env index dd4323a..4f629bd 100644 --- 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__ diff --git a/scripts/backup b/scripts/backup index 0650966..aa826ad 100755 --- 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) diff --git a/scripts/change_url b/scripts/change_url index 8abf6bb..84a524e 100644 --- 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) diff --git a/scripts/install b/scripts/install index 899fb4d..05b8ba6 100755 --- a/scripts/install +++ b/scripts/install @@ -61,7 +61,6 @@ if ! yunohost app list | grep -q "id: minio"; then fi minio_domain=$(ynh_app_setting_get --app="minio" --key=domain) -minio_id=$(ynh_app_setting_get --app="minio" --key=app) minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key) mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path) diff --git a/scripts/remove b/scripts/remove index 7338e14..7fc17c9 100755 --- 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) diff --git a/scripts/restore b/scripts/restore index 1b427e3..6f6687c 100755 --- 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) diff --git a/scripts/upgrade b/scripts/upgrade index 8199ce3..14abc17 100644 --- 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) From 982dc654b4e6cac9d271d7fcee9869e6f1dd9491 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sun, 20 Feb 2022 01:10:42 +0700 Subject: [PATCH 6/8] Patches for email and branding removal --- sources/patches/app-01-branding.patch | 14 ++++++++++++++ sources/patches/app-02-email.patch | 12 ++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 sources/patches/app-01-branding.patch create mode 100644 sources/patches/app-02-email.patch diff --git a/sources/patches/app-01-branding.patch b/sources/patches/app-01-branding.patch new file mode 100644 index 0000000..39a2df0 --- /dev/null +++ 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 690fb737..2573430b 100644 +--- a/app/scenes/Document/components/Document.tsx ++++ b/app/scenes/Document/components/Document.tsx +@@ -635,9 +635,6 @@ class DocumentScene extends React.Component { + + + +- {isShare && !isCustomDomain() && ( +- +- )} + + + {!isShare && ( \ No newline at end of file diff --git a/sources/patches/app-02-email.patch b/sources/patches/app-02-email.patch new file mode 100644 index 0000000..1c5d162 --- /dev/null +++ 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) { \ No newline at end of file From e816bf7b7c9c80725e29f0be168b8268f19b567f Mon Sep 17 00:00:00 2001 From: Limezy Date: Sun, 20 Feb 2022 01:18:59 +0700 Subject: [PATCH 7/8] Corrective patch --- sources/patches/app-01-branding.patch | 2 +- sources/patches/app-02-email.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/patches/app-01-branding.patch b/sources/patches/app-01-branding.patch index 39a2df0..b2748f9 100644 --- a/sources/patches/app-01-branding.patch +++ b/sources/patches/app-01-branding.patch @@ -11,4 +11,4 @@ index 690fb737..2573430b 100644 - )} - {!isShare && ( \ No newline at end of file + {!isShare && ( diff --git a/sources/patches/app-02-email.patch b/sources/patches/app-02-email.patch index 1c5d162..37cd071 100644 --- a/sources/patches/app-02-email.patch +++ b/sources/patches/app-02-email.patch @@ -9,4 +9,4 @@ index 058e43f6..b7652b19 100644 + ignoreTLS:true }; - if (process.env.SMTP_USERNAME) { \ No newline at end of file + if (process.env.SMTP_USERNAME) { From 17563d266158e1afea1724a2c8994aab8f9fc1b2 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sun, 20 Feb 2022 02:45:35 +0700 Subject: [PATCH 8/8] Correct stupid mistake --- sources/patches/app-01-branding.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sources/patches/app-01-branding.patch b/sources/patches/app-01-branding.patch index b2748f9..f5abb38 100644 --- a/sources/patches/app-01-branding.patch +++ b/sources/patches/app-01-branding.patch @@ -1,14 +1,14 @@ diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx -index 690fb737..2573430b 100644 +index 038bd1df..76ea51a7 100644 --- a/app/scenes/Document/components/Document.tsx +++ b/app/scenes/Document/components/Document.tsx -@@ -635,9 +635,6 @@ class DocumentScene extends React.Component { - - +@@ -600,9 +600,6 @@ class DocumentScene extends React.Component { -- {isShare && !isCustomDomain() && ( -- -- )} +- {isShare && !isCustomDomain() && ( +- +- )} {!isShare && ( + <> +