New upstream version 0.13~~git20190527.g039c4a1

12 files changed, 215 insertions, 215 deletions

diff --git a/contrib/windows/installer/bbackupd.conf.template b/contrib/windows/installer/bbackupd.conf.template
index 969ca619..cf61e72e 100644
--- a/contrib/windows/installer/bbackupd.conf.template
+++ b/contrib/windows/installer/bbackupd.conf.template
@@ -1,176 +1,176 @@
-StoreHostname = @@ServerName@@

-AccountNumber = 0x@@AccountNo@@

-KeysFile = @@InstallDir@@/conf/@@AccountNo@@-FileEncKeys.raw

-

-CertificateFile = @@InstallDir@@/conf/@@AccountNo@@-cert.pem

-PrivateKeyFile = @@InstallDir@@/conf/@@AccountNo@@-key.pem

-TrustedCAsFile = @@InstallDir@@/conf/serverCA.pem

-

-DataDirectory = @@InstallDir@@/state

-

-

-# This script is run whenever bbackupd changes state or encounters a

-# problem which requires the system administrator to assist:

-#

-# 1) The store is full, and no more data can be uploaded.

-# 2) Some files or directories were not readable.

-# 3) A backup run starts or finishes.

-#

-# The default script emails the system administrator, except for backups

-# starting and stopping, where it does nothing.

-

-NotifyScript = @@InstallDir@@/bin/NotifySysAdmin.vbs

-

-# The number of seconds between backup runs under normal conditions. To avoid 

-# cycles of load on the server, this time is randomly adjusted by a small 

-# percentage as the daemon runs.

-

-UpdateStoreInterval = 3600

-

-

-# The minimum age of a file, in seconds, that will be uploaded. Avoids 

-# repeated uploads of a file which is constantly being modified.

-

-MinimumFileAge = 21600

-

-# If a file is modified repeated, it won't be uploaded immediately in case 

-# it's modified again, due to the MinimumFileAge specified above. However, it 

-# should be uploaded eventually even if it is being modified repeatedly. This 

-# is how long we should wait, in seconds, after first noticing a change. 

-# (86400 seconds = 1 day)

-

-MaxUploadWait = 86400

-

-# If the connection is idle for some time (e.g. over 10 minutes or 600

-# seconds, not sure exactly how long) then the server will give up and

-# disconnect the client, resulting in Connection Protocol_Timeout errors

-# on the server and TLSReadFailed or TLSWriteFailed errors on the client.

-# Also, some firewalls and NAT gateways will kill idle connections after

-# similar lengths of time. 

-#

-# This can happen for example when most files are backed up already and

-# don't need to be sent to the store again, while scanning a large

-# directory, or while calculating diffs of a large file. To avoid this,

-# KeepAliveTime specifies that special keep-alive messages should be sent

-# when the connection is otherwise idle for a certain length of time,

-# specified here in seconds.

-#

-# The default is that these messages are never sent, equivalent to setting

-# this option to zero, but we recommend that all users enable this.

-

-KeepAliveTime = 120

-

-# Files above this size (in bytes) are tracked, and if they are renamed they will simply be

-# renamed on the server, rather than being uploaded again. (64k - 1)

-

-FileTrackingSizeThreshold = 65535

-

-# The daemon does "changes only" uploads for files above this size (in bytes).

-# Files less than it are uploaded whole without this extra processing.

-

-DiffingUploadSizeThreshold = 8192

-

-# The limit on how much time is spent diffing files, in seconds. Most files 

-# shouldn't take very long, but if you have really big files you can use this 

-# to limit the time spent diffing them.

-#

-# * Reduce if you are having problems with processor usage.

-#

-# * Increase if you have large files, and think the upload of changes is too 

-#   large and you want bbackupd to spend more time searching for unchanged

-#   blocks.

-

-MaximumDiffingTime = 120

-

-# Uncomment this line to see exactly what the daemon is going when it's connected to the server.

-

-# ExtendedLogging = yes

-

-# This specifies a program or script script which is run just before each 

-# sync, and ideally the full path to the interpreter. It will be run as the 

-# same user bbackupd is running as, usually root.

-#

-# The script must output (print) either "now" or a number to STDOUT (and a 

-# terminating newline, no quotes).

-#

-# If the result was "now", then the sync will happen. If it's a number, then 

-# no backup will happen for that number of seconds (bbackupd will pause) and 

-# then the script will be run again.

-#

-# Use this to temporarily stop bbackupd from syncronising or connecting to the 

-# store. For example, you could use this on a laptop to only backup when on a 

-# specific network, or when it has a working Internet connection.

-

-# SyncAllowScript = /path/to/intepreter/or/exe script-name parameters etc

-

-# Where the command socket is created in the filesystem.

-

-CommandSocket = @@CommandSocketNamedPipe@@

-

-# Uncomment the StoreObjectInfoFile to enable the experimental archiving

-# of the daemon's state (including client store marker and configuration)

-# between backup runs. This saves time and increases efficiency when

-# bbackupd is frequently stopped and started, since it removes the need

-# to rescan all directories on the remote server. However, it is new and

-# not yet heavily tested, so use with caution.

-

-StoreObjectInfoFile = @@InstallDir@@/state/bbackupd.state

-

-Server

-{

-	PidFile = @@InstallDir@@/state/bbackupd.pid

-}

-

-# BackupLocations specifies which locations on disc should be backed up. Each

-# directory is in the format

-# 

-# 	name

-# 	{

-# 		Path = /path/of/directory

-# 		(optional exclude directives)

-# 	}

-# 

-# 'name' is derived from the Path by the config script, but should merely be

-# unique.

-# 

-# The exclude directives are of the form

-# 

-# 	[Exclude|AlwaysInclude][File|Dir][|sRegex] = regex or full pathname

-# 

-# (The regex suffix is shown as 'sRegex' to make File or Dir plural)

-#

-# For example:

-# 

-# 	ExcludeDir = /home/guest-user

-# 	ExcludeFilesRegex = \.(mp3|MP3)\$

-# 	AlwaysIncludeFile = /home/username/veryimportant.mp3

-# 

-# This excludes the directory /home/guest-user from the backup along with all mp3

-# files, except one MP3 file in particular.

-# 

-# In general, Exclude excludes a file or directory, unless the directory is

-# explicitly mentioned in a AlwaysInclude directive. However, Box Backup

-# does NOT scan inside excluded directories and will never back up an

-# AlwaysIncluded file or directory inside an excluded directory or any

-# subdirectory thereof.

-#

-# To back up a directory inside an excluded directory, use a configuration

-# like this, to ensure that each directory in the path to the important

-# files is included, but none of their contents will be backed up except

-# the directories further down that path to the important one.

-#

-# ExcludeDirsRegex = ^/home/user/bigfiles/

-# ExcludeFilesRegex = ^/home/user/bigfiles/

-# AlwaysIncludeDir = /home/user/bigfiles/path

-# AlwaysIncludeDir = /home/user/bigfiles/path/to

-# AlwaysIncludeDir = /home/user/bigfiles/path/important

-# AlwaysIncludeDir = /home/user/bigfiles/path/important/files

-# AlwaysIncludeDirsRegex = ^/home/user/bigfiles/path/important/files/

-# AlwaysIncludeFilesRegex = ^/home/user/bigfiles/path/important/files/

-# 

-# If a directive ends in Regex, then it is a regular expression rather than a 

-# explicit full pathname. See

-# 

-# 	man 7 re_format

-# 

-# for the regex syntax on your platform.

+StoreHostname = @@ServerName@@
+AccountNumber = 0x@@AccountNo@@
+KeysFile = @@InstallDir@@/conf/@@AccountNo@@-FileEncKeys.raw
+
+CertificateFile = @@InstallDir@@/conf/@@AccountNo@@-cert.pem
+PrivateKeyFile = @@InstallDir@@/conf/@@AccountNo@@-key.pem
+TrustedCAsFile = @@InstallDir@@/conf/serverCA.pem
+
+DataDirectory = @@InstallDir@@/state
+
+
+# This script is run whenever bbackupd changes state or encounters a
+# problem which requires the system administrator to assist:
+#
+# 1) The store is full, and no more data can be uploaded.
+# 2) Some files or directories were not readable.
+# 3) A backup run starts or finishes.
+#
+# The default script emails the system administrator, except for backups
+# starting and stopping, where it does nothing.
+
+NotifyScript = @@InstallDir@@/bin/NotifySysAdmin.vbs
+
+# The number of seconds between backup runs under normal conditions. To avoid 
+# cycles of load on the server, this time is randomly adjusted by a small 
+# percentage as the daemon runs.
+
+UpdateStoreInterval = 3600
+
+
+# The minimum age of a file, in seconds, that will be uploaded. Avoids 
+# repeated uploads of a file which is constantly being modified.
+
+MinimumFileAge = 21600
+
+# If a file is modified repeated, it won't be uploaded immediately in case 
+# it's modified again, due to the MinimumFileAge specified above. However, it 
+# should be uploaded eventually even if it is being modified repeatedly. This 
+# is how long we should wait, in seconds, after first noticing a change. 
+# (86400 seconds = 1 day)
+
+MaxUploadWait = 86400
+
+# If the connection is idle for some time (e.g. over 10 minutes or 600
+# seconds, not sure exactly how long) then the server will give up and
+# disconnect the client, resulting in Connection Protocol_Timeout errors
+# on the server and TLSReadFailed or TLSWriteFailed errors on the client.
+# Also, some firewalls and NAT gateways will kill idle connections after
+# similar lengths of time. 
+#
+# This can happen for example when most files are backed up already and
+# don't need to be sent to the store again, while scanning a large
+# directory, or while calculating diffs of a large file. To avoid this,
+# KeepAliveTime specifies that special keep-alive messages should be sent
+# when the connection is otherwise idle for a certain length of time,
+# specified here in seconds.
+#
+# The default is that these messages are never sent, equivalent to setting
+# this option to zero, but we recommend that all users enable this.
+
+KeepAliveTime = 120
+
+# Files above this size (in bytes) are tracked, and if they are renamed they will simply be
+# renamed on the server, rather than being uploaded again. (64k - 1)
+
+FileTrackingSizeThreshold = 65535
+
+# The daemon does "changes only" uploads for files above this size (in bytes).
+# Files less than it are uploaded whole without this extra processing.
+
+DiffingUploadSizeThreshold = 8192
+
+# The limit on how much time is spent diffing files, in seconds. Most files 
+# shouldn't take very long, but if you have really big files you can use this 
+# to limit the time spent diffing them.
+#
+# * Reduce if you are having problems with processor usage.
+#
+# * Increase if you have large files, and think the upload of changes is too 
+#   large and you want bbackupd to spend more time searching for unchanged
+#   blocks.
+
+MaximumDiffingTime = 120
+
+# Uncomment this line to see exactly what the daemon is going when it's connected to the server.
+
+# ExtendedLogging = yes
+
+# This specifies a program or script script which is run just before each 
+# sync, and ideally the full path to the interpreter. It will be run as the 
+# same user bbackupd is running as, usually root.
+#
+# The script must output (print) either "now" or a number to STDOUT (and a 
+# terminating newline, no quotes).
+#
+# If the result was "now", then the sync will happen. If it's a number, then 
+# no backup will happen for that number of seconds (bbackupd will pause) and 
+# then the script will be run again.
+#
+# Use this to temporarily stop bbackupd from syncronising or connecting to the 
+# store. For example, you could use this on a laptop to only backup when on a 
+# specific network, or when it has a working Internet connection.
+
+# SyncAllowScript = /path/to/intepreter/or/exe script-name parameters etc
+
+# Where the command socket is created in the filesystem.
+
+CommandSocket = @@CommandSocketNamedPipe@@
+
+# Uncomment the StoreObjectInfoFile to enable the experimental archiving
+# of the daemon's state (including client store marker and configuration)
+# between backup runs. This saves time and increases efficiency when
+# bbackupd is frequently stopped and started, since it removes the need
+# to rescan all directories on the remote server. However, it is new and
+# not yet heavily tested, so use with caution.
+
+StoreObjectInfoFile = @@InstallDir@@/state/bbackupd.state
+
+Server
+{
+	PidFile = @@InstallDir@@/state/bbackupd.pid
+}
+
+# BackupLocations specifies which locations on disc should be backed up. Each
+# directory is in the format
+# 
+# 	name
+# 	{
+# 		Path = /path/of/directory
+# 		(optional exclude directives)
+# 	}
+# 
+# 'name' is derived from the Path by the config script, but should merely be
+# unique.
+# 
+# The exclude directives are of the form
+# 
+# 	[Exclude|AlwaysInclude][File|Dir][|sRegex] = regex or full pathname
+# 
+# (The regex suffix is shown as 'sRegex' to make File or Dir plural)
+#
+# For example:
+# 
+# 	ExcludeDir = /home/guest-user
+# 	ExcludeFilesRegex = \.(mp3|MP3)\$
+# 	AlwaysIncludeFile = /home/username/veryimportant.mp3
+# 
+# This excludes the directory /home/guest-user from the backup along with all mp3
+# files, except one MP3 file in particular.
+# 
+# In general, Exclude excludes a file or directory, unless the directory is
+# explicitly mentioned in a AlwaysInclude directive. However, Box Backup
+# does NOT scan inside excluded directories and will never back up an
+# AlwaysIncluded file or directory inside an excluded directory or any
+# subdirectory thereof.
+#
+# To back up a directory inside an excluded directory, use a configuration
+# like this, to ensure that each directory in the path to the important
+# files is included, but none of their contents will be backed up except
+# the directories further down that path to the important one.
+#
+# ExcludeDirsRegex = ^/home/user/bigfiles/
+# ExcludeFilesRegex = ^/home/user/bigfiles/
+# AlwaysIncludeDir = /home/user/bigfiles/path
+# AlwaysIncludeDir = /home/user/bigfiles/path/to
+# AlwaysIncludeDir = /home/user/bigfiles/path/important
+# AlwaysIncludeDir = /home/user/bigfiles/path/important/files
+# AlwaysIncludeDirsRegex = ^/home/user/bigfiles/path/important/files/
+# AlwaysIncludeFilesRegex = ^/home/user/bigfiles/path/important/files/
+# 
+# If a directive ends in Regex, then it is a regular expression rather than a 
+# explicit full pathname. See
+# 
+# 	man 7 re_format
+# 
+# for the regex syntax on your platform.
diff --git a/contrib/windows/installer/tools/InstallService.bat b/contrib/windows/installer/tools/InstallService.bat
index 80a342eb..94696440 100755
--- a/contrib/windows/installer/tools/InstallService.bat
+++ b/contrib/windows/installer/tools/InstallService.bat
@@ -1,3 +1,3 @@
-service.exe -i -S GigaLock

