From e0c122119afea4c951c0c57144d26a473118c254 Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Wed, 14 Jun 2017 19:53:34 -0400 Subject: Fixup botched merge --- test/bbackupd/testfiles/bbackupd-temploc.conf | 55 --------------------------- 1 file changed, 55 deletions(-) delete mode 100644 test/bbackupd/testfiles/bbackupd-temploc.conf (limited to 'test/bbackupd/testfiles/bbackupd-temploc.conf') diff --git a/test/bbackupd/testfiles/bbackupd-temploc.conf b/test/bbackupd/testfiles/bbackupd-temploc.conf deleted file mode 100644 index 07cbdcd1..00000000 --- a/test/bbackupd/testfiles/bbackupd-temploc.conf +++ /dev/null @@ -1,55 +0,0 @@ - -CertificateFile = testfiles/clientCerts.pem -PrivateKeyFile = testfiles/clientPrivKey.pem -TrustedCAsFile = testfiles/clientTrustedCAs.pem - -KeysFile = testfiles/bbackupd.keys - -DataDirectory = testfiles/bbackupd-data - -StoreHostname = localhost -StorePort = 22011 -AccountNumber = 0x01234567 - -UpdateStoreInterval = 3 -MinimumFileAge = 4 -MaxUploadWait = 24 - -FileTrackingSizeThreshold = 1024 -DiffingUploadSizeThreshold = 1024 - -MaximumDiffingTime = 3 -KeepAliveTime = 1 - -ExtendedLogging = no -ExtendedLogFile = testfiles/bbackupd.log - -CommandSocket = testfiles/bbackupd.sock - -Server -{ - PidFile = testfiles/bbackupd.pid -} - -BackupLocations -{ - Test1 - { - Path = testfiles/TestDir1 - - ExcludeFile = testfiles/TestDir1/excluded_1 - ExcludeFile = testfiles/TestDir1/excluded_2 - ExcludeFilesRegex = \.excludethis$ - ExcludeFilesRegex = EXCLUDE - AlwaysIncludeFile = testfiles/TestDir1/dont.excludethis - ExcludeDir = testfiles/TestDir1/exclude_dir - ExcludeDir = testfiles/TestDir1/exclude_dir_2 - ExcludeDirsRegex = not_this_dir - AlwaysIncludeDirsRegex = ALWAYSINCLUDE - } - Test2 - { - Path = testfiles/TestDir2 - } -} - -- cgit v1.2.3