From 2787035d98661881477d696403ca2a78b49322d5 Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Sat, 2 Feb 2008 08:31:52 +0100 Subject: import version 0.11rc2 This commit has been made by 'bzr import'. I used the upstream tarball of Version 0.11rc2 for creating it. It has the md5sum: 68052f963a944c717a50bd65a54375ff --- bin/bbstored/BBStoreDHousekeeping.cpp | 5 +++-- bin/bbstored/BackupCommands.cpp | 5 +++-- bin/bbstored/BackupConstants.h | 5 +++-- bin/bbstored/BackupContext.cpp | 5 +++-- bin/bbstored/BackupContext.h | 5 +++-- bin/bbstored/BackupStoreDaemon.cpp | 5 +++-- bin/bbstored/BackupStoreDaemon.h | 5 +++-- bin/bbstored/HousekeepStoreAccount.cpp | 5 +++-- bin/bbstored/HousekeepStoreAccount.h | 5 +++-- bin/bbstored/bbstored-certs | 5 +++-- bin/bbstored/bbstored-config | 20 ++++++++++++-------- bin/bbstored/bbstored-config.in | 19 +++++++++++-------- bin/bbstored/bbstored.cpp | 5 +++-- 13 files changed, 56 insertions(+), 38 deletions(-) (limited to 'bin/bbstored') diff --git a/bin/bbstored/BBStoreDHousekeeping.cpp b/bin/bbstored/BBStoreDHousekeeping.cpp index 5d6855ee..a7a40f82 100644 --- a/bin/bbstored/BBStoreDHousekeeping.cpp +++ b/bin/bbstored/BBStoreDHousekeeping.cpp @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright diff --git a/bin/bbstored/BackupCommands.cpp b/bin/bbstored/BackupCommands.cpp index aa1a5f94..75105a28 100644 --- a/bin/bbstored/BackupCommands.cpp +++ b/bin/bbstored/BackupCommands.cpp @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright diff --git a/bin/bbstored/BackupConstants.h b/bin/bbstored/BackupConstants.h index 664fea54..a2690555 100644 --- a/bin/bbstored/BackupConstants.h +++ b/bin/bbstored/BackupConstants.h @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright diff --git a/bin/bbstored/BackupContext.cpp b/bin/bbstored/BackupContext.cpp index 659cc5f8..032e4cdb 100644 --- a/bin/bbstored/BackupContext.cpp +++ b/bin/bbstored/BackupContext.cpp @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright diff --git a/bin/bbstored/BackupContext.h b/bin/bbstored/BackupContext.h index df4f2189..a7f7ca34 100644 --- a/bin/bbstored/BackupContext.h +++ b/bin/bbstored/BackupContext.h @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright diff --git a/bin/bbstored/BackupStoreDaemon.cpp b/bin/bbstored/BackupStoreDaemon.cpp index 5234d6e0..c045153b 100644 --- a/bin/bbstored/BackupStoreDaemon.cpp +++ b/bin/bbstored/BackupStoreDaemon.cpp @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright diff --git a/bin/bbstored/BackupStoreDaemon.h b/bin/bbstored/BackupStoreDaemon.h index d636f451..1b83efdb 100644 --- a/bin/bbstored/BackupStoreDaemon.h +++ b/bin/bbstored/BackupStoreDaemon.h @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright diff --git a/bin/bbstored/HousekeepStoreAccount.cpp b/bin/bbstored/HousekeepStoreAccount.cpp index fc9e83f1..f02a47a1 100644 --- a/bin/bbstored/HousekeepStoreAccount.cpp +++ b/bin/bbstored/HousekeepStoreAccount.cpp @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright diff --git a/bin/bbstored/HousekeepStoreAccount.h b/bin/bbstored/HousekeepStoreAccount.h index bdb012c6..22ab69df 100644 --- a/bin/bbstored/HousekeepStoreAccount.h +++ b/bin/bbstored/HousekeepStoreAccount.h @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright diff --git a/bin/bbstored/bbstored-certs b/bin/bbstored/bbstored-certs index 22d6c5ad..0ef8b325 100755 --- a/bin/bbstored/bbstored-certs +++ b/bin/bbstored/bbstored-certs @@ -1,12 +1,13 @@ #!/usr/bin/perl -# distribution boxbackup-0.11rc1 (svn version: 2023_2024) +# distribution boxbackup-0.11rc2 (svn version: 2072) # -# Copyright (c) 2003 - 2006 +# Copyright (c) 2003 - 2008 # Ben Summers and contributors. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: +# # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright diff --git a/bin/bbstored/bbstored-config b/bin/bbstored/bbstored-config index 76d8cad9..7f1d7cc8 100755 --- a/bin/bbstored/bbstored-config +++ b/bin/bbstored/bbstored-config @@ -1,12 +1,13 @@ #!/usr/bin/perl -# distribution boxbackup-0.11rc1 (svn version: 2023_2024) +# distribution boxbackup-0.11rc2 (svn version: 2072) # -# Copyright (c) 2003 - 2006 +# Copyright (c) 2003 - 2008 # Ben Summers and contributors. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: +# # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright @@ -54,12 +55,15 @@ Setup bbstored config utility. Bad command line parameters. Usage: - 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. + bbstored-config config-dir server-hostname username [raidfile-config] + +Parameters: + config-dir is usually /etc/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); 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. =================================================================== diff --git a/bin/bbstored/bbstored.cpp b/bin/bbstored/bbstored.cpp index d3710b5f..5204fc58 100644 --- a/bin/bbstored/bbstored.cpp +++ b/bin/bbstored/bbstored.cpp @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright -- cgit v1.2.3