-echo off

-ping 192.168.254.254 -n 5 -w 1000 > nul 

+service.exe -i -S GigaLock
+echo off
+ping 192.168.254.254 -n 5 -w 1000 > nul 
diff --git a/contrib/windows/installer/tools/KillBackupProcess.bat b/contrib/windows/installer/tools/KillBackupProcess.bat
index 416d4a79..87343c57 100755
--- a/contrib/windows/installer/tools/KillBackupProcess.bat
+++ b/contrib/windows/installer/tools/KillBackupProcess.bat
@@ -1,3 +1,3 @@
-control.exe terminate

-echo off

-ping 192.168.254.254 -n 5 -w 1000 > nul 

+control.exe terminate
+echo off
+ping 192.168.254.254 -n 5 -w 1000 > nul 
diff --git a/contrib/windows/installer/tools/QueryOutputAll.bat b/contrib/windows/installer/tools/QueryOutputAll.bat
index 2ab30a72..c58b4ab6 100755
--- a/contrib/windows/installer/tools/QueryOutputAll.bat
+++ b/contrib/windows/installer/tools/QueryOutputAll.bat
@@ -1,5 +1,5 @@
-@ECHO OFF

-:    o=old, d=deleted, s=size info, t=timestamp, r=recursive

-set Queryopts=-odstr

-::set Queryopts=-str

-query.exe "list %Queryopts%" quit > QueryOutputAllResults.txt

+@ECHO OFF
+:    o=old, d=deleted, s=size info, t=timestamp, r=recursive
+set Queryopts=-odstr
+::set Queryopts=-str
+query.exe "list %Queryopts%" quit > QueryOutputAllResults.txt
diff --git a/contrib/windows/installer/tools/QueryOutputCurrent.bat b/contrib/windows/installer/tools/QueryOutputCurrent.bat
index d59ddbf1..2142b83f 100755
--- a/contrib/windows/installer/tools/QueryOutputCurrent.bat
+++ b/contrib/windows/installer/tools/QueryOutputCurrent.bat
@@ -1,5 +1,5 @@
-@ECHO OFF

-:    o=old, d=deleted, s=size info, t=timestamp, r=recursive

-::set Queryopts=-odstr

-set Queryopts=-str

-query.exe "list %Queryopts%" quit > QueryOutputCurrentResults.txt

