mirror of
https://github.com/YunoHost-Apps/outline_ynh.git
synced 2024-09-03 19:56:12 +02:00
commit
f435bb2762
6 changed files with 12 additions and 79 deletions
67
conf/.env
67
conf/.env
|
@ -21,10 +21,6 @@ REDIS_URL=redis://localhost:6379
|
||||||
URL=https://__DOMAIN__
|
URL=https://__DOMAIN__
|
||||||
PORT=__PORT__
|
PORT=__PORT__
|
||||||
|
|
||||||
# See [documentation](docs/SERVICES.md) on running a separate collaboration
|
|
||||||
# server, for normal operation this does not need to be set.
|
|
||||||
COLLABORATION_URL=
|
|
||||||
|
|
||||||
# To support uploading of images for avatars and document attachments an
|
# To support uploading of images for avatars and document attachments an
|
||||||
# s3-compatible storage must be provided. AWS S3 is recommended for redundency
|
# s3-compatible storage must be provided. AWS S3 is recommended for redundency
|
||||||
# however if you want to keep all file storage local an alternative such as
|
# however if you want to keep all file storage local an alternative such as
|
||||||
|
@ -45,33 +41,6 @@ AWS_S3_ACL=private
|
||||||
|
|
||||||
# –––––––––––––– AUTHENTICATION ––––––––––––––
|
# –––––––––––––– AUTHENTICATION ––––––––––––––
|
||||||
|
|
||||||
# Third party signin credentials, at least ONE OF EITHER Google, Slack,
|
|
||||||
# or Microsoft is required for a working installation or you'll have no sign-in
|
|
||||||
# options.
|
|
||||||
|
|
||||||
# To configure Slack auth, you'll need to create an Application at
|
|
||||||
# => https://api.slack.com/apps
|
|
||||||
#
|
|
||||||
# When configuring the Client ID, add a redirect URL under "OAuth & Permissions":
|
|
||||||
# https://<URL>/auth/slack.callback
|
|
||||||
SLACK_KEY=
|
|
||||||
SLACK_SECRET=
|
|
||||||
|
|
||||||
# To configure Google auth, you'll need to create an OAuth Client ID at
|
|
||||||
# => https://console.cloud.google.com/apis/credentials
|
|
||||||
#
|
|
||||||
# When configuring the Client ID, add an Authorized redirect URI:
|
|
||||||
# https://<URL>/auth/google.callback
|
|
||||||
GOOGLE_CLIENT_ID=
|
|
||||||
GOOGLE_CLIENT_SECRET=
|
|
||||||
|
|
||||||
# To configure Microsoft/Azure auth, you'll need to create an OAuth Client. See
|
|
||||||
# the guide for details on setting up your Azure App:
|
|
||||||
# => https://wiki.generaloutline.com/share/dfa77e56-d4d2-4b51-8ff8-84ea6608faa4
|
|
||||||
AZURE_CLIENT_ID=
|
|
||||||
AZURE_CLIENT_SECRET=
|
|
||||||
AZURE_RESOURCE_APP_ID=
|
|
||||||
|
|
||||||
# To configure generic OIDC auth, you'll need some kind of identity provider.
|
# To configure generic OIDC auth, you'll need some kind of identity provider.
|
||||||
# See documentation for whichever IdP you use to acquire the following info:
|
# See documentation for whichever IdP you use to acquire the following info:
|
||||||
# Redirect URI is https://<URL>/auth/oidc.callback
|
# Redirect URI is https://<URL>/auth/oidc.callback
|
||||||
|
@ -94,24 +63,6 @@ OIDC_SCOPES="openid profile email"
|
||||||
|
|
||||||
# –––––––––––––––– OPTIONAL ––––––––––––––––
|
# –––––––––––––––– 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=
|
|
||||||
|
|
||||||
# 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
|
|
||||||
# should be set to the same as URL.
|
|
||||||
CDN_URL=
|
|
||||||
|
|
||||||
# Auto-redirect to https in production. The default is true but you may set to
|
# Auto-redirect to https in production. The default is true but you may set to
|
||||||
# false if you can be sure that SSL is terminated at an external loadbalancer.
|
# false if you can be sure that SSL is terminated at an external loadbalancer.
|
||||||
FORCE_HTTPS=true
|
FORCE_HTTPS=true
|
||||||
|
@ -132,24 +83,6 @@ MAXIMUM_IMPORT_SIZE=5120000
|
||||||
# requests and this ends up being duplicative
|
# requests and this ends up being duplicative
|
||||||
DEBUG=cache,presenters,events,emails,mailer,utils,http,server,processors
|
DEBUG=cache,presenters,events,emails,mailer,utils,http,server,processors
|
||||||
|
|
||||||
# Comma separated list of domains to be allowed to signin to the wiki. If not
|
|
||||||
# set, all domains are allowed by default when using Google OAuth to signin
|
|
||||||
ALLOWED_DOMAINS=
|
|
||||||
|
|
||||||
# For a complete Slack integration with search and posting to channels the
|
|
||||||
# following configs are also needed, some more details
|
|
||||||
# => https://wiki.generaloutline.com/share/be25efd1-b3ef-4450-b8e5-c4a4fc11e02a
|
|
||||||
#
|
|
||||||
SLACK_VERIFICATION_TOKEN=your_token
|
|
||||||
SLACK_APP_ID=A0XXXXXXX
|
|
||||||
SLACK_MESSAGE_ACTIONS=true
|
|
||||||
|
|
||||||
# Optionally enable google analytics to track pageviews in the knowledge base
|
|
||||||
GOOGLE_ANALYTICS_ID=
|
|
||||||
|
|
||||||
# Optionally enable Sentry (sentry.io) to track errors and performance
|
|
||||||
SENTRY_DSN=
|
|
||||||
|
|
||||||
# To support sending outgoing transactional emails such as "document updated" or
|
# To support sending outgoing transactional emails such as "document updated" or
|
||||||
# "you've been invited" you'll need to provide authentication for an SMTP server
|
# "you've been invited" you'll need to provide authentication for an SMTP server
|
||||||
SMTP_HOST='localhost'
|
SMTP_HOST='localhost'
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.63.0.tar.gz
|
SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.64.3.tar.gz
|
||||||
SOURCE_SUM=ca2758a6461c7a159c073374a2480b77d2049625ff9ef87686f57557bd2f0bb4
|
SOURCE_SUM=5fc5f9442114cdf1dfcc924e8e2d7cd6d756e634ca22bd17b366bffee4af4158
|
||||||
SOURCE_SUM_PRG=sha256sum
|
SOURCE_SUM_PRG=sha256sum
|
||||||
SOURCE_FORMAT=tar.gz
|
SOURCE_FORMAT=tar.gz
|
||||||
SOURCE_IN_SUBDIR=true
|
SOURCE_IN_SUBDIR=true
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
### Not totally free licence
|
### Not totally free licence
|
||||||
Outline is a softwared licenced under [BUSL 1.1 licence](https://spdx.org/licenses/BUSL-1.1.html).
|
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.
|
⚠️ 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.63.0) will be released under Apache-2.0 licence [after April 15th 2026](https://github.com/outline/outline/blob/1a8f2c3bb08df1ac3fa9cea5a2a7491757b7cf28/LICENSE).
|
The Outline version shipped with this package (v0.64.3) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE).
|
||||||
|
|
||||||
### Known limitations
|
### Known limitations
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
"en": "Wiki and knowledge base for teams",
|
"en": "Wiki and knowledge base for teams",
|
||||||
"fr": "Wiki et base de connaissances pour les équipes"
|
"fr": "Wiki et base de connaissances pour les équipes"
|
||||||
},
|
},
|
||||||
"version": "0.63.0~ynh3",
|
"version": "0.64.3~ynh1",
|
||||||
"url": "www.getoutline.com",
|
"url": "www.getoutline.com",
|
||||||
"upstream": {
|
"upstream": {
|
||||||
"license": "BUSL-1.1",
|
"license": "BUSL-1.1",
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx
|
diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx
|
||||||
index 955a1fd5..ce385aa2 100644
|
index 6a9d1265..452511f1 100644
|
||||||
--- a/app/scenes/Document/components/Document.tsx
|
--- a/app/scenes/Document/components/Document.tsx
|
||||||
+++ b/app/scenes/Document/components/Document.tsx
|
+++ b/app/scenes/Document/components/Document.tsx
|
||||||
@@ -611,9 +611,6 @@ class DocumentScene extends React.Component<Props> {
|
@@ -625,9 +625,6 @@ class DocumentScene extends React.Component<Props> {
|
||||||
</Flex>
|
</Flex>
|
||||||
</React.Suspense>
|
</React.Suspense>
|
||||||
</MaxWidth>
|
</MaxWidth>
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx
|
diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx
|
||||||
index 6fc9865a..69e5b8ac 100644
|
index b13e29dd..bac5fc41 100644
|
||||||
--- a/server/emails/mailer.tsx
|
--- a/server/emails/mailer.tsx
|
||||||
+++ b/server/emails/mailer.tsx
|
+++ b/server/emails/mailer.tsx
|
||||||
@@ -109,6 +109,7 @@ export class Mailer {
|
@@ -107,6 +107,7 @@ export class Mailer {
|
||||||
ciphers: process.env.SMTP_TLS_CIPHERS,
|
ciphers: env.SMTP_TLS_CIPHERS,
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
+ ignoreTLS:true
|
+ ignoreTLS:true
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue