[Box Backup-commit] COMMIT r3075 - in box/trunk: . test/bbackupd/testfiles

subversion at boxbackup.org subversion at boxbackup.org
Wed Feb 1 09:55:14 GMT 2012


Author: chris
Date: 2012-02-01 09:55:12 +0000 (Wed, 01 Feb 2012)
New Revision: 3075

Added:
   box/trunk/test/bbackupd/testfiles/bbackupd-temploc.conf.in
Removed:
   box/trunk/test/bbackupd/testfiles/bbackupd-temploc.conf
Modified:
   box/trunk/configure.ac
Log:
Disable automatic backups in the temploc configuration, and enable the
NotifyScript, so that we can tell what kind of errors bbackupd reported
and reproduce them reliably.


Modified: box/trunk/configure.ac
===================================================================
--- box/trunk/configure.ac	2012-01-23 01:32:08 UTC (rev 3074)
+++ box/trunk/configure.ac	2012-02-01 09:55:12 UTC (rev 3075)
@@ -90,6 +90,7 @@
                  test/bbackupd/testfiles/bbackupd-exclude.conf
                  test/bbackupd/testfiles/bbackupd-snapshot.conf
                  test/bbackupd/testfiles/bbackupd-symlink.conf
+                 test/bbackupd/testfiles/bbackupd-temploc.conf
   		 ])
 AX_CONFIG_SCRIPTS([bin/bbackupd/bbackupd-config
                    bin/bbackupquery/makedocumentation.pl

Deleted: box/trunk/test/bbackupd/testfiles/bbackupd-temploc.conf
===================================================================
--- box/trunk/test/bbackupd/testfiles/bbackupd-temploc.conf	2012-01-23 01:32:08 UTC (rev 3074)
+++ box/trunk/test/bbackupd/testfiles/bbackupd-temploc.conf	2012-02-01 09:55:12 UTC (rev 3075)
@@ -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
-	}
-}
-

Copied: box/trunk/test/bbackupd/testfiles/bbackupd-temploc.conf.in (from rev 3072, box/trunk/test/bbackupd/testfiles/bbackupd-temploc.conf)
===================================================================
--- box/trunk/test/bbackupd/testfiles/bbackupd-temploc.conf.in	                        (rev 0)
+++ box/trunk/test/bbackupd/testfiles/bbackupd-temploc.conf.in	2012-02-01 09:55:12 UTC (rev 3075)
@@ -0,0 +1,58 @@
+
+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
+
+AutomaticBackup = no
+UpdateStoreInterval = 3
+MinimumFileAge = 4
+MaxUploadWait = 24
+
+FileTrackingSizeThreshold = 1024
+DiffingUploadSizeThreshold = 1024
+
+MaximumDiffingTime = 3
+KeepAliveTime = 1
+
+ExtendedLogging = no
+ExtendedLogFile = testfiles/bbackupd.log
+
+CommandSocket = testfiles/bbackupd.sock
+
+NotifyScript  = @TARGET_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
+	}
+	Test2
+	{
+		Path = testfiles/TestDir2
+	}
+}
+




More information about the Boxbackup-commit mailing list