boxbackup 0.11 rc2 gentoo patch

boxbackup-0.11_rc2-gentoo.patch (text/plain), 26.32 KB, created by David Kaufman on 2008-09-22 02:26:36 UTC

[e-mail] following [e-mail]:
* change /etc/box into /etc/boxbackup
* don't do anything in /usr/local/bin, install in /usr/sbin instead

--- ../../../boxbackup-0.11rc2/./documentation/bbstoreaccounts.xml	2008-01-28 19:58:26.000000000 -0500
+++ boxbackup-0.11_rc2/documentation/bbstoreaccounts.xml	2008-09-21 21:10:19.000000000 -0400
@@ -38,7 +38,7 @@
       <para><literal>-c &lt;configfile&gt;</literal></para>
 
       <para>The configfile to use for connecting to the store. Default is
-      <literal>/etc/box/bbstored.conf</literal>.</para>
+      <literal>/etc/boxbackup/bbstored.conf</literal>.</para>
     </refsection>
 
     <refsection>
@@ -248,7 +248,7 @@
 
     <para><literal>bbstoreaccounts</literal> uses the Box Backup server
     configuration file, usually located in
-    <filename>/etc/box/bbstored.conf</filename>. </para>
+    <filename>/etc/boxbackup/bbstored.conf</filename>. </para>
   </refsection>
 
   <refsection>
--- ../../../boxbackup-0.11rc2/./documentation/bbackupctl.xml	2008-01-28 19:58:26.000000000 -0500
+++ boxbackup-0.11_rc2/documentation/bbackupctl.xml	2008-09-21 21:09:53.000000000 -0400
@@ -103,7 +103,7 @@
 
     <para><literal>bbackupctl</literal> uses the Box Backup client
     configuration file, usually located in
-    <filename>/etc/box/bbackupd.conf</filename>. On Windows this file is
+    <filename>/etc/boxbackup/bbackupd.conf</filename>. On Windows this file is
     usually located in the installation directory, and is named
     <filename>bbackupd.conf</filename> as well.</para>
   </refsection>
--- ../../../boxbackup-0.11rc2/./documentation/adminguide.xml	2008-01-28 19:58:26.000000000 -0500
+++ boxbackup-0.11_rc2/documentation/adminguide.xml	2008-09-21 21:22:30.000000000 -0400
@@ -95,23 +95,22 @@
 
         <programlisting>mkdir /tmp/boxbackupRepository                        # Create the directory
 chown _bbstored /tmp/boxbackupRepository/             # Change the owner to the new boxbackup daemon user
-
-/usr/local/bin/raidfile-config /etc/box/  1024 /tmp/boxbackupRepository
+/usr/sbin/raidfile-config /etc/boxbackup/  1024 /tmp/boxbackupRepository
 
 #substitute 1024 with the desired blocksize
 #substitute /tmp/boxbackupRepository with a directory that exists where you want the backup store located
-#/usr/local/bin/raidfile-config --help shows you the options</programlisting>
+#/usr/sbin/raidfile-config --help shows you the options</programlisting>
 
-        <para>Then create the configuration file /etc/box/bbstored.conf The
+        <para>Then create the configuration file /etc/boxbackup/bbstored.conf The
         hostname is tricky as it is used for two things: The name of the
         server in the certificate and the address the server is listening on.
         Since you might be using NAT, might move the server around or the
         domain name might change, choose a name that describes the server.
         When the network address of the server changes, you need to update the
         <literal>ListenAddresses</literal> directive in the
-        <filename>/etc/box/bbstored.conf</filename> file.</para>
+        <filename>/etc/boxbackup/bbstored.conf</filename> file.</para>
 
-        <programlisting>/usr/local/bin/bbstored-config /etc/box hostname _bbstored</programlisting>
+        <programlisting>/usr/sbin/bbstored-config /etc/boxbackup hostname _bbstored</programlisting>
 
         <para>This last step outputs 5 instructions that you must execute to
         the letter. A lot of questions are raised on the mailing list because
@@ -164,7 +163,7 @@
 
           <para>To setup the basic key structure, do the following:</para>
 
-          <programlisting>/usr/local/bin/bbstored-certs ca init</programlisting>
+          <programlisting>/usr/sbin/bbstored-certs ca init</programlisting>
 
           <para>(See <ulink url="instguide.xml">OpenSSL notes</ulink> if you
           get an OpenSSL error)</para>
@@ -181,7 +180,7 @@
           request (CSR) for you. Transfer it to the machine with your CA, then
           do:</para>
 
