summaryrefslogtreecommitdiff
path: root/bin/bbstored
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2008-01-28 23:58:35 +0000
committerChris Wilson <chris+github@qwirx.com>2008-01-28 23:58:35 +0000
commitec069edf44b944ad6179dd240bce3f5f26c9c66e (patch)
treee3c26dc23dd08975a1ed7c4b79b18118cfa13962 /bin/bbstored
parent68da084d5923caaadfb2e51b021796c46bc22cb8 (diff)
Use @sysconfdir_expanded@ as default location for configuration files,
instead of /etc/box. Thanks to Eric Cronin for pointing this out. Likewise, use @localstatedir_expanded@ as default location for temporary state (*.pid and bbackupd.sock), defaults to /usr/local/var, although /var/run may be better on LFS systems. Likewise, use @bindir_expanded@ for binaries. Reformat usage text for readability. Remove the message that "Directories not checked against mountpoints", as they now are. Report the type of the unrecognised message in the "unknown error" part of the default NotifyScript.
Diffstat (limited to 'bin/bbstored')
-rwxr-xr-xbin/bbstored/bbstored-config.in19
1 files changed, 11 insertions, 8 deletions
diff --git a/bin/bbstored/bbstored-config.in b/bin/bbstored/bbstored-config.in
index 7bd79716..33cfb39a 100755
--- a/bin/bbstored/bbstored-config.in
+++ b/bin/bbstored/bbstored-config.in
@@ -16,12 +16,15 @@ Setup bbstored config utility.
Bad command line parameters.
Usage:
- bbstored-config config-dir server-hostname username [raidfile-config]
+ bbstored-config config-dir server-hostname username [raidfile-config]
-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.
+Parameters:
+ 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
+ raidfile-config is optional. Use if you have a non-standard
+ raidfile.conf file.
__E
exit(1);
@@ -44,7 +47,7 @@ __E
}
# default locations
-my $default_config_location = '/etc/box/bbstored.conf';
+my $default_config_location = '@sysconfdir_expanded@/box/bbstored.conf';
# command line parameters
my ($config_dir,$server,$username,$raidfile_config) = @ARGV;
@@ -193,7 +196,7 @@ TimeBetweenHousekeeping = 900
Server
{
- PidFile = /var/run/bbstored.pid
+ PidFile = @localstatedir_expanded@/bbstored.pid
User = $username
ListenAddresses = inet:$server
CertificateFile = $certificate
@@ -231,7 +234,7 @@ What you need to do now...
4) Create accounts with bbstoreaccounts
5) Start the backup store daemon with the command
- /usr/local/bin/bbstored$daemon_args
+ @bindir_expanded@/bbstored$daemon_args
in /etc/rc.local, or your local equivalent.
===================================================================