perso/syncthing-arm
Archived
4
0 Fork 0
Code Issues 1 Actions Releases Wiki Activity

Merge pull request #1502 from calmh/defaults

Browse Source 
Set defaults correctly for autoNormalize
This commit is contained in:
Audrius Butkevicius committed 2015-03-21 14:44:46 +00:00
2 parents fc483cdfc6 157a4c891c
commit b53e545ebc
8 files changed
+64 -32
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gui/scripts/syncthing/core/controllers/syncthingController.js
+3 -1
View File
@@ -922,7 +922,7 @@ angular.module('syncthing.core')
$scope.currentFolder.staggeredMaxAge = 365;
}
$scope.currentFolder.externalCommand = $scope.currentFolder.externalCommand || "";
$scope.editingExisting = true;
$scope.folderEditor.$setPristine();
$('#editFolder').modal();
@@ -939,6 +939,7 @@ angular.module('syncthing.core')
$scope.currentFolder.staggeredCleanInterval = 3600;
$scope.currentFolder.staggeredVersionsPath = "";
$scope.currentFolder.externalCommand = "";
$scope.currentFolder.autoNormalize = true;
$scope.editingExisting = false;
$scope.folderEditor.$setPristine();
$('#editFolder').modal();
@@ -959,6 +960,7 @@ angular.module('syncthing.core')
$scope.currentFolder.staggeredCleanInterval = 3600;
$scope.currentFolder.staggeredVersionsPath = "";
$scope.currentFolder.externalCommand = "";
$scope.currentFolder.autoNormalize = true;
$scope.editingExisting = false;
$scope.folderEditor.$setPristine();
$('#editFolder').modal();
internal/auto/gui.files.go
+1 -1
View File
@@ -192,7 +192,7 @@ func Assets() map[string][]byte {
bs, _ = ioutil.ReadAll(gr)
assets["scripts/syncthing/core/controllers/eventController.js"] = bs
bs, _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/+x963LbOLLw/zwF4y9fJE8U2Zlb7drxTGXj5KzPXJIaT3Z/eLOnaAmyuKFIDS92fCZ599ONC4lLAwRtZ3amalmpWBKBRqPR6G40Go20uGjztJpvymWbs+mkvi4WzTorLuaLsmKT3XsJPPC5aKoyz1k1nZyqEs+7HyezZNXCr1lZJNMH9aLcslnyYN00W/iTl4sU38yS7+FTzk5ZdZkt2G7yK4eNz6StWVI3VbZoJof3up/39pJtlV2mDdtbs3zLqmTJVlmRIbS6L3aZVlCOXR5DweQo2T803hTpZXYBCBQXz67Sa3i/SvOamWXKIs8KRr+rWN2kFdbv33cFul4jVj09pnrn8DF6Pk/bpoTCq+xC/D7dPTRK16w5KRoonOaSmvOKrQCR9Sx5sg+PVv7jPZNe7Xm22ON1aGJJeItys80ZR/0o+fXjofse0Qu9OymQEaBEU7WMKlMwTpqaBsKqqqzw3dlb5x3wIsvpapvrk2N4M5k4b5YMaeuBKF7+xP4VxGlV5ktWDZXaVmVTLsr8+RrmDlu6XNMN2basGmDKlIYj3r8Gxs3YlReKwMmDSs1Y8QIJSZOk3V5U6ZKdFKsSChRtnnsIc9qkTZAmgQJAjgtgTfW2fz29yoplebU7P4e/08k5W4FAaYu8TJeGvLDnijNhTQb7uHvocPODspjudIJGDMxpuwB2qHdCTZnTEoSQnI8dKKBwWi3W0915DjB3w1gUjC2f9ZxjtDSpNpODZHLM8snMfrHMKvkumcLnXbsEimQsgPPNfteU7WKNL99slyD+Jj2CzkAheieLAHIV25SXzIsf/VohByMth9aDYFqDRMvqdwaK1EBO3py84vLY4BJ2yYpmlqTVhT2I2SqZSgH+8GFyv5fXdkF8Kta0VWGK24/3jK9IojJn87y80HDRx1sA4gL59Bq6tbEFuHwpZLz/pZSQfHJ5Sh3389NT4mU/Qac2klwFzy9YM22r/DwFJfsomexdgjyBZie781rMkWlPZmCilKKbHB9ZFTgIC6qvFjl3hXBXqottsuavP//8mguqOAyFaLwJgobQxbJ3jpsUqjdBzpTHAez8EssLzZTuAprVn87KMQUqPpSRYzQ5nfy/gjVXZfWOkwp6D0oazJPJOlvyyWGX7iEOl63XbYPyw1/SJ/Rxfq5WI4WFpWA+fEjuC9LckcCQCFkd9dmYCqsBweUdgV0bt0GadQwfSTMwK1/APGnA1rlasyJJE4SQgKbMoTNZXs+Tv7METfhmjWZ82rQ1EGUJ30vgtWsbGPwKYrGtWFK2DYBMm0mdXFUlrDnu/baDpVMCO36nI4ZFAOhcEuToCJYmVDlJlWeJHN6Ey4BZUpRNkhaC1vwnsqYaWJRkAe7jlEgY9MPG65uj5Mv9fVSd2o9Pj5Kv/vznILYXrGiRPEP4jZIceq1YCaLXGZYkdg2U8cEJxSk3doqhOmZygRA5y3CtuRR6CwfC1Q44bvoC6YyrYGGfvw3oCbcwH2WmlHhTjpYg3Ew+KZbsvTA776yPhk0z1XAeb/sAkwrkEm2tK9kbViIJSi+1ZmxABiVXILvWaYVSLMMiCDq5ypr1/B5BVbkuM+kq4cH36kUKywbNMuBvnq88Rqm0CBWefXEJ8uR4lvip8TFGU/4E5nvDfgeDpncTy4oe+vrn7Y+wjI+zWroaovsDs4EBV7iOijPVvXm2fDvGGh/A8flIBLluGUAvMN99VZxlX9decb6tD5L9GfkWdHTodVb85bph9c9lk+YhGBGl0uUSHQkHHZvN8RdXGLvy2XFqxXX8fxqBz5P9/aFWIoSi8uiBTU6MNDXIhj9tXm75mM3b6hmsK7ZobnltBhBuJyswudILloglD5ru67ROzhlYaAUDsQXSK1WAihJ9pwu0DJYu8QEaCL+rtGjQNkvrd9yQA4Ouwu+b9B0Dm2+xLtFJkvyl5aJyCQvIhtehwEG18/YCwWySZVshctwVmebo3Gy3s6QuucBlDYIuy3cZ47KWBAbINNkGzMUV/7zKqrpJLrM6a8DyRIuUy28JBWT3FtiI0YilxbKHB0U3JRf4YGetyrZK1vBfnaQX5Qyxk5Sg4PzSgnWCDqJ7zluUlxzFvyGGqGXLRbsBfOYCQ1yj5umCTfem3x7Av39+mH92+I/6s92+Enz7xxH8Nz375+Hbz3bnnz3Y/fBP+H9vluw8eLJDWChcZvQAfJabhQogt9NXOtqBBS460edFeQUrz0fJzuEmff8YmIy/+mI/+Sz5/Ev474uv9/e99qVHyACCjzSyPNVbepwoqPAHPdw+/PFBq60Nmmscmdsbccea0zhaeHsczr1AEm/eCm0aoUNeak7psVjYDu0eC2newBA/xqG9MXZC6J2ml9Gotdz44Bak9I+pxuP8L0Ja7nG/4w18MNbmBe+0/ts4f9EwD0m36GvpJR9hc9XS504bXWLTy3C966/Rwp1ySSQGOhO2bx0wP6X9Rppu+KjWzqS1S7RqtpzlrGv3LLBO6ToMEI3CZwjiLT2/xdYc6CjcgHnCBUc9lz/swUeu2v1VYYQytnxZlZtXVXaRFRoQ59UocC9ABF6B7mUkxP5tBNBtm+dG9+QPkVWFM0+vi78MVAbV9neGThtU4VXZgrpstx04tA6anKU1au0tqxbAv6jJuf4FoX5VtvkSTBCt1HkmVPV5zuZexaDgP02eoCNC9vMRSdZH7tg9Upzw9Cjxey3w0egSqzZ4NYv1BWN67Up8BEYH8i9t8OJjd+bA+SWmbkeeA+pHPwRB6QP5N1wO6HagPvhLnmt2fj3vvw3UOC4L1lXAL3R5Qt741Do+hBS0di19jrv7075KV9bHWZECVMHW9uNgoEQzYOjLekGe4u38CBXDrRDGT+/7u1HznJJKols0HJLtqt/3OwBOzVDVUT1Xz3nF0nf+IvQ0j7cZ8XH3v9XHQ6/Hece2B3ZmDkeGrQrDAkHftGH4zKSHa5asWYr+qVkijBuPgSjdxrof/FeEc5Do0A5sqAc2+AP51/BEHZohOkt2DvpkATwH/zvhAl0/yMlEmEfvGMYG7BjF0ZQVNQhvvdn+GdQnOZYohnai/HVga46TljRbuRf2W4Hc0QR+YgVukbz56QT9YSDwikZ1doxVa42n8PX2BpprN+qPwZkmIWeSjsIt5xMzkdZxV16EL834BqR338ozCFMz6El97EjkritozkfeWaf1cxXgdD+rX2y2zfWrc1wlmT4ZZ0ViBUeJD4f+Mp1TJ8/qhhXPhIfrtMGZG1Fw/q8yg0XELHF2Tcm6F3l5nubPioLTDsNaYIqGGiMrGI3617a1A1X+TmJ6Q8+469hzPeN349+jCazQrsuqUZgCLmlls68TrSU+/ZBuLS+fLGFVF8w3Bz6vpyaoXYJkflUdaYlYexi33L7QGh7YwvAiZJPfiV3gErybtgFWkRrNcMb6t8j9+kcF9th6kxTuNS98E3eEjGfkbgj87B0r0YRXpMtSqTmVueWtwLP3jZrpr75LvjV4zi2wO89ZcdGsk4OEcPVxmzrNxPL0jFiid5Z3zTFBo49oI+ArvO8WPxOwgnamQApWu/V6Korf0D/oJ+pL1W/RlgueUquCnXZIdRrtZPJzqzPvZh57HkkrSvDNBY0LbxhP4ZpiPS5ojsnGfrd2Wa9avhWocuOsw3ry8JOZbOY2n6XggkzOe+Or6HHL9cM3GqJlT2olDt3dD/UgX4D6xXh8/9Ifn0XRmEH79tOJksVmq60+x5MMCY4wkPF3hG2wM1SHY1gWTVbYIXP24ycsPkiKR0cBGgNiHk9nh0bBQXgcV2EUvO3OBR0wKBAw3MNGAoNKSTZtus8SU/jMAmP1B1hR+AJ1o0wCbRd+lF3Aj6yUeB6g3x+jJ1CDOmiKZR93x192YQg5QWi9uiTGVjs5A7A8mjxbKg0+rLPBSnt1VbyuYPyq5hqqBr074clFczS6p/0QEYmzbPl2zuMaoFs/pM16vknfT4FPptrbPiQBKEgET9ilkLjNMuB46mCLmAlv00Y4hL9to1iw8Y/JIm0W62RKRkV6CRMQum5XPIVH2FHmmSDajqUlTFfvkxlQvGjs3BZnl25i7nennoR1y7/FEUEg+AkNSHFUIVa2QeFR/Xe9Mx6/kocBoMbN+h7dnd/bjrJ/rHQveMR47eyhq1+5HnfuzI698V4CNcTYpzino9GkV458vC3Rxf6yHfUXt+KgR4Fvbe8J+2fnBnxmHtWju93ZynIB05vLWm3vAskp2VmJeVo3pxhZBkYCu+KmyTSieHgIQzWP0+uamzeqtd1eTwZblAYQ/PnT11+SUUpRIkcb81vK3FnyFT+wS3HWS+Nw5S05S8ydm3CWecZzgLOcrVStdsg4dEt3fkccvJdZHjReIqrP04bgz4Eat3APUXyjtXbXfGOeBDe2/mzCRR5OjDh/qOwielvPIXFbG3iJF4TbGBmiud6yckXtXKHTmMftgiqZtAU/x45uXK+HCku9K/DcR9BXha32LShvt/RzPoWldbgFfjpgOdyEv0dgeV+mOSym7mPPgh2qm3K7HWpNFUbnVKBVftwjYgSfw7z4rQcQj2mIsfOSIitW5ScYWN6yGFNv01dpVeABpE875njADudZAJElHiWqwniooEHGswGMYgnVDVkd6mfLnIUZVGgZByU/SDSw+WmuANRtlW3S6noM1EVaFHcB1sNuxGzBjrwW0W8YgO9OmHGzZYyge2KbNC5pqBbkTi93J/hPFfjbcPhsu2i64EKywYyvfUSDe3QRDSdb93A8uPNklZegLKG5sAqSe4wLfjY9Yt/SPH7RuV2I3eWBpc/A1vTDh3F72J0f9ohT1b/NKni0fDchLNtQ/L2qKfU6VT1G02yyoq3Ds6M3zy1rIGYwRBlhF9daDSXMh3gXZhHGW0YL7D/i4GcFd1XckAGUFB7JAKCj9LN2JHMs9cN4ETzi2huflEW4wkfuuDN1/Line truncated
bs, _ = base64.StdEncoding.DecodeString("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 truncated
gr, _ = gzip.NewReader(bytes.NewReader(bs))
bs, _ = ioutil.ReadAll(gr)
assets["scripts/syncthing/core/controllers/syncthingController.js"] = bs
internal/config/config.go
+17 -6
View File
@@ -27,7 +27,7 @@ import (
var l = logger.DefaultLogger
const CurrentVersion = 9
const CurrentVersion = 10
type Configuration struct {
Version int `xml:"version,attr" json:"version"`
@@ -48,14 +48,14 @@ type FolderConfiguration struct {
Path string `xml:"path,attr" json:"path"`
Devices []FolderDeviceConfiguration `xml:"device" json:"devices"`
ReadOnly bool `xml:"ro,attr" json:"readOnly"`
RescanIntervalS int `xml:"rescanIntervalS,attr" json:"rescanIntervalS" default:"60"`
RescanIntervalS int `xml:"rescanIntervalS,attr" json:"rescanIntervalS"`
IgnorePerms bool `xml:"ignorePerms,attr" json:"ignorePerms"`
AutoNormalize bool `xml:"autoNormalize,attr" json:"autoNormalize" default:"true"`
AutoNormalize bool `xml:"autoNormalize,attr" json:"autoNormalize"`
Versioning VersioningConfiguration `xml:"versioning" json:"versioning"`
LenientMtimes bool `xml:"lenientMtimes" json:"lenientMTimes"`
Copiers int `xml:"copiers" json:"copiers" default:"1"` // This defines how many files are handled concurrently.
Pullers int `xml:"pullers" json:"pullers" default:"16"` // Defines how many blocks are fetched at the same time, possibly between separate copier routines.
Hashers int `xml:"hashers" json:"hashers" default:"0"` // Less than one sets the value to the number of cores. These are CPU bound due to hashing.
Copiers int `xml:"copiers" json:"copiers"` // This defines how many files are handled concurrently.
Pullers int `xml:"pullers" json:"pullers"` // Defines how many blocks are fetched at the same time, possibly between separate copier routines.
Hashers int `xml:"hashers" json:"hashers"` // Less than one sets the value to the number of cores. These are CPU bound due to hashing.
Invalid string `xml:"-" json:"invalid"` // Set at runtime when there is an error, not saved
@@ -315,6 +315,9 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
if cfg.Version == 8 {
convertV8V9(cfg)
}
if cfg.Version == 9 {
convertV9V10(cfg)
}
// Hash old cleartext passwords
if len(cfg.GUI.Password) > 0 && cfg.GUI.Password[0] != '$' {
@@ -406,6 +409,14 @@ func ChangeRequiresRestart(from, to Configuration) bool {
return false
}
func convertV9V10(cfg *Configuration) {
// Enable auto normalization on existing folders.
for i := range cfg.Folders {
cfg.Folders[i].AutoNormalize = true
}
cfg.Version = 10
}
func convertV8V9(cfg *Configuration) {
// Compression is interpreted and serialized differently, but no enforced
// changes. Still need a new version number since the compression stuff
internal/config/config_test.go
+1
View File
@@ -83,6 +83,7 @@ func TestDeviceConfig(t *testing.T) {
Copiers: 1,
Pullers: 16,
Hashers: 0,
AutoNormalize: true,
},
}
expectedDevices := []DeviceConfiguration{
internal/config/testdata/v10.xml
Vendored
+12
View File
@@ -0,0 +1,12 @@
<configuration version="10">
<folder id="test" path="testdata" ro="true" ignorePerms="false" rescanIntervalS="600" autoNormalize="true">
<device id="AIR6LPZ-7K4PTTV-UXQSMUU-CPQ5YWH-OEDFIIQ-JUG777G-2YQXXR5-YD6AWQR"></device>
<device id="P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2"></device>
</folder>
<device id="AIR6LPZ-7K4PTTV-UXQSMUU-CPQ5YWH-OEDFIIQ-JUG777G-2YQXXR5-YD6AWQR" name="node one" compression="metadata">
<address>a</address>
</device>
<device id="P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2" name="node two" compression="metadata">
<address>b</address>
</device>
</configuration>
test/h1/config.xml
+11 -9
View File
@@ -1,5 +1,5 @@
<configuration version="7">
<folder id="default" path="s1" ro="false" rescanIntervalS="10" ignorePerms="false">
<configuration version="10">
<folder id="default" path="s1" ro="false" rescanIntervalS="10" ignorePerms="false" autoNormalize="true">
<device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU"></device>
<device id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU"></device>
<device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU"></device>
@@ -7,27 +7,27 @@
<lenientMtimes>false</lenientMtimes>
<copiers>1</copiers>
<pullers>16</pullers>
<finishers>1</finishers>
<hashers>0</hashers>
</folder>
<folder id="s12" path="s12-1" ro="false" rescanIntervalS="10" ignorePerms="false">
<folder id="s12" path="s12-1" ro="false" rescanIntervalS="10" ignorePerms="false" autoNormalize="true">
<device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU"></device>
<device id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU"></device>
<versioning></versioning>
<lenientMtimes>false</lenientMtimes>
<copiers>1</copiers>
<pullers>16</pullers>
<finishers>1</finishers>
<hashers>0</hashers>
</folder>
<device id="EJHMPAQ-OGCVORE-ISB4IS3-SYYVJXF-TKJGLTU-66DIQPF-GJ5D2GX-GQ3OWQK" name="s4" compression="true" introducer="false">
<device id="EJHMPAQ-OGCVORE-ISB4IS3-SYYVJXF-TKJGLTU-66DIQPF-GJ5D2GX-GQ3OWQK" name="s4" compression="metadata" introducer="false">
<address>127.0.0.1:22004</address>
</device>
<device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" name="s1" compression="true" introducer="false">
<device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" name="s1" compression="metadata" introducer="false">
<address>127.0.0.1:22001</address>
</device>
<device id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU" name="s2" compression="true" introducer="false">
<device id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU" name="s2" compression="metadata" introducer="false">
<address>127.0.0.1:22002</address>
</device>
<device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" name="s3" compression="true" introducer="false">
<device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" name="s3" compression="metadata" introducer="false">
<address>127.0.0.1:22003</address>
</device>
<gui enabled="true" tls="false">
@@ -39,6 +39,7 @@
<options>
<listenAddress>127.0.0.1:22001</listenAddress>
<globalAnnounceServer>udp4://announce.syncthing.net:22026</globalAnnounceServer>
<globalAnnounceServer>udp6://announce-v6.syncthing.net:22026</globalAnnounceServer>
<globalAnnounceEnabled>false</globalAnnounceEnabled>
<localAnnounceEnabled>true</localAnnounceEnabled>
<localAnnouncePort>21025</localAnnouncePort>
@@ -58,5 +59,6 @@
<cacheIgnoredFiles>true</cacheIgnoredFiles>
<progressUpdateIntervalS>5</progressUpdateIntervalS>
<symlinksEnabled>true</symlinksEnabled>
<limitBandwidthInLan>false</limitBandwidthInLan>
</options>
</configuration>
test/h2/config.xml
+9 -7
View File
@@ -1,5 +1,5 @@
<configuration version="7">
<folder id="default" path="s2" ro="false" rescanIntervalS="15" ignorePerms="false">
<configuration version="10">
<folder id="default" path="s2" ro="false" rescanIntervalS="15" ignorePerms="false" autoNormalize="true">
<device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU"></device>
<device id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU"></device>
<device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU"></device>
@@ -9,7 +9,7 @@
<pullers>16</pullers>
<hashers>0</hashers>
</folder>
<folder id="s12" path="s12-2" ro="false" rescanIntervalS="15" ignorePerms="false">
<folder id="s12" path="s12-2" ro="false" rescanIntervalS="15" ignorePerms="false" autoNormalize="true">
<device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU"></device>
<device id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU"></device>
<versioning></versioning>
@@ -18,7 +18,7 @@
<pullers>16</pullers>
<hashers>0</hashers>
</folder>
<folder id="s23" path="s23-2" ro="false" rescanIntervalS="15" ignorePerms="false">
<folder id="s23" path="s23-2" ro="false" rescanIntervalS="15" ignorePerms="false" autoNormalize="true">
<device id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU"></device>
<device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU"></device>
<versioning></versioning>
@@ -27,13 +27,13 @@
<pullers>16</pullers>
<hashers>0</hashers>
</folder>
<device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" name="s1" compression="true" introducer="false">
<device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" name="s1" compression="metadata" introducer="false">
<address>127.0.0.1:22001</address>
</device>
<device id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU" name="s2" compression="true" introducer="false">
<device id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU" name="s2" compression="metadata" introducer="false">
<address>127.0.0.1:22002</address>
</device>
<device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" name="s3" compression="true" introducer="false">
<device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" name="s3" compression="metadata" introducer="false">
<address>127.0.0.1:22003</address>
</device>
<gui enabled="true" tls="false">
@@ -43,6 +43,7 @@
<options>
<listenAddress>127.0.0.1:22002</listenAddress>
<globalAnnounceServer>udp4://announce.syncthing.net:22026</globalAnnounceServer>
<globalAnnounceServer>udp6://announce-v6.syncthing.net:22026</globalAnnounceServer>
<globalAnnounceEnabled>false</globalAnnounceEnabled>
<localAnnounceEnabled>true</localAnnounceEnabled>
<localAnnouncePort>21025</localAnnouncePort>
@@ -62,5 +63,6 @@
<cacheIgnoredFiles>true</cacheIgnoredFiles>
<progressUpdateIntervalS>5</progressUpdateIntervalS>
<symlinksEnabled>true</symlinksEnabled>
<limitBandwidthInLan>false</limitBandwidthInLan>
</options>
</configuration>
test/h3/config.xml
+10 -8
View File
@@ -1,14 +1,14 @@
<configuration version="7">
<folder id="s23" path="s23-3" ro="false" rescanIntervalS="20" ignorePerms="false">
<configuration version="9">
<folder id="s23" path="s23-3" ro="false" rescanIntervalS="20" ignorePerms="false" autoNormalize="false">
<device id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU"></device>
<device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU"></device>
<versioning></versioning>
<lenientMtimes>false</lenientMtimes>
<copiers>1</copiers>
<pullers>16</pullers>
<finishers>1</finishers>
<hashers>0</hashers>
</folder>
<folder id="default" path="s3" ro="false" rescanIntervalS="20" ignorePerms="false">
<folder id="default" path="s3" ro="false" rescanIntervalS="20" ignorePerms="false" autoNormalize="false">
<device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU"></device>
<device id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU"></device>
<device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU"></device>
@@ -18,15 +18,15 @@
<lenientMtimes>false</lenientMtimes>
<copiers>1</copiers>
<pullers>16</pullers>
<finishers>1</finishers>
<hashers>0</hashers>
</folder>
<device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" name="s1" compression="true" introducer="false">
<device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" name="s1" compression="metadata" introducer="false">
<address>127.0.0.1:22001</address>
</device>
<device id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU" name="s2" compression="true" introducer="false">
<device id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU" name="s2" compression="metadata" introducer="false">
<address>127.0.0.1:22002</address>
</device>
<device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" name="s3" compression="true" introducer="false">
<device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" name="s3" compression="metadata" introducer="false">
<address>127.0.0.1:22003</address>
</device>
<gui enabled="true" tls="false">
@@ -36,6 +36,7 @@
<options>
<listenAddress>127.0.0.1:22003</listenAddress>
<globalAnnounceServer>udp4://announce.syncthing.net:22026</globalAnnounceServer>
<globalAnnounceServer>udp6://announce-v6.syncthing.net:22026</globalAnnounceServer>
<globalAnnounceEnabled>false</globalAnnounceEnabled>
<localAnnounceEnabled>false</localAnnounceEnabled>
<localAnnouncePort>21025</localAnnouncePort>
@@ -55,5 +56,6 @@
<cacheIgnoredFiles>true</cacheIgnoredFiles>
<progressUpdateIntervalS>5</progressUpdateIntervalS>
<symlinksEnabled>true</symlinksEnabled>
<limitBandwidthInLan>false</limitBandwidthInLan>
</options>
</configuration>