-          <programlisting>/usr/local/bin/bbstored-certs ca sign-server hostname-csr.pem</programlisting>
+          <programlisting>/usr/sbin/bbstored-certs ca sign-server hostname-csr.pem</programlisting>
 
           <para>This signs the certificate for the server. Follow the
           instructions in the output on which files to install on the server.
@@ -199,7 +198,7 @@
           0, for example, 1 or 75AB23C. Then on the backup store server,
           create the account with:</para>
 
-          <programlisting>/usr/local/bin/bbstoreaccounts create 75AB23C 0 4096M 4505M</programlisting>
+          <programlisting>/usr/sbin/bbstoreaccounts create 75AB23C 0 4096M 4505M</programlisting>
 
           <para>This looks complicated. The numbers are, in order:</para>
 
@@ -261,7 +260,7 @@
 
           <para>Sign this CSR with this command:</para>
 
-          <programlisting>/usr/local/bin/bbstored-certs ca sign 75AB23C-csr.pem</programlisting>
+          <programlisting>/usr/sbin/bbstored-certs ca sign 75AB23C-csr.pem</programlisting>
 
           <para>Don't forget to check that the embedded account number is
           correct! Then send the two files back to the user, as instructed by
@@ -333,7 +332,7 @@
         <para>The backup client has to be run as root, because it needs to
         read all your files to back them up, although it is possible to back
         up a single user's files by running it as that user. (Tip: specify a
-        directory other than <filename>/etc/box</filename>, and then give the
+        directory other than <filename>/etc/boxbackup</filename>, and then give the
         alternate config file as the first argument to
         <command>bbackupd</command>). However, it will fall over if you don't
         give yourself read access to one of your files.</para>
@@ -345,7 +344,7 @@
           the configuration files and generate a private key and certificate
           request.</para>
 
-          <programlisting>/usr/local/bin/bbackupd-config /etc/box lazy <emphasis
+          <programlisting>/usr/sbin/bbackupd-config /etc/boxbackup lazy <emphasis
               role="bold">999 hostname</emphasis> /var/bbackupd <emphasis
               role="bold">/home</emphasis></programlisting>
 
@@ -407,7 +406,7 @@
           basic bbackupd configuration.</para>
 
           <para>You can then run the daemon (as root) by running
-          <command>/usr/local/bin/bbackupd</command>, and of course, adding it
+          <command>/usr/sbin/bbackupd</command>, and of course, adding it
           to your system's startup scripts. The first time it's run it will
           upload everything. Interrupting it and restarting it will only
           upload files which were not uploaded before - it's very
@@ -423,7 +422,7 @@
           <para>Remember to make a traditional backup of the keys file, as
           instructed. You cannot restore files without it.</para>
 
-          <para>It is recommended that you backup up all of /etc/box as it
+          <para>It is recommended that you backup up all of /etc/boxbackup as it
           will make things easier if you need to restore files. But only the
           keys are absolutely essential.</para>
 
@@ -435,7 +434,7 @@
         <section>
           <title>Adding and removing backed up locations</title>
 
-          <para>By editing the /etc/box/bbackupd.conf file, you can add and
+          <para>By editing the /etc/boxbackup/bbackupd.conf file, you can add and
           remove directories to back up - see comments in this file for help.
           Send bbackupd a HUP signal after you modify it.</para>
 
@@ -517,12 +516,12 @@
             here -- they may be different for your system.</para>
           </important>
 
-          <programlisting>/usr/local/bin/bbackupd-config /etc/box lazy 51 server.example.com /var/bbackupd /home /etc/samba
+          <programlisting>/usr/sbin/bbackupd-config /etc/boxbackup lazy 51 server.example.com /var/bbackupd /home /etc/samba
 
 Setup bbackupd config utility.
 
 Configuration:
-   Writing configuration file: /etc/box/bbackupd.conf
+   Writing configuration file: /etc/boxbackup/bbackupd.conf
    Account: 51
    Server hostname: server.example.com
    Directories to back up:
@@ -535,14 +534,14 @@
 
 WARNING: Directories not checked against mountpoints. Check mounted filesystems manually.
 
-Creating /etc/box...
-Creating /etc/box/bbackupd
+Creating /etc/boxbackup...
+Creating /etc/boxbackup/bbackupd
 Generating private key...
  [OpenSSL output omitted]
 
 Generating keys for file backup
