diff options
author | Reinhard Tartler <siretart@tauware.de> | 2008-01-19 15:05:28 +0100 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2008-01-19 15:05:28 +0100 |
commit | 1d56581c644c53f1b9a182c6574bc2fc5243d4d1 (patch) | |
tree | 7f75e499dd2c98eee7d4ba919aad8783063ef541 /bin/bbstored | |
parent | aa2943800f9c00823720af98da036813ebf5cd2c (diff) |
Import of boxbackup 0.10
This is actually a quite funny commit: I had started my packaging branch
in a strange way: I did not start from a clean tarball, but used an
existing packaging directory as starting place. This makes upgrading to
a new upstream hard. So I branched revision 1, and 'bzr import'ed the
Upstream tarball of version 0.10 over it.
The upstream tarball version I used for this commit has the md5sum:
2dc02d87932fdb222ed019443ddcf444
Diffstat (limited to 'bin/bbstored')
-rw-r--r-- | bin/bbstored/BackupConstants.h | 2 | ||||
-rw-r--r-- | bin/bbstored/BackupStoreDaemon.cpp | 2 | ||||
-rwxr-xr-x | bin/bbstored/bbstored-config | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/bin/bbstored/BackupConstants.h b/bin/bbstored/BackupConstants.h index a01a29bf..2b44929c 100644 --- a/bin/bbstored/BackupConstants.h +++ b/bin/bbstored/BackupConstants.h @@ -48,7 +48,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/BackupStoreDaemon.cpp b/bin/bbstored/BackupStoreDaemon.cpp index 6472148b..06198ea4 100644 --- a/bin/bbstored/BackupStoreDaemon.cpp +++ b/bin/bbstored/BackupStoreDaemon.cpp @@ -221,7 +221,7 @@ void BackupStoreDaemon::Run() SetProcessTitle("housekeeping, idle"); whichSocket = 1; // Change the log name - ::openlog("bbstored/hk", LOG_PID, LOG_DAEMON); + ::openlog("bbstored/hk", LOG_PID, LOG_LOCAL6); // Log that housekeeping started ::syslog(LOG_INFO, "Housekeeping process started"); // Ignore term and hup diff --git a/bin/bbstored/bbstored-config b/bin/bbstored/bbstored-config index 39bc2e28..7325e383 100755 --- a/bin/bbstored/bbstored-config +++ b/bin/bbstored/bbstored-config @@ -56,7 +56,7 @@ Bad command line parameters. Usage: bbstored-config config-dir server-hostname username [raidfile-config] -config-dir usually /etc/boxbackup +config-dir usually /etc/box server-hostname is the hostname used by clients to connect to this server username is the user to run the server under raidfile-config is optional. Use if you have a non-standard raidfile.conf file. @@ -82,7 +82,7 @@ __E } # default locations -my $default_config_location = '/etc/boxbackup/bbstored.conf'; +my $default_config_location = '/etc/box/bbstored.conf'; # command line parameters my ($config_dir,$server,$username,$raidfile_config) = @ARGV; |