Adjust the config basedir from /etc/box to /etc/boxbackup for the debian package. --- a/contrib/debian/bbackupd.in +++ b/contrib/debian/bbackupd.in @@ -7,7 +7,7 @@ NAME=bbackupd LONGNAME="Box Backup Client daemon" BINARY=@sbindir_expanded@/$NAME -CONFIG=@sysconfdir_expanded@/box/$NAME.conf +CONFIG=@sysconfdir_expanded@/boxbackup/$NAME.conf PIDFILE=@localstatedir_expanded@/bbackupd/$NAME.pid test -x $BINARY || exit 0 --- a/contrib/debian/bbstored.in +++ b/contrib/debian/bbstored.in @@ -7,7 +7,7 @@ NAME=bbstored LONGNAME="Box Backup Server daemon" BINARY=@sbindir_expanded@/$NAME -CONFIG=@sysconfdir_expanded@/box/$NAME.conf +CONFIG=@sysconfdir_expanded@/boxbackup/$NAME.conf PIDFILE=@localstatedir_expanded@/run/$NAME.pid test -x $BINARY || exit 0 --- 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@/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; --- 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@/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; --- 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@/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 --- a/lib/raidfile/RaidFileController.h +++ b/lib/raidfile/RaidFileController.h @@ -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();} // --------------------------------------------------------------------------