From f459e4cbc6b0350c2a74571c66bb4bfa5504fa74 Mon Sep 17 00:00:00 2001 From: Jess Date: Mon, 15 Mar 2021 04:42:02 -0400 Subject: [PATCH 1/2] Doc: Adds S3 Synchronization Info (#4675) --- README.md | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2d4f3cc94..e894f340a 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ The Web Clipper is a browser extension that allows you to save web pages and scr |
[Nicholas Head](https://github.com/nicholashead) |
[Frank Bloise](https://github.com/fbloise) |
[Thomas Broussard](https://github.com/thomasbroussard) |
[Brandon Johnson](https://github.com/dbrandonjohnson) |
[@cnagy](https://github.com/c-nagy) |
[clmntsl](https://github.com/clmntsl) |
[mcejp](https://github.com/mcejp) |
[joesfer](https://github.com/joesfer) |
[chr15m](https://github.com/chr15m) -|
[piccobit](https://github.com/piccobit) +|
[piccobit](https://github.com/piccobit) |
[Jess Sullivan](https://github.com/jesssullivan) # Table of contents @@ -263,6 +263,44 @@ In the **desktop application** or **mobile application**, select "OneDrive" as t In the **terminal application**, to initiate the synchronisation process, type `:sync`. You will be asked to follow a link to authorise the application (simply input your Microsoft credentials - you do not need to register with OneDrive). +## AWS S3 synchronisation + +In the **desktop application** or **mobile application**, select "AWS S3 (Beta)" as the synchronisation target in the Configuration screen. + +- **AWS S3 Bucket:** The name of your Bucket, such as `joplin-bucket` +- **AWS S3 URL:** Fully qualified URL; By default this should be `https://s3.amazonaws.com/` +- **AWS key & AWS secret:** IAM user's programmatic access key. To create a new key & secret, visit [IAM Security Credentials](https://console.aws.amazon.com/iam/home#/security_credentials). + + +While creating a new Bucket for Joplin, disable **Bucket Versioning**, enable **Block all public access** and enable **Default encryption** with `Amazon S3 key (SSE-S3)`. + +To add a **Bucket Policy** from the AWS S3 Web Console, navigate to the **Permissions** tab. Temporarily disable **Block all public access** to edit the Bucket policy, something along the lines of: +``` +{ + "Version": "2012-10-17", + "Statement": [ + { + "Sid": "VisualEditor0", + "Effect": "Allow", + "Principal": "*", + "Action": [ + "s3:ListBucket", + "s3:GetBucketLocation", + "s3:DeleteObject", + "s3:DeleteObjectVersion", + "s3:PutObject" + ] + "Resource": [ + "arn:aws:s3:::joplin-bucket", + "arn:aws:s3:::joplin-bucket/*" + ] + } + ] +} +``` + + + # Encryption Joplin supports end-to-end encryption (E2EE) on all the applications. E2EE is a system where only the owner of the notes, notebooks, tags or resources can read them. It prevents potential eavesdroppers - including telecom providers, internet providers, and even the developers of Joplin from being able to access the data. Please see the [End-To-End Encryption Tutorial](https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md) for more information about this feature and how to enable it. From ba54bb02faf00449388a0321db850e317dad8409 Mon Sep 17 00:00:00 2001 From: Aman <65647302+Lord-Aman@users.noreply.github.com> Date: Mon, 15 Mar 2021 14:19:59 +0530 Subject: [PATCH 2/2] Fixed a typo in the Paste Special Project Idea (#4673) --- readme/gsoc2021/ideas.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme/gsoc2021/ideas.md b/readme/gsoc2021/ideas.md index 90b3b4f3a..e2a149fe5 100644 --- a/readme/gsoc2021/ideas.md +++ b/readme/gsoc2021/ideas.md @@ -66,7 +66,7 @@ Potential Mentor(s): [PackElend](https://discourse.joplinapp.org/u/PackElend), [ ## 5. Paste special -A plugin that will allow pasting special text into Joplin and have it converted to Markdown. For example, paste an Excel or CSV table, and have it converted to a Markdown table. Paste some HTML or PDF text and again have it converted to formatted Markdown. This could be one plugin, or a collection of plugins, one for eadch "paste special" operation. +A plugin that will allow pasting special text into Joplin and have it converted to Markdown. For example, paste an Excel or CSV table, and have it converted to a Markdown table. Paste some HTML or PDF text and again have it converted to formatted Markdown. This could be one plugin, or a collection of plugins, one for each "paste special" operation. Expected Outcome: One or more plugins that allow pasting special text.