add 01-adjust_config_basedir.diff as quilt patch, unapply from source tree

10 files changed, 127 insertions, 12 deletions

diff --git a/bin/bbackupd/bbackupd-config.in b/bin/bbackupd/bbackupd-config.in
index a88749fc..16ddb75c 100755
--- a/bin/bbackupd/bbackupd-config.in
+++ b/bin/bbackupd/bbackupd-config.in
@@ -19,7 +19,7 @@ Usage:
         working-dir [backup directories]
 
 Parameters:
-    config-dir          is usually @sysconfdir_expanded@/boxbackup
+    config-dir          is usually @sysconfdir_expanded@/box
     backup-mode         is lazy or snapshot:
         lazy mode       runs continously, uploading files over a specified age
         snapshot mode   uploads a snapshot of the filesystem when instructed
@@ -57,7 +57,7 @@ __E
 }
 
 # default locations
-my $default_config_location = '@sysconfdir_expanded@/boxbackup/bbackupd.conf';
+my $default_config_location = '@sysconfdir_expanded@/box/bbackupd.conf';
 
 # command line parameters
 my ($config_dir,$backup_mode,$account_num,$server,$working_dir,@tobackup) = @ARGV;
diff --git a/bin/bbstored/BackupConstants.h b/bin/bbstored/BackupConstants.h
index 52ae7583..515b3bcd 100644
--- a/bin/bbstored/BackupConstants.h
+++ b/bin/bbstored/BackupConstants.h
@@ -10,7 +10,7 @@
 #ifndef BACKUPCONSTANTS__H
 #define BACKUPCONSTANTS__H
 
-#define BACKUP_STORE_DEFAULT_ACCOUNT_DATABASE_FILE	"/etc/boxbackup/backupstoreaccounts"
+#define BACKUP_STORE_DEFAULT_ACCOUNT_DATABASE_FILE	"/etc/box/backupstoreaccounts"
 
 // 15 minutes to timeout (milliseconds)
 #define	BACKUP_STORE_TIMEOUT			(15*60*1000)
diff --git a/bin/bbstored/bbstored-config.in b/bin/bbstored/bbstored-config.in
index 83bb25a3..33cfb39a 100755
--- a/bin/bbstored/bbstored-config.in
+++ b/bin/bbstored/bbstored-config.in
@@ -19,7 +19,7 @@ Usage:
     bbstored-config config-dir server-hostname username [raidfile-config]
 
 Parameters:
-    config-dir       is usually @sysconfdir_expanded@/boxbackup
+    config-dir       is usually @sysconfdir_expanded@/box
     server-hostname  is the hostname that clients will use to connect to
                      this server
     username         is the user to run the server under
@@ -47,7 +47,7 @@ __E
 }
 
 # default locations
-my $default_config_location = '@sysconfdir_expanded@/boxbackup/bbstored.conf';
+my $default_config_location = '@sysconfdir_expanded@/box/bbstored.conf';
 
 # command line parameters
 my ($config_dir,$server,$username,$raidfile_config) = @ARGV;
diff --git a/contrib/debian/bbackupd.in b/contrib/debian/bbackupd.in
index 656ea8bb..78d4f4ee 100644
--- a/contrib/debian/bbackupd.in
+++ b/contrib/debian/bbackupd.in
@@ -3,7 +3,7 @@
 # Start and stop the Box Backup client daemon.
 
 BBACKUPD=@bindir_expanded@/bbackupd
-CONFIG=@sysconfdir_expanded@/boxbackup/bbackupd.conf
+CONFIG=@sysconfdir_expanded@/box/bbackupd.conf
 PIDFILE=@localstatedir_expanded@/bbackupd.pid
 
 test -x $BBACKUPD || exit 0
diff --git a/contrib/debian/bbstored.in b/contrib/debian/bbstored.in
index 37839ca9..da6a50a0 100644
--- a/contrib/debian/bbstored.in
+++ b/contrib/debian/bbstored.in
@@ -3,7 +3,7 @@
 # Start and stop the Box Backup server daemon.
 
 BBSTORED=@bindir_expanded@/bbstored
-CONFIG=@sysconfdir_expanded@/boxbackup/bbstored.conf
+CONFIG=@sysconfdir_expanded@/box/bbstored.conf
 PIDFILE=@localstatedir_expanded@/bbstored.pid
 
 test -x $BBACKUPD || exit 0