-Writing notify script /etc/box/bbackupd/NotifyStoreFull.sh
-Writing configuration file /etc/box/bbackupd.conf
+Writing notify script /etc/boxbackup/bbackupd/NotifyStoreFull.sh
+Writing configuration file /etc/boxbackup/bbackupd.conf
 
 ===================================================================
 
@@ -550,36 +549,36 @@
 
 What you need to do now...
 
-1) Make a backup of /etc/box/bbackupd/51-FileEncKeys.raw
+1) Make a backup of /etc/boxbackup/bbackupd/51-FileEncKeys.raw
    This should be a secure offsite backup.
    Without it, you cannot restore backups. Everything else can
    be replaced. But this cannot.
    KEEP IT IN A SAFE PLACE, OTHERWISE YOUR BACKUPS ARE USELESS.
 
-2) Send /etc/box/bbackupd/51-csr.pem
+2) Send /etc/boxbackup/bbackupd/51-csr.pem
    to the administrator of the backup server, and ask for it to
    be signed.
 
 3) The administrator will send you two files. Install them as
-      /etc/box/bbackupd/51-cert.pem
-      /etc/box/bbackupd/serverCA.pem
+      /etc/boxbackup/bbackupd/51-cert.pem
+      /etc/boxbackup/bbackupd/serverCA.pem
    after checking their authenticity.
 
 4) You may wish to read the configuration file
-      /etc/box/bbackupd.conf
+      /etc/boxbackup/bbackupd.conf
    and adjust as appropraite.
    
    There are some notes in it on excluding files you do not
    wish to be backed up.
 
 5) Review the script
-      /etc/box/bbackupd/NotifyStoreFull.sh
+      /etc/boxbackup/bbackupd/NotifyStoreFull.sh
    and check that it will email the right person when the store
    becomes full. This is important -- when the store is full, no
    more files will be backed up. You want to know about this.
 
 6) Start the backup daemon with the command
-      /usr/local/bin/bbackupd
+      /usr/sbin/bbackupd
    in /etc/rc.local, or your local equivalent.
    Note that bbackupd must run as root.
 
@@ -607,12 +606,12 @@
           <programlisting>StoreHostname = localhost
 AccountNumber = 0x2
 
-KeysFile = /etc/box/2-FileEncKeys.raw
-CertificateFile = /etc/box/2-cert.pem
-PrivateKeyFile = /etc/box/2-key.pem
-TrustedCAsFile = /etc/box/serverCA.pem
+KeysFile = /etc/boxbackup/2-FileEncKeys.raw
+CertificateFile = /etc/boxbackup/2-cert.pem
+PrivateKeyFile = /etc/boxbackup/2-key.pem
+TrustedCAsFile = /etc/boxbackup/serverCA.pem
 DataDirectory = /var/run/boxbackup
-NotifyScript = /etc/box/NotifySysadmin.sh
+NotifyScript = /etc/boxbackup/NotifySysadmin.sh
 CommandSocket = /var/run/box/bbackupd.sock
 
 UpdateStoreInterval = 86400
@@ -1304,7 +1303,7 @@
 
         <para>The command line syntax is:</para>
 
-        <programlisting>/usr/local/bin/bbackupctl [-q] [-c config-file] command</programlisting>
+        <programlisting>/usr/sbin/bbackupctl [-q] [-c config-file] command</programlisting>
 
         <para>The -q option reduces the amount of output the program emits,
         and -c allows an alternative configuration file to be
@@ -1358,7 +1357,7 @@
         <para>Use bbackupd-config to write a configuration file in snapshot
         mode, and then run the following command as a cron job.</para>
 
-        <programlisting>/usr/local/bin/bbackupctl -q sync</programlisting>
+        <programlisting>/usr/sbin/bbackupctl -q sync</programlisting>
 
         <para>This will cause the backup daemon to upload all changed files
         immediately. <emphasis role="bold">bbackupctl</emphasis> will exit
@@ -1376,7 +1375,7 @@
           for this account. Either use the usage command in interactive mode,
           or type:</para>
 
-          <programlisting>/usr/local/bin/bbackupquery -q usage quit</programlisting>
+          <programlisting>/usr/sbin/bbackupquery -q usage quit</programlisting>
 
           <para>to show the space used as a single command.</para>
         </section>
@@ -1388,11 +1387,11 @@
           the limits. To display the space used on the server for an account,
           use:</para>
 
-          <programlisting>/usr/local/bin/bbstoreaccounts info 75AB23C</programlisting>
+          <programlisting>/usr/sbin/bbstoreaccounts info 75AB23C</programlisting>
 
           <para>To adjust the soft and hard limits on an account, use:</para>
 
