diff options
| -rwxr-xr-x | bin/bbackupd/bbackupd-config | 4 | ||||
| -rwxr-xr-x | bin/bbackupd/bbackupd-config.in | 4 | ||||
| -rwxr-xr-x | bin/bbstored/bbstored-config | 4 | ||||
| -rwxr-xr-x | bin/bbstored/bbstored-config.in | 4 | ||||
| -rw-r--r-- | documentation/adminguide.xml | 6 | ||||
| -rwxr-xr-x | lib/common/BoxPortsAndFiles.h | 6 | ||||
| -rw-r--r-- | lib/raidfile/RaidFileController.h | 2 |
7 files changed, 18 insertions, 12 deletions
diff --git a/bin/bbackupd/bbackupd-config b/bin/bbackupd/bbackupd-config index 37847d7e..d2fc49fb 100755 --- a/bin/bbackupd/bbackupd-config +++ b/bin/bbackupd/bbackupd-config @@ -58,7 +58,7 @@ Usage: working-dir [backup directories] Parameters: - config-dir is usually /etc/box + config-dir is usually /etc/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 @@ -96,7 +96,7 @@ __E } # default locations -my $default_config_location = '/etc/box/bbackupd.conf'; +my $default_config_location = '/etc/boxbackup/bbackupd.conf'; # command line parameters my ($config_dir,$backup_mode,$account_num,$server,$working_dir,@tobackup) = @ARGV; diff --git a/bin/bbackupd/bbackupd-config.in b/bin/bbackupd/bbackupd-config.in index 16ddb75c..a88749fc 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@/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; diff --git a/bin/bbstored/bbstored-config b/bin/bbstored/bbstored-config index 7f1d7cc8..4490c4ed 100755 --- a/bin/bbstored/bbstored-config +++ b/bin/bbstored/bbstored-config @@ -58,7 +58,7 @@ Usage: bbstored-config config-dir server-hostname username [raidfile-config] Parameters: - config-dir is usually /etc/box + config-dir is usually /etc/boxbackup server-hostname is the hostname that clients will use to connect to this server username is the user to run the server under @@ -86,7 +86,7 @@ __E } # default locations -my $default_config_location = '/etc/box/bbstored.conf'; +my $default_config_location = '/etc/boxbackup/bbstored.conf'; # command line parameters my ($config_dir,$server,$username,$raidfile_config) = @ARGV; diff --git a/bin/bbstored/bbstored-config.in b/bin/bbstored/bbstored-config.in index 33cfb39a..83bb25a3 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@/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; diff --git a/documentation/adminguide.xml b/documentation/adminguide.xml index d3552725..4a6180ad 100644 --- a/documentation/adminguide.xml +++ b/documentation/adminguide.xml @@ -286,6 +286,12 @@ local5.info /var/log/raidfile</programlisting> <para><emphasis role="bold">Note:</emphasis> Separators must be tabs, otherwise these entries will be ignored.</para> + <para><emphasis role="bold">Note2:</emphasis> The packaged + debian and ubuntu versions of boxbackup do not log to local6, + but to the more standard 'daemon' facility. This means you + should not have anything to do to your syslog configuration, + since it is configured to be logged by default.</para> + <programlisting>touch /var/log/box touch /var/log/raidfile</programlisting> diff --git a/lib/common/BoxPortsAndFiles.h b/lib/common/BoxPortsAndFiles.h index 07c9f1b1..ffd353bf 100755 --- a/lib/common/BoxPortsAndFiles.h +++ b/lib/common/BoxPortsAndFiles.h @@ -70,9 +70,9 @@ #define BOX_GET_DEFAULT_BBSTORED_CONFIG_FILE \ GetDefaultConfigFilePath("bbstored.conf").c_str() #else -#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "/etc/box/bbackupd.conf" -#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "/etc/box/raidfile.conf" -#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "/etc/box/bbstored.conf" +#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "/etc/boxbackup/bbackupd.conf" +#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "/etc/boxbackup/raidfile.conf" +#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "/etc/boxbackup/bbstored.conf" #endif #endif // BOXPORTSANDFILES__H diff --git a/lib/raidfile/RaidFileController.h b/lib/raidfile/RaidFileController.h index 92498eb2..36d577db 100644 --- a/lib/raidfile/RaidFileController.h +++ b/lib/raidfile/RaidFileController.h @@ -121,7 +121,7 @@ public: public: void Initialise(const std::string& rConfigFilename = - "/etc/box/raidfile.conf"); + "/etc/boxbackup/raidfile.conf"); int GetNumDiscSets() {return mSetList.size();} // -------------------------------------------------------------------------- |