From c7795aa8586fbc62c02a935c1577ba073ffb76cb Mon Sep 17 00:00:00 2001 From: Scott Klupfel Date: Fri, 18 Dec 2015 17:44:34 +1000 Subject: [PATCH 1/7] Add note about running syncthing instance on discovery server --- users/discosrv.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/users/discosrv.rst b/users/discosrv.rst index de09815be..22e3d8b27 100644 --- a/users/discosrv.rst +++ b/users/discosrv.rst @@ -26,6 +26,12 @@ to select a different location. Configuring ----------- +.. note:: + If you are running an instance of syncthing on the discovery server, + you must either add that instance to other nodes using a static + address or bind the discovery server and syncthing instances to + different IP addresses. + Running discosrv with non-default settings requires passing the respective parameters to discosrv on every start. ``discosrv -help`` gives you all the tweakables with their defaults: From 0cfbceb4282e0b46234bce7bb085a9acebe25e82 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Mon, 21 Dec 2015 12:04:47 +0100 Subject: [PATCH 2/7] Add other build servers --- dev/infrastructure.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dev/infrastructure.rst b/dev/infrastructure.rst index 8b0502d19..c56f4b3a1 100644 --- a/dev/infrastructure.rst +++ b/dev/infrastructure.rst @@ -64,6 +64,14 @@ Runs Jenkins and does the core and Android builds, Ubuntu Linux. - build2.syncthing.net (build runner, SmartOS container, 8192 MB) - `android.syncthing.net `__ (Ubuntu Linux, 3072 MB) +Build Servers, Other +-------------------- + +Runs a Jenkins slave and builds release builds for their respective OS. + +- native-windows-amd64 (Windows 2012 R2, Amazon EC2 t2.micro) +- native-darwin-amd64 (Mac OS X 10.8.5, MacBookPro5,1) + APT Server ---------- From dc1b6d3eccc9b7c8174bccf286516acd4414a402 Mon Sep 17 00:00:00 2001 From: Matt Kantor Date: Sun, 27 Dec 2015 17:57:40 -0800 Subject: [PATCH 3/7] Syncthing is not beta anymore in SynoCommunity. The Syncthing package is not marked as beta these days, so there is no need to change the package manager settings. --- users/contrib.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/users/contrib.rst b/users/contrib.rst index bd87b039e..616742d5f 100644 --- a/users/contrib.rst +++ b/users/contrib.rst @@ -103,8 +103,7 @@ Synology NAS the files at https://synocommunity.com/packages). Numerous CPU architectures are supported. SPK's may be older versions, however you can execute a Syncthing version upgrade via Web-GUI after - installation on Synology device. As Syncthing is marked as beta by - the SynoCommunity, you need to enable beta-versions in the settings. + installation on Synology device. QNAP NAS ~~~~~~~~ From 0a72691cc47d7371d90706d6af39c12d301587f7 Mon Sep 17 00:00:00 2001 From: Jimmy Jones Date: Wed, 30 Dec 2015 14:34:12 +0000 Subject: [PATCH 4/7] Support space in directory Currently the script breaks if versionspath or filepath contain a space, this fixes it. --- users/versioning.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/users/versioning.rst b/users/versioning.rst index 4b0bf2f2c..614aec406 100644 --- a/users/versioning.rst +++ b/users/versioning.rst @@ -100,7 +100,8 @@ the following script and store it as ``/Users/jb/bin/onlylatest.sh`` (i.e. the filepath="$2" # First ensure the dir where we need to store the file exists - mkdir -p `dirname "$versionspath/$filepath"` + outpath=`dirname "$versionspath/$filepath"` + mkdir -p "$outpath" # Then move the file there mv -f "$folderpath/$filepath" "$versionspath/$filepath" From 2eea0f9799ff2405f525235240f57c6ca135c4d2 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sat, 14 Nov 2015 13:01:17 +0100 Subject: [PATCH 5/7] Add hash algos as flags on the folder in cluster config --- specs/bep-v1.rst | 10 +++++++++- {draft => users}/hashalgo.rst | 0 2 files changed, 9 insertions(+), 1 deletion(-) rename {draft => users}/hashalgo.rst (100%) diff --git a/specs/bep-v1.rst b/specs/bep-v1.rst index 7d47ccca2..eaf6e438f 100644 --- a/specs/bep-v1.rst +++ b/specs/bep-v1.rst @@ -337,7 +337,7 @@ folder Flags field contains the following single bit flags: 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Reserved |D|P|R| + | Reserved | Hash |D|P|R| +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ :Bit 31 ("R", Read Only): @@ -351,6 +351,14 @@ folder Flags field contains the following single bit flags: :Bit 29 ("D", Ignore Deletes): is set for folders that the device will ignore deletes for. +:Bits 25-28 (Hash): + indicates the hash algorithm in use for this folder, as a four bit integer. + The value values are: + + - 0: SHA256 + - 1: Murmur3-128 + - 2-15: Reserved for future usage + The **Options** field contains a list of options that apply to the folder. Fields (Device Structure) diff --git a/draft/hashalgo.rst b/users/hashalgo.rst similarity index 100% rename from draft/hashalgo.rst rename to users/hashalgo.rst From dbd2a292e4f1e6abb1de35e1adcc7deba8bfe9a1 Mon Sep 17 00:00:00 2001 From: Scott Klupfel Date: Wed, 6 Jan 2016 15:08:34 +1000 Subject: [PATCH 6/7] Add description for progressUpdateIntervalS & tidy --- users/config.rst | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/users/config.rst b/users/config.rst index df7366200..a02d1d552 100644 --- a/users/config.rst +++ b/users/config.rst @@ -151,7 +151,8 @@ ro Syncthing) on this device. rescanIntervalS - The rescan interval, in seconds. + The rescan interval, in seconds. Can be set to zero to disable when external + plugins are used to trigger rescans. ignorePerms True if the folder should ignore permissions. @@ -413,10 +414,10 @@ relayServer from the relay pool server, ``relays.syncthing.net``. maxSendKbps - Outgoing data rate limit, in kibibits per second. + Outgoing data rate limit, in kilobits per second. maxRecvKbps - Incoming data rate limits, in kibibits per second. + Incoming data rate limits, in kilobits per second. reconnectionIntervalS The number of seconds to wait between each attempt to connect to currently @@ -450,7 +451,7 @@ upnpTimeoutSeconds When scanning for UPnP devices, wait this long for responses. urAccepted - Whether the user as accepted to submit anonymous usage data. The default, + Whether the user has accepted to submit anonymous usage data. The default, ``0``, mean the user has not made a choice, and Syncthing will ask at some point in the future. ``-1`` means no, a number above zero means that that version of usage reporting has been accepted. @@ -463,7 +464,7 @@ urURL The URL to post usage report data to, when enabled. urPostInsecurely - When true, the UR URL can be http instead of https, or have a self signed + When true, the UR URL can be http instead of https, or have a self-signed certificate. The default is ``false``. urInitialDelayS @@ -487,7 +488,8 @@ cacheIgnoredFiles the price of memory. progressUpdateIntervalS - .. note:: Requires explanation. + How often in seconds the progress of ongoing downloads is made available to + the GUI. symlinksEnabled Whether to sync symlinks, if supported by the system. @@ -503,10 +505,10 @@ databaseBlockCacheMiB pingTimeoutS Ping-timeout in seconds. Don't change it unless you are having issues due to - slow response time (slow connection/cpu) and large index exchanges + slow response time (slow connection/cpu) and large index exchanges. pingIdleTimeS - ping interval in seconds. Don't change it unless you feel it's necessary. + Ping interval in seconds. Don't change it unless you feel it's necessary. minHomeDiskFreePct The percentage of space that should be available on the partition holding @@ -523,7 +525,7 @@ using the same configuration files) can cause issues. This is easy to do accidentally if you sync your home folder between devices. A common symptom of syncing configuration files is two devices ending up with the same Device ID. -If you want to use syncthing to backup your configuration files, it is recommended +If you want to use Syncthing to backup your configuration files, it is recommended that the files you are backing up are in a :ref:`folder-master` to prevent other devices from overwriting the per device configuration. The folder on the remote device(s) should not be used as configuration for the remote devices. From 4175c3a93c92d0931d2f804b65a2019c142c42ab Mon Sep 17 00:00:00 2001 From: Scott Klupfel Date: Wed, 6 Jan 2016 15:15:33 +1000 Subject: [PATCH 7/7] Reverted kibibits change Sorry, my bad. --- users/config.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/config.rst b/users/config.rst index a02d1d552..a40dd1c62 100644 --- a/users/config.rst +++ b/users/config.rst @@ -414,10 +414,10 @@ relayServer from the relay pool server, ``relays.syncthing.net``. maxSendKbps - Outgoing data rate limit, in kilobits per second. + Outgoing data rate limit, in kibibits per second. maxRecvKbps - Incoming data rate limits, in kilobits per second. + Incoming data rate limits, in kibibits per second. reconnectionIntervalS The number of seconds to wait between each attempt to connect to currently