mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-10-10 19:32:29 +00:00
Clarify remote setup and verify manual CouchDB onboarding
This commit is contained in:
@@ -934,25 +934,25 @@ P2P:
|
||||
NoKnownPeers: No peers has been detected, waiting incoming other peers...
|
||||
Note:
|
||||
description: >2-
|
||||
This replicator allows us to synchronise our vault with other devices
|
||||
using a peer-to-peer connection. We can use this to synchronise our vault
|
||||
with our other devices without using a cloud service.
|
||||
This replicator allows us to synchronise our vault with other devices
|
||||
using a peer-to-peer connection. We can use this to synchronise our vault
|
||||
with our other devices without using a cloud service.
|
||||
|
||||
This replicator is based on Trystero. It also uses a signalling server to
|
||||
establish a connection between devices. The signalling server is used to
|
||||
exchange connection information between devices. It does (or,should) not
|
||||
know or store any of our data.
|
||||
This replicator is based on Trystero. It also uses a signalling server to
|
||||
establish a connection between devices. The signalling server is used to
|
||||
exchange connection information between devices. It does (or,should) not
|
||||
know or store any of our data.
|
||||
|
||||
|
||||
The signalling server can be hosted by anyone. This is just a Nostr relay.
|
||||
For the sake of simplicity and checking the behaviour of the replicator,
|
||||
an instance of the signalling server is hosted by vrtmrz. You can use the
|
||||
experimental server provided by vrtmrz, or you can use any other server.
|
||||
The signalling server can be hosted by anyone. This is just a Nostr relay.
|
||||
For the sake of simplicity and checking the behaviour of the replicator,
|
||||
an instance of the signalling server is hosted by vrtmrz. You can use the
|
||||
experimental server provided by vrtmrz, or you can use any other server.
|
||||
|
||||
|
||||
By the way, even if the signalling server does not store our data, it can
|
||||
see the connection information of some of our devices. Please be aware of
|
||||
this. Also, be cautious when using the server provided by someone else.
|
||||
By the way, even if the signalling server does not store our data, it can
|
||||
see the connection information of some of our devices. Please be aware of
|
||||
this. Also, be cautious when using the server provided by someone else.
|
||||
important_note: Peer-to-Peer Replicator.
|
||||
important_note_sub: This feature is still on the bleeding edge. Please be aware
|
||||
that ensure your data is backed up before using this feature. And, we
|
||||
@@ -1895,9 +1895,9 @@ Ui:
|
||||
Guidance: We will now guide you through a few questions to simplify the synchronisation setup.
|
||||
SelectExisting:
|
||||
Guidance: You are adding this device to an existing synchronisation setup.
|
||||
ManualOption: Enter the server information manually
|
||||
ManualOptionDesc: Configure the same server information as your other devices again manually. This is intended only for advanced users.
|
||||
ProceedManual: I know my server details, let me enter them
|
||||
ManualOption: Configure a remote manually
|
||||
ManualOptionDesc: Configure the same remote as your other devices again manually. This is intended only for advanced users.
|
||||
ProceedManual: Proceed with manual configuration
|
||||
ProceedQr: Scan the QR code displayed on an active device using this device's camera.
|
||||
ProceedSetupUri: Proceed with Setup URI
|
||||
Question: Please select a method to import the settings from another device.
|
||||
@@ -1907,14 +1907,14 @@ Ui:
|
||||
SetupUriOptionDesc: Paste the Setup URI generated from one of your active devices.
|
||||
Title: Device Setup Method
|
||||
SelectNew:
|
||||
Guidance: We will now proceed with the server configuration.
|
||||
ManualOption: Enter the server information manually
|
||||
ManualOptionDesc: This is an advanced option for users who do not have a Setup URI or who want to configure detailed settings.
|
||||
ProceedManual: I know my server details, let me enter them
|
||||
Guidance: We will now configure the synchronisation connection.
|
||||
ManualOption: Configure a remote manually
|
||||
ManualOptionDesc: This is an advanced option for users who do not have a Setup URI or who want to configure detailed settings. You can also use it for P2P synchronisation instead of CouchDB or S3-compatible Object Storage.
|
||||
ProceedManual: Proceed with manual configuration
|
||||
ProceedSetupUri: Proceed with Setup URI
|
||||
Question: How would you like to configure the connection to your server?
|
||||
Question: How would you like to configure this synchronisation connection?
|
||||
SetupUriOption: Use a Setup URI (Recommended)
|
||||
SetupUriOptionDesc: A Setup URI is a single string containing your server address and authentication details. If one was generated by your server installation script, it provides a simple and secure configuration method.
|
||||
SetupUriOptionDesc: A Setup URI is a single string containing connection and authentication details. When one is available from a setup script, it provides a simple and secure configuration method.
|
||||
Title: Connection Method
|
||||
OutroAskUserMode:
|
||||
CompatibleOption: The remote is already set up, and the configuration is compatible (or became compatible through this operation).
|
||||
@@ -1951,13 +1951,13 @@ Ui:
|
||||
Proceed: I Understand, Prepare This Device
|
||||
Title: "Final Confirmation: Prepare This Device for P2P"
|
||||
SetupRemote:
|
||||
BucketOption: S3/MinIO/R2 Object Storage
|
||||
BucketOptionDesc: Synchronisation using journal files. You must already have an S3/MinIO/R2 compatible object storage service set up.
|
||||
BucketOption: S3-compatible Object Storage
|
||||
BucketOptionDesc: Synchronisation using journal files. You must already have an S3-compatible Object Storage service set up, such as Amazon S3, MinIO, or Cloudflare R2.
|
||||
CouchDbOptionDesc: This is the most suitable synchronisation method for the current design. All features are available. You must already have a CouchDB instance set up.
|
||||
Guidance: Please select the type of server you are connecting to.
|
||||
P2POption: Peer-to-Peer only
|
||||
Guidance: Select the remote type for this synchronisation setup.
|
||||
P2POption: Peer-to-Peer (P2P)
|
||||
P2POptionDesc: This enables direct synchronisation between devices. No server is required, but both devices must be online at the same time and some features may be limited. Internet connectivity is required only for signalling, not for data transfer.
|
||||
ProceedBucket: Continue to S3/MinIO/R2 setup
|
||||
ProceedBucket: Continue to Object Storage setup
|
||||
ProceedCouchDb: Continue to CouchDB setup
|
||||
ProceedP2P: Continue to Peer-to-Peer only setup
|
||||
Title: Enter Server Information
|
||||
ProceedP2P: Continue to P2P setup
|
||||
Title: Choose a synchronisation remote
|
||||
|
||||
Reference in New Issue
Block a user