diff options
author | Jakob Borg <jakob@nym.se> | 2014-06-08 19:14:04 +0200 |
---|---|---|
committer | Jakob Borg <jakob@nym.se> | 2014-06-08 19:17:42 +0200 |
commit | 456d9e870d71abcb30316ffd168c09421a7dff33 (patch) | |
tree | abea9efae58c8f5d821cb6eec181c221ae560996 | |
parent | a1533696a55211e64d4cb77e569431d82157cdaf (diff) | |
download | syncthing-456d9e870d71abcb30316ffd168c09421a7dff33.tar.gz syncthing-456d9e870d71abcb30316ffd168c09421a7dff33.zip |
Integration test, API keyv0.8.14
-rw-r--r-- | integration/f1/config.xml | 31 | ||||
-rw-r--r-- | integration/f2/config.xml | 31 | ||||
-rw-r--r-- | integration/h4/config.xml | 1 |
3 files changed, 37 insertions, 26 deletions
diff --git a/integration/f1/config.xml b/integration/f1/config.xml index 520802289..19b0681db 100644 --- a/integration/f1/config.xml +++ b/integration/f1/config.xml @@ -1,27 +1,32 @@ -<configuration version="1"> - <repository directory="s1" ro="true"> - <node id="I6KAH7666SLLL5PFXSOAUFJCDZYAOMLEKCP2GB3BV5RQST3PSROA" name="f1"> - <address>127.0.0.1:22001</address> - </node> - <node id="JMFJCXBGZDE4BOCJE3VF65GYZNAIVJRET3J6HMRAUQIGJOFKNHMQ" name="f2"> - <address>127.0.0.1:22002</address> - </node> +<configuration version="2"> + <repository id="default" directory="s1" ro="true" ignorePerms="false"> + <node id="I6KAH7666SLLL5PFXSOAUFJCDZYAOMLEKCP2GB3BV5RQST3PSROA"></node> + <node id="JMFJCXBGZDE4BOCJE3VF65GYZNAIVJRET3J6HMRAUQIGJOFKNHMQ"></node> + <versioning></versioning> + <syncorder></syncorder> </repository> + <node id="I6KAH7666SLLL5PFXSOAUFJCDZYAOMLEKCP2GB3BV5RQST3PSROA" name="f1"> + <address>127.0.0.1:22001</address> + </node> + <node id="JMFJCXBGZDE4BOCJE3VF65GYZNAIVJRET3J6HMRAUQIGJOFKNHMQ" name="f2"> + <address>127.0.0.1:22002</address> + </node> + <gui enabled="true" tls="false"> + <address>127.0.0.1:8081</address> + <apikey>abc123</apikey> + </gui> <options> <listenAddress>127.0.0.1:22001</listenAddress> - <readOnly>true</readOnly> - <allowDelete>true</allowDelete> - <followSymlinks>true</followSymlinks> - <guiEnabled>true</guiEnabled> - <guiAddress>127.0.0.1:8081</guiAddress> <globalAnnounceServer>announce.syncthing.net:22025</globalAnnounceServer> <globalAnnounceEnabled>false</globalAnnounceEnabled> <localAnnounceEnabled>true</localAnnounceEnabled> + <localAnnouncePort>21025</localAnnouncePort> <parallelRequests>16</parallelRequests> <maxSendKbps>0</maxSendKbps> <rescanIntervalS>10</rescanIntervalS> <reconnectionIntervalS>5</reconnectionIntervalS> <maxChangeKbps>10000</maxChangeKbps> <startBrowser>false</startBrowser> + <upnpEnabled>true</upnpEnabled> </options> </configuration> diff --git a/integration/f2/config.xml b/integration/f2/config.xml index 3106c90aa..4f7882a87 100644 --- a/integration/f2/config.xml +++ b/integration/f2/config.xml @@ -1,27 +1,32 @@ -<configuration version="1"> - <repository directory="s2"> - <node id="I6KAH7666SLLL5PFXSOAUFJCDZYAOMLEKCP2GB3BV5RQST3PSROA" name="f1"> - <address>127.0.0.1:22001</address> - </node> - <node id="JMFJCXBGZDE4BOCJE3VF65GYZNAIVJRET3J6HMRAUQIGJOFKNHMQ" name="f2"> - <address>127.0.0.1:22002</address> - </node> +<configuration version="2"> + <repository id="default" directory="s2" ro="false" ignorePerms="false"> + <node id="I6KAH7666SLLL5PFXSOAUFJCDZYAOMLEKCP2GB3BV5RQST3PSROA"></node> + <node id="JMFJCXBGZDE4BOCJE3VF65GYZNAIVJRET3J6HMRAUQIGJOFKNHMQ"></node> + <versioning></versioning> + <syncorder></syncorder> </repository> + <node id="I6KAH7666SLLL5PFXSOAUFJCDZYAOMLEKCP2GB3BV5RQST3PSROA" name="f1"> + <address>127.0.0.1:22001</address> + </node> + <node id="JMFJCXBGZDE4BOCJE3VF65GYZNAIVJRET3J6HMRAUQIGJOFKNHMQ" name="f2"> + <address>127.0.0.1:22002</address> + </node> + <gui enabled="true" tls="false"> + <address>127.0.0.1:8082</address> + <apikey>abc123</apikey> + </gui> <options> <listenAddress>127.0.0.1:22002</listenAddress> - <readOnly>false</readOnly> - <allowDelete>true</allowDelete> - <followSymlinks>true</followSymlinks> - <guiEnabled>true</guiEnabled> - <guiAddress>127.0.0.1:8082</guiAddress> <globalAnnounceServer>announce.syncthing.net:22025</globalAnnounceServer> <globalAnnounceEnabled>false</globalAnnounceEnabled> <localAnnounceEnabled>true</localAnnounceEnabled> + <localAnnouncePort>21025</localAnnouncePort> <parallelRequests>16</parallelRequests> <maxSendKbps>0</maxSendKbps> <rescanIntervalS>15</rescanIntervalS> <reconnectionIntervalS>5</reconnectionIntervalS> <maxChangeKbps>10000</maxChangeKbps> <startBrowser>false</startBrowser> + <upnpEnabled>true</upnpEnabled> </options> </configuration> diff --git a/integration/h4/config.xml b/integration/h4/config.xml index bbf54fba4..f6704bee5 100644 --- a/integration/h4/config.xml +++ b/integration/h4/config.xml @@ -22,6 +22,7 @@ </node> <gui enabled="true"> <address>127.0.0.1:8084</address> + <apikey>abc123</apikey> </gui> <options> <listenAddress>:22004</listenAddress> |