+@ECHO OFF
+:    o=old, d=deleted, s=size info, t=timestamp, r=recursive
+::set Queryopts=-odstr
+set Queryopts=-str
+query.exe "list %Queryopts%" quit > QueryOutputCurrentResults.txt
diff --git a/contrib/windows/installer/tools/ReloadConfig.bat b/contrib/windows/installer/tools/ReloadConfig.bat
index 5fd44e83..911afb0a 100755
--- a/contrib/windows/installer/tools/ReloadConfig.bat
+++ b/contrib/windows/installer/tools/ReloadConfig.bat
@@ -1,3 +1,3 @@
-control.exe reload

-echo off

-ping 192.168.254.254 -n 8 -w 1000 > nul 

+control.exe reload
+echo off
+ping 192.168.254.254 -n 8 -w 1000 > nul 
diff --git a/contrib/windows/installer/tools/RemoveService.bat b/contrib/windows/installer/tools/RemoveService.bat
index 881ec5b1..193f272f 100755
--- a/contrib/windows/installer/tools/RemoveService.bat
+++ b/contrib/windows/installer/tools/RemoveService.bat
@@ -1,3 +1,3 @@
-@@SERVICEEXENAME@ -r -S GigaLock

-echo off

-ping 192.168.254.254 -n 5 -w 1000 > nul 

+@@SERVICEEXENAME@ -r -S GigaLock
+echo off
+ping 192.168.254.254 -n 5 -w 1000 > nul 
diff --git a/contrib/windows/installer/tools/RestartService.bat b/contrib/windows/installer/tools/RestartService.bat
index 77092a69..87a0a4ef 100755
--- a/contrib/windows/installer/tools/RestartService.bat
+++ b/contrib/windows/installer/tools/RestartService.bat
@@ -1,5 +1,5 @@
-net stop GigaLock

-ping 192.168.254.254 -n 2 -w 1000 > nul 

-net start GigaLock

-echo off

-ping 192.168.254.254 -n 5 -w 1000 > nul 

+net stop GigaLock
+ping 192.168.254.254 -n 2 -w 1000 > nul 
+net start GigaLock
+echo off
+ping 192.168.254.254 -n 5 -w 1000 > nul 
diff --git a/contrib/windows/installer/tools/ShowUsage.bat b/contrib/windows/installer/tools/ShowUsage.bat
index e6f69e9f..2ac0f37d 100755
--- a/contrib/windows/installer/tools/ShowUsage.bat
+++ b/contrib/windows/installer/tools/ShowUsage.bat
@@ -1,3 +1,3 @@
-query.exe usage quit

-ping 192.168.254.254 -n 10 -w 1000 > nul 

-

+query.exe usage quit
+ping 192.168.254.254 -n 10 -w 1000 > nul 
+
diff --git a/contrib/windows/installer/tools/StartService.bat b/contrib/windows/installer/tools/StartService.bat
index 1771238f..dc7dce7e 100755
--- a/contrib/windows/installer/tools/StartService.bat
+++ b/contrib/windows/installer/tools/StartService.bat
@@ -1,3 +1,3 @@
-net start GigaLock

-echo off

-ping 192.168.254.254 -n 5 -w 1000 > nul 

+net start GigaLock
+echo off
+ping 192.168.254.254 -n 5 -w 1000 > nul 
diff --git a/contrib/windows/installer/tools/StopService.bat b/contrib/windows/installer/tools/StopService.bat
index 8e70d68d..056cc69e 100755
--- a/contrib/windows/installer/tools/StopService.bat
+++ b/contrib/windows/installer/tools/StopService.bat
@@ -1,3 +1,3 @@
-net stop GigaLock

-echo off

-ping 192.168.254.254 -n 5 -w 1000 > nul 

+net stop GigaLock
+echo off
+ping 192.168.254.254 -n 5 -w 1000 > nul 
diff --git a/contrib/windows/installer/tools/Sync.bat b/contrib/windows/installer/tools/Sync.bat
index 30a04bec..0357070a 100755
--- a/contrib/windows/installer/tools/Sync.bat
+++ b/contrib/windows/installer/tools/Sync.bat
@@ -1,3 +1,3 @@
-control.exe sync

-echo off

-ping 192.168.254.254 -n 5 -w 1000 > nul 

+control.exe sync
+echo off
+ping 192.168.254.254 -n 5 -w 1000 > nul