[Box Backup-dev] COMMIT r721 - in box/trunk: . test/bbackupd/testfiles

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2006-08-07 21:24:50 +0000 (Mon, 07 Aug 2006)
New Revision: 721

Added:
   box/trunk/test/bbackupd/testfiles/bbackupd.conf.in
Removed:
   box/trunk/test/bbackupd/testfiles/bbackupd.conf
Modified:
   box/trunk/configure.ac
Log:
* test/bbackupd/testfiles/bbackupd.conf
* test/bbackupd/testfiles/bbackupd.conf.in
* configure.ac
- Merged the change in chris/merge:
- Auto-generate test/bbackupd/testfiles/bbackupd.conf, since it requires
  @PERL@ to be substituted


Modified: box/trunk/configure.ac
===================================================================
--- box/trunk/configure.ac	2006-08-07 21:22:15 UTC (rev 720)
+++ box/trunk/configure.ac	2006-08-07 21:24:50 UTC (rev 721)
@@ -220,6 +220,7 @@
                    lib/server/makeprotocol.pl
                    runtest.pl
                    test/backupstorefix/testfiles/testbackupstorefix.pl
+                   test/bbackupd/testfiles/bbackupd.conf
                    test/bbackupd/testfiles/extcheck1.pl
                    test/bbackupd/testfiles/extcheck2.pl
                    test/bbackupd/testfiles/notifyscript.pl])

Deleted: box/trunk/test/bbackupd/testfiles/bbackupd.conf
===================================================================
--- box/trunk/test/bbackupd/testfiles/bbackupd.conf	2006-08-07 21:22:15 UTC (rev 720)
+++ box/trunk/test/bbackupd/testfiles/bbackupd.conf	2006-08-07 21:24:50 UTC (rev 721)
@@ -1,50 +0,0 @@
-
-CertificateFile = testfiles/clientCerts.pem
-PrivateKeyFile = testfiles/clientPrivKey.pem
-TrustedCAsFile = testfiles/clientTrustedCAs.pem
-
-KeysFile = testfiles/bbackupd.keys
-
-DataDirectory = testfiles/bbackupd-data
-
-StoreHostname = localhost
-AccountNumber = 0x01234567
-
-UpdateStoreInterval = 3
-MinimumFileAge = 4
-MaxUploadWait = 24
-
-FileTrackingSizeThreshold = 1024
-DiffingUploadSizeThreshold = 1024
-
-MaximumDiffingTime = 8
-
-ExtendedLogging = yes
-
-CommandSocket = testfiles/bbackupd.sock
-
-NotifyScript = @PERL@ testfiles/notifyscript.pl
-
-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
-	}
-}
-

Copied: box/trunk/test/bbackupd/testfiles/bbackupd.conf.in (from rev 720, box/trunk/test/bbackupd/testfiles/bbackupd.conf)