-          <programlisting>/usr/local/bin/bbstoreaccounts setlimit 75AB23C new-soft-limit new-hard-limit</programlisting>
+          <programlisting>/usr/sbin/bbstoreaccounts setlimit 75AB23C new-soft-limit new-hard-limit</programlisting>
 
           <para>You do not need to restart the server.</para>
         </section>
@@ -1405,7 +1404,7 @@
         utility does this and more.</para>
 
         <para>You don't provide any login information to it, as it just picks
-        up the data it needs from /etc/box/bbackupd.conf. You should run it as
+        up the data it needs from /etc/boxbackup/bbackupd.conf. You should run it as
         root so it can find everything it needs.</para>
 
         <para>Full documentation can be found in the <ulink
@@ -1435,7 +1434,7 @@
 
           <programlisting>[pthomsen@host bbackupquery]$ bbackupquery 
 Box Backup Query Tool  v0.10, (c) Ben Summers and contributors 2003-2006
-Using configuration file /etc/box/bbackupd.conf
+Using configuration file /etc/boxbackup/bbackupd.conf
 Connecting to store...
 Handshake with store...
 Login to store...
@@ -1538,7 +1537,7 @@
           regularly, and check its output. You can run the command manually as
           follows:</para>
 
-          <programlisting>/usr/local/bin/bbackupquery "compare -a" quit</programlisting>
+          <programlisting>/usr/sbin/bbackupquery "compare -a" quit</programlisting>
 
           <para>This command will report all the differences found between the
           store and the files on disc. It will download everything, so may
@@ -1561,7 +1560,7 @@
           <para>If you would like to do a "quick" check which just downloads
           file checksums and compares against that, then run:</para>
 
-          <programlisting>/usr/local/bin/bbackupquery "compare -aq" quit</programlisting>
+          <programlisting>/usr/sbin/bbackupquery "compare -aq" quit</programlisting>
 
           <para>However, this does not check that the file attributes are
           correct, and since the checksums are generated on the client they
@@ -1580,7 +1579,7 @@
           file safe, you indirectly keep your entire backup safe.</para>
 
           <para>The first step is to recreate the configuration of the backup
-          client. It's probably best to have stored the /etc/box directory
+          client. It's probably best to have stored the /etc/boxbackup directory
           with your keys. But if you're recreating it, all you really need is
           to have got the login infomation correct (ie the certs and
           keys).</para>
@@ -1595,7 +1594,7 @@
 
           <para>Type:</para>
 
-          <programlisting>/usr/local/bin/bbackupquery</programlisting>
+          <programlisting>/usr/sbin/bbackupquery</programlisting>
 
           <para>to run it in interactive mode.</para>
 
@@ -1628,7 +1627,7 @@
           <para>Firstly, run bbackupquery in interactive mode. It behaves in a
           similar manner to a command line sftp client.</para>
 
-          <programlisting>/usr/local/bin/bbackupquery</programlisting>
+          <programlisting>/usr/sbin/bbackupquery</programlisting>
 
           <para>Then navigate to the directory containing the file you want,
           using list, cd and pwd.</para>
@@ -1744,14 +1743,14 @@
         <para>First, run the check utility, and see what errors it
         reports.</para>
 
-        <programlisting>/usr/local/bin/bbstoreaccounts check 1234</programlisting>
+        <programlisting>/usr/sbin/bbstoreaccounts check 1234</programlisting>
 
         <para>This will take some time, and use a fair bit of memory (about 16
         bytes per file and directory). If the output looks plausible and
         reports errors which need fixing, run it again but with the fix
         flag:</para>
 
-        <programlisting>/usr/local/bin/bbstoreaccounts check 1234 fix</programlisting>
+        <programlisting>/usr/sbin/bbstoreaccounts check 1234 fix</programlisting>
 
         <para>This will fix any errors, and remove unrecoverable files.
         Directories will be recreated if necessary.</para>
@@ -1841,7 +1840,7 @@
         configuration file locations to daemons and programs. For
         example</para>
 
-        <programlisting>/usr/local/bin/bbstored /some/other/dir/bbstored.config /usr/local/bin/bbackupquery -c /some/other/dir/bbackupd.config</programlisting>
+        <programlisting>/usr/sbin/bbstored /some/other/dir/bbstored.config /usr/sbin/bbackupquery -c /some/other/dir/bbackupd.config</programlisting>
 
         <para>(daemons specify the name as the first argument, utility
         programs with the -c option).</para>