diff --git a/debian/patches/01-adjust_config_basedir.diff b/debian/patches/01-adjust_config_basedir.diff
new file mode 100644
index 00000000..882622e9
--- /dev/null
+++ b/debian/patches/01-adjust_config_basedir.diff
@@ -0,0 +1,114 @@
+Adjust the config basedir from /etc/box to /etc/boxbackup for the debian
+package.
+
+=== modified file 'contrib/debian/bbackupd.in'
+--- old/contrib/debian/bbackupd.in	2008-02-02 07:31:52 +0000
++++ new/contrib/debian/bbackupd.in	2009-03-30 21:10:14 +0000
+@@ -3,7 +3,7 @@
+ # Start and stop the Box Backup client daemon.
+ 
+ BBACKUPD=@bindir_expanded@/bbackupd
+-CONFIG=@sysconfdir_expanded@/box/bbackupd.conf
++CONFIG=@sysconfdir_expanded@/boxbackup/bbackupd.conf
+ PIDFILE=@localstatedir_expanded@/bbackupd.pid
+ 
+ test -x $BBACKUPD || exit 0
+
+=== modified file 'contrib/debian/bbstored.in'
+--- old/contrib/debian/bbstored.in	2008-02-02 07:31:52 +0000
++++ new/contrib/debian/bbstored.in	2009-03-30 21:10:14 +0000
+@@ -3,7 +3,7 @@
+ # Start and stop the Box Backup server daemon.
+ 
+ BBSTORED=@bindir_expanded@/bbstored
+-CONFIG=@sysconfdir_expanded@/box/bbstored.conf
++CONFIG=@sysconfdir_expanded@/boxbackup/bbstored.conf
+ PIDFILE=@localstatedir_expanded@/bbstored.pid
+ 
+ test -x $BBACKUPD || exit 0
+
+=== modified file 'bin/bbstored/bbstored-config.in'
+--- old/bin/bbstored/bbstored-config.in	2008-02-02 07:31:52 +0000
++++ new/bin/bbstored/bbstored-config.in	2009-03-30 21:10:14 +0000
+@@ -19,7 +19,7 @@ Usage:
+     bbstored-config config-dir server-hostname username [raidfile-config]
+ 
+ Parameters:
+-    config-dir       is usually @sysconfdir_expanded@/box
++    config-dir       is usually @sysconfdir_expanded@/boxbackup
+     server-hostname  is the hostname that clients will use to connect to
+                      this server
+     username         is the user to run the server under
+@@ -47,7 +47,7 @@ __E
+ }
+ 
+ # default locations
+-my $default_config_location = '@sysconfdir_expanded@/box/bbstored.conf';
++my $default_config_location = '@sysconfdir_expanded@/boxbackup/bbstored.conf';
+ 
+ # command line parameters
+ my ($config_dir,$server,$username,$raidfile_config) = @ARGV;
+
+=== modified file 'bin/bbstored/BackupConstants.h'
+--- old/bin/bbstored/BackupConstants.h	2009-03-31 13:58:19 +0000
++++ new/bin/bbstored/BackupConstants.h	2009-03-31 13:58:21 +0000
+@@ -10,7 +10,7 @@
+ #ifndef BACKUPCONSTANTS__H
+ #define BACKUPCONSTANTS__H
+ 
+-#define BACKUP_STORE_DEFAULT_ACCOUNT_DATABASE_FILE	"/etc/box/backupstoreaccounts"
++#define BACKUP_STORE_DEFAULT_ACCOUNT_DATABASE_FILE	"/etc/boxbackup/backupstoreaccounts"
+ 
+ // 15 minutes to timeout (milliseconds)
+ #define	BACKUP_STORE_TIMEOUT			(15*60*1000)
+
+=== modified file 'bin/bbackupd/bbackupd-config.in'
+--- old/bin/bbackupd/bbackupd-config.in	2008-02-02 07:31:52 +0000
++++ new/bin/bbackupd/bbackupd-config.in	2009-03-30 21:10:14 +0000
+@@ -19,7 +19,7 @@ Usage:
+         working-dir [backup directories]
+ 
+ Parameters:
+-    config-dir          is usually @sysconfdir_expanded@/box
++    config-dir          is usually @sysconfdir_expanded@/boxbackup
+     backup-mode         is lazy or snapshot:
+         lazy mode       runs continously, uploading files over a specified age
+         snapshot mode   uploads a snapshot of the filesystem when instructed
+@@ -57,7 +57,7 @@ __E
+ }
+ 
+ # default locations
+-my $default_config_location = '@sysconfdir_expanded@/box/bbackupd.conf';
++my $default_config_location = '@sysconfdir_expanded@/boxbackup/bbackupd.conf';
+ 
+ # command line parameters
+ my ($config_dir,$backup_mode,$account_num,$server,$working_dir,@tobackup) = @ARGV;
+
+=== modified file 'lib/raidfile/raidfile-config.in'
+--- old/lib/raidfile/raidfile-config.in	2008-02-02 07:31:52 +0000
++++ new/lib/raidfile/raidfile-config.in	2009-03-30 21:10:14 +0000
+@@ -19,7 +19,7 @@ Usage:
+     raidfile-config config-dir block-size dir0 [dir1 dir2]
+ 
+ Parameters:
+-    config-dir        is usually @sysconfdir_expanded@/box
++    config-dir        is usually @sysconfdir_expanded@/boxbackup
+     block-size        must be a power of two, and usually the block or
+                       fragment size of your file system
+     dir0, dir1, dir2  are the directories used as the root of the raid
+
+=== modified file 'lib/raidfile/RaidFileController.h'
+--- old/lib/raidfile/RaidFileController.h	2009-03-31 13:58:19 +0000
++++ new/lib/raidfile/RaidFileController.h	2009-03-31 13:58:22 +0000
+@@ -82,7 +82,7 @@ public:
+ 	
+ public:
+ 	void Initialise(const std::string& rConfigFilename = 
+-		"/etc/box/raidfile.conf");
++		"/etc/boxbackup/raidfile.conf");
+ 	int GetNumDiscSets() {return mSetList.size();}
+ 
+ 	// --------------------------------------------------------------------------
+
+modified:
+  lib/common/BoxPortsAndFiles.h.in
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 00000000..abffd0e4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-adjust_config_basedir.diff
diff --git a/lib/common/BoxPortsAndFiles.h.in b/lib/common/BoxPortsAndFiles.h.in
index fd34a3bb..fcc0ddce 100644
--- a/lib/common/BoxPortsAndFiles.h.in
+++ b/lib/common/BoxPortsAndFiles.h.in
@@ -31,9 +31,9 @@
 	#define BOX_GET_DEFAULT_BBSTORED_CONFIG_FILE \
 		GetDefaultConfigFilePath("bbstored.conf").c_str()
 #else