@@ -1965,7 +1964,7 @@
       <para>Follow the installation instructions, but install the executable
       files manually to somewhere in your home directory. Then use
       bbackupd-config to configure the daemon, but use a directory other than
-      /etc/box, probably somewhere in your home directory.</para>
+      /etc/boxbackup, probably somewhere in your home directory.</para>
 
       <para>All directories you specify to be backed up must be readable, and
       all files must be owned by the user and readable to that user.</para>
--- ../../../boxbackup-0.11rc2/./documentation/bbstored-config.xml	2008-01-28 19:58:26.000000000 -0500
+++ boxbackup-0.11_rc2/documentation/bbstored-config.xml	2008-09-21 21:10:55.000000000 -0400
@@ -98,7 +98,7 @@
 
     <para><literal>bbstoreaccounts</literal> uses the Box Backup server
     configuration file, usually located in
-    <filename>/etc/box/bbstored.conf</filename>.</para>
+    <filename>/etc/boxbackup/bbstored.conf</filename>.</para>
   </refsection>
 
   <refsection>
--- ../../../boxbackup-0.11rc2/./documentation/instguide.xml	2008-01-28 19:58:26.000000000 -0500
+++ boxbackup-0.11_rc2/documentation/instguide.xml	2008-09-21 21:22:52.000000000 -0400
@@ -240,7 +240,7 @@
       <para>This builds two parcels of binaries and scripts, 'backup-client'
       and 'backup-server'. The generated installation scripts assumes you want
       everything installed in <emphasis
-      role="bold">/usr/local/bin</emphasis></para>
+      role="bold">/usr/sbin</emphasis></para>
 
       <para>Optionally, type <emphasis role="bold">make test</emphasis> to run
       all the tests.</para>
--- ../../../boxbackup-0.11rc2/./documentation/bbackupquery.xml	2008-01-28 19:58:27.000000000 -0500
+++ boxbackup-0.11_rc2/documentation/bbackupquery.xml	2008-09-21 21:11:07.000000000 -0400
@@ -336,7 +336,7 @@
 
     <para><literal>bbackupquery</literal> uses the Box Backup client
     configuration file, usually located in
-    <filename>/etc/box/bbackupd.conf</filename>. On Windows this file is
+    <filename>/etc/boxbackup/bbackupd.conf</filename>. On Windows this file is
     usually located in the installation directory, and is named
     <filename>bbackupd.conf</filename> as well.</para>
   </refsection>
--- ../../../boxbackup-0.11rc2/./documentation/raidfile-config.xml	2008-01-28 19:58:26.000000000 -0500
+++ boxbackup-0.11_rc2/documentation/raidfile-config.xml	2008-09-21 21:11:35.000000000 -0400
@@ -39,7 +39,7 @@
         <listitem>
           <para><literal>configdir</literal>: The directory path where
           configuration files are located. Usually this is
-          <literal>/etc/box</literal>. <literal>raidfile.conf</literal> will
+          <literal>/etc/boxbackup</literal>. <literal>raidfile.conf</literal> will
           be written in this directory.</para>
         </listitem>
 
--- ../../../boxbackup-0.11rc2/./lib/raidfile/RaidFileController.h	2008-01-28 19:58:25.000000000 -0500
+++ boxbackup-0.11_rc2/lib/raidfile/RaidFileController.h	2008-09-21 21:16:40.000000000 -0400
@@ -121,7 +121,7 @@
 	
 public:
 	void Initialise(const std::string& rConfigFilename = 
-		"/etc/box/raidfile.conf");
+		"/etc/boxbackup/raidfile.conf");
 	int GetNumDiscSets() {return mSetList.size();}
 
 	// --------------------------------------------------------------------------
--- ../../../boxbackup-0.11rc2/./lib/raidfile/raidfile-config	2008-01-28 19:58:25.000000000 -0500
+++ boxbackup-0.11_rc2/lib/raidfile/raidfile-config	2008-09-21 21:16:22.000000000 -0400
@@ -58,7 +58,7 @@
     raidfile-config config-dir block-size dir0 [dir1 dir2]
 
 Parameters:
-    config-dir        is usually /etc/box
+    config-dir        is usually /etc/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
--- ../../../boxbackup-0.11rc2/./lib/common/BoxPortsAndFiles.h	2008-01-28 19:58:23.000000000 -0500
+++ boxbackup-0.11_rc2/lib/common/BoxPortsAndFiles.h	2008-09-21 21:17:22.000000000 -0400
@@ -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
--- ../../../boxbackup-0.11rc2/./notes/backup_encryption.txt	2008-01-28 19:58:26.000000000 -0500
+++ boxbackup-0.11_rc2/notes/backup_encryption.txt	2008-09-21 21:17:42.000000000 -0400
@@ -33,7 +33,7 @@
 
 The file data is encrypted with AES in CBC mode, with a 256 bit key (max length). Blowfish is used elsewhere because the larger block size of AES, while more secure, would be terribly space inefficient. Note that Blowfish may also be used when older versions of OpenSSL are in use, and for backwards compatibility with older versions.
 
-The keys are generated using "openssl rand", and a 1k file of key material is stored in /etc/box/bbackupd. The configuration scripts make this readable only by root.
+The keys are generated using "openssl rand", and a 1k file of key material is stored in /etc/boxbackup/bbackupd. The configuration scripts make this readable only by root.
 
 Code for review: BackupClientCryptoKeys_Setup()
 in lib/backupclient/BackupClientCryptoKeys.cpp
--- ../../../boxbackup-0.11rc2/./notes/lib_raidfile.txt	2008-01-28 19:58:26.000000000 -0500
+++ boxbackup-0.11_rc2/notes/lib_raidfile.txt	2008-09-21 21:17:54.000000000 -0400
@@ -11,7 +11,7 @@
 
 SUBTITLE Controller
 
-The raid disc sets are managed by RaidFileController. This reads the configuration file, /etc/box/raidfile.conf, and then stores the sets of discs for use by the other classes.
+The raid disc sets are managed by RaidFileController. This reads the configuration file, /etc/boxbackup/raidfile.conf, and then stores the sets of discs for use by the other classes.
 
 In the code, files are referenced using an integer set number, and a filename within that set. For example, (0, "dir/subdir/filename.ext"). The RAID file controller turns this into actual physcial filenames transparently.
 
--- ../../../boxbackup-0.11rc2/./bin/bbackupd/bbackupd-config	2008-01-28 19:58:26.000000000 -0500
+++ boxbackup-0.11_rc2/bin/bbackupd/bbackupd-config	2008-09-21 21:26:04.000000000 -0400
@@ -58,7 +58,7 @@
         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 @@
 }
 
 # 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;
@@ -616,7 +616,7 @@
    more files will be backed up. You want to know about this.
 
 6) Start the backup daemon with the command
-      /usr/local/bin/bbackupd$daemon_args
+      /usr/sbin/bbackupd$daemon_args
    in /etc/rc.local, or your local equivalent.
    Note that bbackupd must run as root.
 __E
@@ -626,7 +626,7 @@
 
 7) Set up a cron job to run whenever you want a snapshot of the
    file system to be taken. Run the command
-      /usr/local/bin/bbackupctl -q$ctl_daemon_args sync
+      /usr/sbin/bbackupctl -q$ctl_daemon_args sync
 __E
 }
 print <<__E;
--- ../../../boxbackup-0.11rc2/./bin/bbstored/BackupConstants.h	2008-01-28 19:58:25.000000000 -0500
+++ boxbackup-0.11_rc2/bin/bbstored/BackupConstants.h	2008-09-21 21:19:08.000000000 -0400
@@ -49,7 +49,7 @@
 #ifndef BACKUPCONSTANTS__H
 #define BACKUPCONSTANTS__H
 
-#define BACKUP_STORE_DEFAULT_ACCOUNT_DATABASE_FILE	"/etc/box/backupstoreaccounts"
+#define BACKUP_STORE_DEFAULT_ACCOUNT_DATABASE_FILE	"/etc/boxbackup/backupstoreaccounts"
 
 // 15 minutes to timeout (milliseconds)
 #define	BACKUP_STORE_TIMEOUT			(15*60*1000)
--- ../../../boxbackup-0.11rc2/./bin/bbstored/bbstored-config	2008-01-28 19:58:25.000000000 -0500
+++ boxbackup-0.11_rc2/bin/bbstored/bbstored-config	2008-09-21 21:26:18.000000000 -0400
@@ -58,7 +58,7 @@
     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 @@
 }
 
 # 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;
@@ -273,7 +273,7 @@
 4) Create accounts with bbstoreaccounts
 
 5) Start the backup store daemon with the command
-      /usr/local/bin/bbstored$daemon_args
+      /usr/sbin/bbstored$daemon_args
    in /etc/rc.local, or your local equivalent.
 
 ===================================================================