-#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "@sysconfdir_expanded@/boxbackup/bbackupd.conf"
-#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "@sysconfdir_expanded@/boxbackup/raidfile.conf"
-#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "@sysconfdir_expanded@/boxbackup/bbstored.conf"
+#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "@sysconfdir_expanded@/box/bbackupd.conf"
+#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "@sysconfdir_expanded@/box/raidfile.conf"
+#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "@sysconfdir_expanded@/box/bbstored.conf"
 #endif
 
 #endif // BOXPORTSANDFILES__H
diff --git a/lib/raidfile/RaidFileController.h b/lib/raidfile/RaidFileController.h
index 216bdf3a..783cb055 100644
--- a/lib/raidfile/RaidFileController.h
+++ b/lib/raidfile/RaidFileController.h
@@ -82,7 +82,7 @@ public:
 	
 public:
 	void Initialise(const std::string& rConfigFilename = 
-		"/etc/boxbackup/raidfile.conf");
+		"/etc/box/raidfile.conf");
 	int GetNumDiscSets() {return mSetList.size();}
 
 	// --------------------------------------------------------------------------
diff --git a/lib/raidfile/raidfile-config.in b/lib/raidfile/raidfile-config.in
index b8ea73a5..76b65ace 100755
--- a/lib/raidfile/raidfile-config.in
+++ b/lib/raidfile/raidfile-config.in
@@ -19,7 +19,7 @@ Usage:
     raidfile-config config-dir block-size dir0 [dir1 dir2]
 
 Parameters:
-    config-dir        is usually @sysconfdir_expanded@/boxbackup
+    config-dir        is usually @sysconfdir_expanded@/box
     block-size        must be a power of two, and usually the block or
                       fragment size of your file system
     dir0, dir1, dir2  are the directories used as the root of the raid