Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 205558 | Differences between
and this patch

Collapse All | Expand All

(-)../../../boxbackup-0.11rc2/./documentation/bbstoreaccounts.xml (-2 / +2 lines)
Lines 38-44 Link Here
38
      <para><literal>-c &lt;configfile&gt;</literal></para>
38
      <para><literal>-c &lt;configfile&gt;</literal></para>
39
39
40
      <para>The configfile to use for connecting to the store. Default is
40
      <para>The configfile to use for connecting to the store. Default is
41
      <literal>/etc/box/bbstored.conf</literal>.</para>
41
      <literal>/etc/boxbackup/bbstored.conf</literal>.</para>
42
    </refsection>
42
    </refsection>
43
43
44
    <refsection>
44
    <refsection>
Lines 248-254 Link Here
248
248
249
    <para><literal>bbstoreaccounts</literal> uses the Box Backup server
249
    <para><literal>bbstoreaccounts</literal> uses the Box Backup server
250
    configuration file, usually located in
250
    configuration file, usually located in
251
    <filename>/etc/box/bbstored.conf</filename>. </para>
251
    <filename>/etc/boxbackup/bbstored.conf</filename>. </para>
252
  </refsection>
252
  </refsection>
253
253
254
  <refsection>
254
  <refsection>
(-)../../../boxbackup-0.11rc2/./documentation/bbackupctl.xml (-1 / +1 lines)
Lines 103-109 Link Here
103
103
104
    <para><literal>bbackupctl</literal> uses the Box Backup client
104
    <para><literal>bbackupctl</literal> uses the Box Backup client
105
    configuration file, usually located in
105
    configuration file, usually located in
106
    <filename>/etc/box/bbackupd.conf</filename>. On Windows this file is
106
    <filename>/etc/boxbackup/bbackupd.conf</filename>. On Windows this file is
107
    usually located in the installation directory, and is named
107
    usually located in the installation directory, and is named
108
    <filename>bbackupd.conf</filename> as well.</para>
108
    <filename>bbackupd.conf</filename> as well.</para>
109
  </refsection>
109
  </refsection>
(-)../../../boxbackup-0.11rc2/./documentation/adminguide.xml (-49 / +48 lines)
Lines 95-117 Link Here
95
95
96
        <programlisting>mkdir /tmp/boxbackupRepository                        # Create the directory
96
        <programlisting>mkdir /tmp/boxbackupRepository                        # Create the directory
97
chown _bbstored /tmp/boxbackupRepository/             # Change the owner to the new boxbackup daemon user
97
chown _bbstored /tmp/boxbackupRepository/             # Change the owner to the new boxbackup daemon user
98
98
/usr/sbin/raidfile-config /etc/boxbackup/  1024 /tmp/boxbackupRepository
99
/usr/local/bin/raidfile-config /etc/box/  1024 /tmp/boxbackupRepository
100
99
101
#substitute 1024 with the desired blocksize
100
#substitute 1024 with the desired blocksize
102
#substitute /tmp/boxbackupRepository with a directory that exists where you want the backup store located
101
#substitute /tmp/boxbackupRepository with a directory that exists where you want the backup store located
103
#/usr/local/bin/raidfile-config --help shows you the options</programlisting>
102
#/usr/sbin/raidfile-config --help shows you the options</programlisting>
104
103
105
        <para>Then create the configuration file /etc/box/bbstored.conf The
104
        <para>Then create the configuration file /etc/boxbackup/bbstored.conf The
106
        hostname is tricky as it is used for two things: The name of the
105
        hostname is tricky as it is used for two things: The name of the
107
        server in the certificate and the address the server is listening on.
106
        server in the certificate and the address the server is listening on.
108
        Since you might be using NAT, might move the server around or the
107
        Since you might be using NAT, might move the server around or the
109
        domain name might change, choose a name that describes the server.
108
        domain name might change, choose a name that describes the server.
110
        When the network address of the server changes, you need to update the
109
        When the network address of the server changes, you need to update the
111
        <literal>ListenAddresses</literal> directive in the
110
        <literal>ListenAddresses</literal> directive in the
112
        <filename>/etc/box/bbstored.conf</filename> file.</para>
111
        <filename>/etc/boxbackup/bbstored.conf</filename> file.</para>
113
112
114
        <programlisting>/usr/local/bin/bbstored-config /etc/box hostname _bbstored</programlisting>
113
        <programlisting>/usr/sbin/bbstored-config /etc/boxbackup hostname _bbstored</programlisting>
115
114
116
        <para>This last step outputs 5 instructions that you must execute to
115
        <para>This last step outputs 5 instructions that you must execute to
117
        the letter. A lot of questions are raised on the mailing list because
116
        the letter. A lot of questions are raised on the mailing list because
Lines 164-170 Link Here
164
163
165
          <para>To setup the basic key structure, do the following:</para>
164
          <para>To setup the basic key structure, do the following:</para>
166
165
167
          <programlisting>/usr/local/bin/bbstored-certs ca init</programlisting>
166
          <programlisting>/usr/sbin/bbstored-certs ca init</programlisting>
168
167
169
          <para>(See <ulink url="instguide.xml">OpenSSL notes</ulink> if you
168
          <para>(See <ulink url="instguide.xml">OpenSSL notes</ulink> if you
170
          get an OpenSSL error)</para>
169
          get an OpenSSL error)</para>
Lines 181-187 Link Here
181
          request (CSR) for you. Transfer it to the machine with your CA, then
180
          request (CSR) for you. Transfer it to the machine with your CA, then
182
          do:</para>
181
          do:</para>
183
182
184
          <programlisting>/usr/local/bin/bbstored-certs ca sign-server hostname-csr.pem</programlisting>
183
          <programlisting>/usr/sbin/bbstored-certs ca sign-server hostname-csr.pem</programlisting>
185
184
186
          <para>This signs the certificate for the server. Follow the
185
          <para>This signs the certificate for the server. Follow the
187
          instructions in the output on which files to install on the server.
186
          instructions in the output on which files to install on the server.
Lines 199-205 Link Here
199
          0, for example, 1 or 75AB23C. Then on the backup store server,
198
          0, for example, 1 or 75AB23C. Then on the backup store server,
200
          create the account with:</para>
199
          create the account with:</para>
201
200
202
          <programlisting>/usr/local/bin/bbstoreaccounts create 75AB23C 0 4096M 4505M</programlisting>
201
          <programlisting>/usr/sbin/bbstoreaccounts create 75AB23C 0 4096M 4505M</programlisting>
203
202
204
          <para>This looks complicated. The numbers are, in order:</para>
203
          <para>This looks complicated. The numbers are, in order:</para>
205
204
Lines 261-267 Link Here
261
260
262
          <para>Sign this CSR with this command:</para>
261
          <para>Sign this CSR with this command:</para>
263
262
264
          <programlisting>/usr/local/bin/bbstored-certs ca sign 75AB23C-csr.pem</programlisting>
263
          <programlisting>/usr/sbin/bbstored-certs ca sign 75AB23C-csr.pem</programlisting>
265
264
266
          <para>Don't forget to check that the embedded account number is
265
          <para>Don't forget to check that the embedded account number is
267
          correct! Then send the two files back to the user, as instructed by
266
          correct! Then send the two files back to the user, as instructed by
Lines 333-339 Link Here
333
        <para>The backup client has to be run as root, because it needs to
332
        <para>The backup client has to be run as root, because it needs to
334
        read all your files to back them up, although it is possible to back
333
        read all your files to back them up, although it is possible to back
335
        up a single user's files by running it as that user. (Tip: specify a
334
        up a single user's files by running it as that user. (Tip: specify a
336
        directory other than <filename>/etc/box</filename>, and then give the
335
        directory other than <filename>/etc/boxbackup</filename>, and then give the
337
        alternate config file as the first argument to
336
        alternate config file as the first argument to
338
        <command>bbackupd</command>). However, it will fall over if you don't
337
        <command>bbackupd</command>). However, it will fall over if you don't
339
        give yourself read access to one of your files.</para>
338
        give yourself read access to one of your files.</para>
Lines 345-351 Link Here
345
          the configuration files and generate a private key and certificate
344
          the configuration files and generate a private key and certificate
346
          request.</para>
345
          request.</para>
347
346
348
          <programlisting>/usr/local/bin/bbackupd-config /etc/box lazy <emphasis
347
          <programlisting>/usr/sbin/bbackupd-config /etc/boxbackup lazy <emphasis
349
              role="bold">999 hostname</emphasis> /var/bbackupd <emphasis
348
              role="bold">999 hostname</emphasis> /var/bbackupd <emphasis
350
              role="bold">/home</emphasis></programlisting>
349
              role="bold">/home</emphasis></programlisting>
351
350
Lines 407-413 Link Here
407
          basic bbackupd configuration.</para>
406
          basic bbackupd configuration.</para>
408
407
409
          <para>You can then run the daemon (as root) by running
408
          <para>You can then run the daemon (as root) by running
410
          <command>/usr/local/bin/bbackupd</command>, and of course, adding it
409
          <command>/usr/sbin/bbackupd</command>, and of course, adding it
411
          to your system's startup scripts. The first time it's run it will
410
          to your system's startup scripts. The first time it's run it will
412
          upload everything. Interrupting it and restarting it will only
411
          upload everything. Interrupting it and restarting it will only
413
          upload files which were not uploaded before - it's very
412
          upload files which were not uploaded before - it's very
Lines 423-429 Link Here
423
          <para>Remember to make a traditional backup of the keys file, as
422
          <para>Remember to make a traditional backup of the keys file, as
424
          instructed. You cannot restore files without it.</para>
423
          instructed. You cannot restore files without it.</para>
425
424
426
          <para>It is recommended that you backup up all of /etc/box as it
425
          <para>It is recommended that you backup up all of /etc/boxbackup as it
427
          will make things easier if you need to restore files. But only the
426
          will make things easier if you need to restore files. But only the
428
          keys are absolutely essential.</para>
427
          keys are absolutely essential.</para>
429
428
Lines 435-441 Link Here
435
        <section>
434
        <section>
436
          <title>Adding and removing backed up locations</title>
435
          <title>Adding and removing backed up locations</title>
437
436
438
          <para>By editing the /etc/box/bbackupd.conf file, you can add and
437
          <para>By editing the /etc/boxbackup/bbackupd.conf file, you can add and
439
          remove directories to back up - see comments in this file for help.
438
          remove directories to back up - see comments in this file for help.
440
          Send bbackupd a HUP signal after you modify it.</para>
439
          Send bbackupd a HUP signal after you modify it.</para>
441
440
Lines 517-528 Link Here
517
            here -- they may be different for your system.</para>
516
            here -- they may be different for your system.</para>
518
          </important>
517
          </important>
519
518
520
          <programlisting>/usr/local/bin/bbackupd-config /etc/box lazy 51 server.example.com /var/bbackupd /home /etc/samba
519
          <programlisting>/usr/sbin/bbackupd-config /etc/boxbackup lazy 51 server.example.com /var/bbackupd /home /etc/samba
521
520
522
Setup bbackupd config utility.
521
Setup bbackupd config utility.
523
522
524
Configuration:
523
Configuration:
525
   Writing configuration file: /etc/box/bbackupd.conf
524
   Writing configuration file: /etc/boxbackup/bbackupd.conf
526
   Account: 51
525
   Account: 51
527
   Server hostname: server.example.com
526
   Server hostname: server.example.com
528
   Directories to back up:
527
   Directories to back up:
Lines 535-548 Link Here
535
534
536
WARNING: Directories not checked against mountpoints. Check mounted filesystems manually.
535
WARNING: Directories not checked against mountpoints. Check mounted filesystems manually.
537
536
538
Creating /etc/box...
537
Creating /etc/boxbackup...
539
Creating /etc/box/bbackupd
538
Creating /etc/boxbackup/bbackupd
540
Generating private key...
539
Generating private key...
541
 [OpenSSL output omitted]
540
 [OpenSSL output omitted]
542
541
543
Generating keys for file backup
542
Generating keys for file backup
544
Writing notify script /etc/box/bbackupd/NotifyStoreFull.sh
543
Writing notify script /etc/boxbackup/bbackupd/NotifyStoreFull.sh
545
Writing configuration file /etc/box/bbackupd.conf
544
Writing configuration file /etc/boxbackup/bbackupd.conf
546
545
547
===================================================================
546
===================================================================
548
547
Lines 550-585 Link Here
550
549
551
What you need to do now...
550
What you need to do now...
552
551
553
1) Make a backup of /etc/box/bbackupd/51-FileEncKeys.raw
552
1) Make a backup of /etc/boxbackup/bbackupd/51-FileEncKeys.raw
554
   This should be a secure offsite backup.
553
   This should be a secure offsite backup.
555
   Without it, you cannot restore backups. Everything else can
554
   Without it, you cannot restore backups. Everything else can
556
   be replaced. But this cannot.
555
   be replaced. But this cannot.
557
   KEEP IT IN A SAFE PLACE, OTHERWISE YOUR BACKUPS ARE USELESS.
556
   KEEP IT IN A SAFE PLACE, OTHERWISE YOUR BACKUPS ARE USELESS.
558
557
559
2) Send /etc/box/bbackupd/51-csr.pem
558
2) Send /etc/boxbackup/bbackupd/51-csr.pem
560
   to the administrator of the backup server, and ask for it to
559
   to the administrator of the backup server, and ask for it to
561
   be signed.
560
   be signed.
562
561
563
3) The administrator will send you two files. Install them as
562
3) The administrator will send you two files. Install them as
564
      /etc/box/bbackupd/51-cert.pem
563
      /etc/boxbackup/bbackupd/51-cert.pem
565
      /etc/box/bbackupd/serverCA.pem
564
      /etc/boxbackup/bbackupd/serverCA.pem
566
   after checking their authenticity.
565
   after checking their authenticity.
567
566
568
4) You may wish to read the configuration file
567
4) You may wish to read the configuration file
569
      /etc/box/bbackupd.conf
568
      /etc/boxbackup/bbackupd.conf
570
   and adjust as appropraite.
569
   and adjust as appropraite.
571
   
570
   
572
   There are some notes in it on excluding files you do not
571
   There are some notes in it on excluding files you do not
573
   wish to be backed up.
572
   wish to be backed up.
574
573
575
5) Review the script
574
5) Review the script
576
      /etc/box/bbackupd/NotifyStoreFull.sh
575
      /etc/boxbackup/bbackupd/NotifyStoreFull.sh
577
   and check that it will email the right person when the store
576
   and check that it will email the right person when the store
578
   becomes full. This is important -- when the store is full, no
577
   becomes full. This is important -- when the store is full, no
579
   more files will be backed up. You want to know about this.
578
   more files will be backed up. You want to know about this.
580
579
581
6) Start the backup daemon with the command
580
6) Start the backup daemon with the command
582
      /usr/local/bin/bbackupd
581
      /usr/sbin/bbackupd
583
   in /etc/rc.local, or your local equivalent.
582
   in /etc/rc.local, or your local equivalent.
584
   Note that bbackupd must run as root.
583
   Note that bbackupd must run as root.
585
584
Lines 607-618 Link Here
607
          <programlisting>StoreHostname = localhost
606
          <programlisting>StoreHostname = localhost
608
AccountNumber = 0x2
607
AccountNumber = 0x2
609
608
610
KeysFile = /etc/box/2-FileEncKeys.raw
609
KeysFile = /etc/boxbackup/2-FileEncKeys.raw
611
CertificateFile = /etc/box/2-cert.pem
610
CertificateFile = /etc/boxbackup/2-cert.pem
612
PrivateKeyFile = /etc/box/2-key.pem
611
PrivateKeyFile = /etc/boxbackup/2-key.pem
613
TrustedCAsFile = /etc/box/serverCA.pem
612
TrustedCAsFile = /etc/boxbackup/serverCA.pem
614
DataDirectory = /var/run/boxbackup
613
DataDirectory = /var/run/boxbackup
615
NotifyScript = /etc/box/NotifySysadmin.sh
614
NotifyScript = /etc/boxbackup/NotifySysadmin.sh
616
CommandSocket = /var/run/box/bbackupd.sock
615
CommandSocket = /var/run/box/bbackupd.sock
617
616
618
UpdateStoreInterval = 86400
617
UpdateStoreInterval = 86400
Lines 1304-1310 Link Here
1304
1303
1305
        <para>The command line syntax is:</para>
1304
        <para>The command line syntax is:</para>
1306
1305
1307
        <programlisting>/usr/local/bin/bbackupctl [-q] [-c config-file] command</programlisting>
1306
        <programlisting>/usr/sbin/bbackupctl [-q] [-c config-file] command</programlisting>
1308
1307
1309
        <para>The -q option reduces the amount of output the program emits,
1308
        <para>The -q option reduces the amount of output the program emits,
1310
        and -c allows an alternative configuration file to be
1309
        and -c allows an alternative configuration file to be
Lines 1358-1364 Link Here
1358
        <para>Use bbackupd-config to write a configuration file in snapshot
1357
        <para>Use bbackupd-config to write a configuration file in snapshot
1359
        mode, and then run the following command as a cron job.</para>
1358
        mode, and then run the following command as a cron job.</para>
1360
1359
1361
        <programlisting>/usr/local/bin/bbackupctl -q sync</programlisting>
1360
        <programlisting>/usr/sbin/bbackupctl -q sync</programlisting>
1362
1361
1363
        <para>This will cause the backup daemon to upload all changed files
1362
        <para>This will cause the backup daemon to upload all changed files
1364
        immediately. <emphasis role="bold">bbackupctl</emphasis> will exit
1363
        immediately. <emphasis role="bold">bbackupctl</emphasis> will exit
Lines 1376-1382 Link Here
1376
          for this account. Either use the usage command in interactive mode,
1375
          for this account. Either use the usage command in interactive mode,
1377
          or type:</para>
1376
          or type:</para>
1378
1377
1379
          <programlisting>/usr/local/bin/bbackupquery -q usage quit</programlisting>
1378
          <programlisting>/usr/sbin/bbackupquery -q usage quit</programlisting>
1380
1379
1381
          <para>to show the space used as a single command.</para>
1380
          <para>to show the space used as a single command.</para>
1382
        </section>
1381
        </section>
Lines 1388-1398 Link Here
1388
          the limits. To display the space used on the server for an account,
1387
          the limits. To display the space used on the server for an account,
1389
          use:</para>
1388
          use:</para>
1390
1389
1391
          <programlisting>/usr/local/bin/bbstoreaccounts info 75AB23C</programlisting>
1390
          <programlisting>/usr/sbin/bbstoreaccounts info 75AB23C</programlisting>
1392
1391
1393
          <para>To adjust the soft and hard limits on an account, use:</para>
1392
          <para>To adjust the soft and hard limits on an account, use:</para>
1394
1393
1395
          <programlisting>/usr/local/bin/bbstoreaccounts setlimit 75AB23C new-soft-limit new-hard-limit</programlisting>
1394
          <programlisting>/usr/sbin/bbstoreaccounts setlimit 75AB23C new-soft-limit new-hard-limit</programlisting>
1396
1395
1397
          <para>You do not need to restart the server.</para>
1396
          <para>You do not need to restart the server.</para>
1398
        </section>
1397
        </section>
Lines 1405-1411 Link Here
1405
        utility does this and more.</para>
1404
        utility does this and more.</para>
1406
1405
1407
        <para>You don't provide any login information to it, as it just picks
1406
        <para>You don't provide any login information to it, as it just picks
1408
        up the data it needs from /etc/box/bbackupd.conf. You should run it as
1407
        up the data it needs from /etc/boxbackup/bbackupd.conf. You should run it as
1409
        root so it can find everything it needs.</para>
1408
        root so it can find everything it needs.</para>
1410
1409
1411
        <para>Full documentation can be found in the <ulink
1410
        <para>Full documentation can be found in the <ulink
Lines 1435-1441 Link Here
1435
1434
1436
          <programlisting>[pthomsen@host bbackupquery]$ bbackupquery 
1435
          <programlisting>[pthomsen@host bbackupquery]$ bbackupquery 
1437
Box Backup Query Tool  v0.10, (c) Ben Summers and contributors 2003-2006
1436
Box Backup Query Tool  v0.10, (c) Ben Summers and contributors 2003-2006
1438
Using configuration file /etc/box/bbackupd.conf
1437
Using configuration file /etc/boxbackup/bbackupd.conf
1439
Connecting to store...
1438
Connecting to store...
1440
Handshake with store...
1439
Handshake with store...
1441
Login to store...
1440
Login to store...
Lines 1538-1544 Link Here
1538
          regularly, and check its output. You can run the command manually as
1537
          regularly, and check its output. You can run the command manually as
1539
          follows:</para>
1538
          follows:</para>
1540
1539
1541
          <programlisting>/usr/local/bin/bbackupquery "compare -a" quit</programlisting>
1540
          <programlisting>/usr/sbin/bbackupquery "compare -a" quit</programlisting>
1542
1541
1543
          <para>This command will report all the differences found between the
1542
          <para>This command will report all the differences found between the
1544
          store and the files on disc. It will download everything, so may
1543
          store and the files on disc. It will download everything, so may
Lines 1561-1567 Link Here
1561
          <para>If you would like to do a "quick" check which just downloads
1560
          <para>If you would like to do a "quick" check which just downloads
1562
          file checksums and compares against that, then run:</para>
1561
          file checksums and compares against that, then run:</para>
1563
1562
1564
          <programlisting>/usr/local/bin/bbackupquery "compare -aq" quit</programlisting>
1563
          <programlisting>/usr/sbin/bbackupquery "compare -aq" quit</programlisting>
1565
1564
1566
          <para>However, this does not check that the file attributes are
1565
          <para>However, this does not check that the file attributes are
1567
          correct, and since the checksums are generated on the client they
1566
          correct, and since the checksums are generated on the client they
Lines 1580-1586 Link Here
1580
          file safe, you indirectly keep your entire backup safe.</para>
1579
          file safe, you indirectly keep your entire backup safe.</para>
1581
1580
1582
          <para>The first step is to recreate the configuration of the backup
1581
          <para>The first step is to recreate the configuration of the backup
1583
          client. It's probably best to have stored the /etc/box directory
1582
          client. It's probably best to have stored the /etc/boxbackup directory
1584
          with your keys. But if you're recreating it, all you really need is
1583
          with your keys. But if you're recreating it, all you really need is
1585
          to have got the login infomation correct (ie the certs and
1584
          to have got the login infomation correct (ie the certs and
1586
          keys).</para>
1585
          keys).</para>
Lines 1595-1601 Link Here
1595
1594
1596
          <para>Type:</para>
1595
          <para>Type:</para>
1597
1596
1598
          <programlisting>/usr/local/bin/bbackupquery</programlisting>
1597
          <programlisting>/usr/sbin/bbackupquery</programlisting>
1599
1598
1600
          <para>to run it in interactive mode.</para>
1599
          <para>to run it in interactive mode.</para>
1601
1600
Lines 1628-1634 Link Here
1628
          <para>Firstly, run bbackupquery in interactive mode. It behaves in a
1627
          <para>Firstly, run bbackupquery in interactive mode. It behaves in a
1629
          similar manner to a command line sftp client.</para>
1628
          similar manner to a command line sftp client.</para>
1630
1629
1631
          <programlisting>/usr/local/bin/bbackupquery</programlisting>
1630
          <programlisting>/usr/sbin/bbackupquery</programlisting>
1632
1631
1633
          <para>Then navigate to the directory containing the file you want,
1632
          <para>Then navigate to the directory containing the file you want,
1634
          using list, cd and pwd.</para>
1633
          using list, cd and pwd.</para>
Lines 1744-1757 Link Here
1744
        <para>First, run the check utility, and see what errors it
1743
        <para>First, run the check utility, and see what errors it
1745
        reports.</para>
1744
        reports.</para>
1746
1745
1747
        <programlisting>/usr/local/bin/bbstoreaccounts check 1234</programlisting>
1746
        <programlisting>/usr/sbin/bbstoreaccounts check 1234</programlisting>
1748
1747
1749
        <para>This will take some time, and use a fair bit of memory (about 16
1748
        <para>This will take some time, and use a fair bit of memory (about 16
1750
        bytes per file and directory). If the output looks plausible and
1749
        bytes per file and directory). If the output looks plausible and
1751
        reports errors which need fixing, run it again but with the fix
1750
        reports errors which need fixing, run it again but with the fix
1752
        flag:</para>
1751
        flag:</para>
1753
1752
1754
        <programlisting>/usr/local/bin/bbstoreaccounts check 1234 fix</programlisting>
1753
        <programlisting>/usr/sbin/bbstoreaccounts check 1234 fix</programlisting>
1755
1754
1756
        <para>This will fix any errors, and remove unrecoverable files.
1755
        <para>This will fix any errors, and remove unrecoverable files.
1757
        Directories will be recreated if necessary.</para>
1756
        Directories will be recreated if necessary.</para>
Lines 1841-1847 Link Here
1841
        configuration file locations to daemons and programs. For
1840
        configuration file locations to daemons and programs. For
1842
        example</para>
1841
        example</para>
1843
1842
1844
        <programlisting>/usr/local/bin/bbstored /some/other/dir/bbstored.config /usr/local/bin/bbackupquery -c /some/other/dir/bbackupd.config</programlisting>
1843
        <programlisting>/usr/sbin/bbstored /some/other/dir/bbstored.config /usr/sbin/bbackupquery -c /some/other/dir/bbackupd.config</programlisting>
1845
1844
1846
        <para>(daemons specify the name as the first argument, utility
1845
        <para>(daemons specify the name as the first argument, utility
1847
        programs with the -c option).</para>
1846
        programs with the -c option).</para>
Lines 1965-1971 Link Here
1965
      <para>Follow the installation instructions, but install the executable
1964
      <para>Follow the installation instructions, but install the executable
1966
      files manually to somewhere in your home directory. Then use
1965
      files manually to somewhere in your home directory. Then use
1967
      bbackupd-config to configure the daemon, but use a directory other than
1966
      bbackupd-config to configure the daemon, but use a directory other than
1968
      /etc/box, probably somewhere in your home directory.</para>
1967
      /etc/boxbackup, probably somewhere in your home directory.</para>
1969
1968
1970
      <para>All directories you specify to be backed up must be readable, and
1969
      <para>All directories you specify to be backed up must be readable, and
1971
      all files must be owned by the user and readable to that user.</para>
1970
      all files must be owned by the user and readable to that user.</para>
(-)../../../boxbackup-0.11rc2/./documentation/bbstored-config.xml (-1 / +1 lines)
Lines 98-104 Link Here
98
98
99
    <para><literal>bbstoreaccounts</literal> uses the Box Backup server
99
    <para><literal>bbstoreaccounts</literal> uses the Box Backup server
100
    configuration file, usually located in
100
    configuration file, usually located in
101
    <filename>/etc/box/bbstored.conf</filename>.</para>
101
    <filename>/etc/boxbackup/bbstored.conf</filename>.</para>
102
  </refsection>
102
  </refsection>
103
103
104
  <refsection>
104
  <refsection>
(-)../../../boxbackup-0.11rc2/./documentation/instguide.xml (-1 / +1 lines)
Lines 240-246 Link Here
240
      <para>This builds two parcels of binaries and scripts, 'backup-client'
240
      <para>This builds two parcels of binaries and scripts, 'backup-client'
241
      and 'backup-server'. The generated installation scripts assumes you want
241
      and 'backup-server'. The generated installation scripts assumes you want
242
      everything installed in <emphasis
242
      everything installed in <emphasis
243
      role="bold">/usr/local/bin</emphasis></para>
243
      role="bold">/usr/sbin</emphasis></para>
244
244
245
      <para>Optionally, type <emphasis role="bold">make test</emphasis> to run
245
      <para>Optionally, type <emphasis role="bold">make test</emphasis> to run
246
      all the tests.</para>
246
      all the tests.</para>
(-)../../../boxbackup-0.11rc2/./documentation/bbackupquery.xml (-1 / +1 lines)
Lines 336-342 Link Here
336
336
337
    <para><literal>bbackupquery</literal> uses the Box Backup client
337
    <para><literal>bbackupquery</literal> uses the Box Backup client
338
    configuration file, usually located in
338
    configuration file, usually located in
339
    <filename>/etc/box/bbackupd.conf</filename>. On Windows this file is
339
    <filename>/etc/boxbackup/bbackupd.conf</filename>. On Windows this file is
340
    usually located in the installation directory, and is named
340
    usually located in the installation directory, and is named
341
    <filename>bbackupd.conf</filename> as well.</para>
341
    <filename>bbackupd.conf</filename> as well.</para>
342
  </refsection>
342
  </refsection>
(-)../../../boxbackup-0.11rc2/./documentation/raidfile-config.xml (-1 / +1 lines)
Lines 39-45 Link Here
39
        <listitem>
39
        <listitem>
40
          <para><literal>configdir</literal>: The directory path where
40
          <para><literal>configdir</literal>: The directory path where
41
          configuration files are located. Usually this is
41
          configuration files are located. Usually this is
42
          <literal>/etc/box</literal>. <literal>raidfile.conf</literal> will
42
          <literal>/etc/boxbackup</literal>. <literal>raidfile.conf</literal> will
43
          be written in this directory.</para>
43
          be written in this directory.</para>
44
        </listitem>
44
        </listitem>
45
45
(-)../../../boxbackup-0.11rc2/./lib/raidfile/RaidFileController.h (-1 / +1 lines)
Lines 121-127 Link Here
121
	
121
	
122
public:
122
public:
123
	void Initialise(const std::string& rConfigFilename = 
123
	void Initialise(const std::string& rConfigFilename = 
124
		"/etc/box/raidfile.conf");
124
		"/etc/boxbackup/raidfile.conf");
125
	int GetNumDiscSets() {return mSetList.size();}
125
	int GetNumDiscSets() {return mSetList.size();}
126
126
127
	// --------------------------------------------------------------------------
127
	// --------------------------------------------------------------------------
(-)../../../boxbackup-0.11rc2/./lib/raidfile/raidfile-config (-1 / +1 lines)
Lines 58-64 Link Here
58
    raidfile-config config-dir block-size dir0 [dir1 dir2]
58
    raidfile-config config-dir block-size dir0 [dir1 dir2]
59
59
60
Parameters:
60
Parameters:
61
    config-dir        is usually /etc/box
61
    config-dir        is usually /etc/boxbackup
62
    block-size        must be a power of two, and usually the block or
62
    block-size        must be a power of two, and usually the block or
63
                      fragment size of your file system
63
                      fragment size of your file system
64
    dir0, dir1, dir2  are the directories used as the root of the raid
64
    dir0, dir1, dir2  are the directories used as the root of the raid
(-)../../../boxbackup-0.11rc2/./lib/common/BoxPortsAndFiles.h (-3 / +3 lines)
Lines 70-78 Link Here
70
	#define BOX_GET_DEFAULT_BBSTORED_CONFIG_FILE \
70
	#define BOX_GET_DEFAULT_BBSTORED_CONFIG_FILE \
71
		GetDefaultConfigFilePath("bbstored.conf").c_str()
71
		GetDefaultConfigFilePath("bbstored.conf").c_str()
72
#else
72
#else
73
#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "/etc/box/bbackupd.conf"
73
#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "/etc/boxbackup/bbackupd.conf"
74
#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "/etc/box/raidfile.conf"
74
#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "/etc/boxbackup/raidfile.conf"
75
#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "/etc/box/bbstored.conf"
75
#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "/etc/boxbackup/bbstored.conf"
76
#endif
76
#endif
77
77
78
#endif // BOXPORTSANDFILES__H
78
#endif // BOXPORTSANDFILES__H
(-)../../../boxbackup-0.11rc2/./notes/backup_encryption.txt (-1 / +1 lines)
Lines 33-39 Link Here
33
33
34
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.
34
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.
35
35
36
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.
36
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.
37
37
38
Code for review: BackupClientCryptoKeys_Setup()
38
Code for review: BackupClientCryptoKeys_Setup()
39
in lib/backupclient/BackupClientCryptoKeys.cpp
39
in lib/backupclient/BackupClientCryptoKeys.cpp
(-)../../../boxbackup-0.11rc2/./notes/lib_raidfile.txt (-1 / +1 lines)
Lines 11-17 Link Here
11
11
12
SUBTITLE Controller
12
SUBTITLE Controller
13
13
14
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.
14
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.
15
15
16
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.
16
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.
17
17
(-)../../../boxbackup-0.11rc2/./bin/bbackupd/bbackupd-config (-4 / +4 lines)
Lines 58-64 Link Here
58
        working-dir [backup directories]
58
        working-dir [backup directories]
59
59
60
Parameters:
60
Parameters:
61
    config-dir          is usually /etc/box
61
    config-dir          is usually /etc/boxbackup
62
    backup-mode         is lazy or snapshot:
62
    backup-mode         is lazy or snapshot:
63
        lazy mode       runs continously, uploading files over a specified age
63
        lazy mode       runs continously, uploading files over a specified age
64
        snapshot mode   uploads a snapshot of the filesystem when instructed
64
        snapshot mode   uploads a snapshot of the filesystem when instructed
Lines 96-102 Link Here
96
}
96
}
97
97
98
# default locations
98
# default locations
99
my $default_config_location = '/etc/box/bbackupd.conf';
99
my $default_config_location = '/etc/boxbackup/bbackupd.conf';
100
100
101
# command line parameters
101
# command line parameters
102
my ($config_dir,$backup_mode,$account_num,$server,$working_dir,@tobackup) = @ARGV;
102
my ($config_dir,$backup_mode,$account_num,$server,$working_dir,@tobackup) = @ARGV;
Lines 616-622 Link Here
616
   more files will be backed up. You want to know about this.
616
   more files will be backed up. You want to know about this.
617
617
618
6) Start the backup daemon with the command
618
6) Start the backup daemon with the command
619
      /usr/local/bin/bbackupd$daemon_args
619
      /usr/sbin/bbackupd$daemon_args
620
   in /etc/rc.local, or your local equivalent.
620
   in /etc/rc.local, or your local equivalent.
621
   Note that bbackupd must run as root.
621
   Note that bbackupd must run as root.
622
__E
622
__E
Lines 626-632 Link Here
626
626
627
7) Set up a cron job to run whenever you want a snapshot of the
627
7) Set up a cron job to run whenever you want a snapshot of the
628
   file system to be taken. Run the command
628
   file system to be taken. Run the command
629
      /usr/local/bin/bbackupctl -q$ctl_daemon_args sync
629
      /usr/sbin/bbackupctl -q$ctl_daemon_args sync
630
__E
630
__E
631
}
631
}
632
print <<__E;
632
print <<__E;
(-)../../../boxbackup-0.11rc2/./bin/bbstored/BackupConstants.h (-1 / +1 lines)
Lines 49-55 Link Here
49
#ifndef BACKUPCONSTANTS__H
49
#ifndef BACKUPCONSTANTS__H
50
#define BACKUPCONSTANTS__H
50
#define BACKUPCONSTANTS__H
51
51
52
#define BACKUP_STORE_DEFAULT_ACCOUNT_DATABASE_FILE	"/etc/box/backupstoreaccounts"
52
#define BACKUP_STORE_DEFAULT_ACCOUNT_DATABASE_FILE	"/etc/boxbackup/backupstoreaccounts"
53
53
54
// 15 minutes to timeout (milliseconds)
54
// 15 minutes to timeout (milliseconds)
55
#define	BACKUP_STORE_TIMEOUT			(15*60*1000)
55
#define	BACKUP_STORE_TIMEOUT			(15*60*1000)
(-)../../../boxbackup-0.11rc2/./bin/bbstored/bbstored-config (-3 / +3 lines)
Lines 58-64 Link Here
58
    bbstored-config config-dir server-hostname username [raidfile-config]
58
    bbstored-config config-dir server-hostname username [raidfile-config]
59
59
60
Parameters:
60
Parameters:
61
    config-dir       is usually /etc/box
61
    config-dir       is usually /etc/boxbackup
62
    server-hostname  is the hostname that clients will use to connect to
62
    server-hostname  is the hostname that clients will use to connect to
63
                     this server
63
                     this server
64
    username         is the user to run the server under
64
    username         is the user to run the server under
Lines 86-92 Link Here
86
}
86
}
87
87
88
# default locations
88
# default locations
89
my $default_config_location = '/etc/box/bbstored.conf';
89
my $default_config_location = '/etc/boxbackup/bbstored.conf';
90
90
91
# command line parameters
91
# command line parameters
92
my ($config_dir,$server,$username,$raidfile_config) = @ARGV;
92
my ($config_dir,$server,$username,$raidfile_config) = @ARGV;
Lines 273-279 Link Here
273
4) Create accounts with bbstoreaccounts
273
4) Create accounts with bbstoreaccounts
274
274
275
5) Start the backup store daemon with the command
275
5) Start the backup store daemon with the command
276
      /usr/local/bin/bbstored$daemon_args
276
      /usr/sbin/bbstored$daemon_args
277
   in /etc/rc.local, or your local equivalent.
277
   in /etc/rc.local, or your local equivalent.
278
278
279
===================================================================
279
===================================================================
(-)../../../boxbackup-0.11rc2/./infrastructure/makeparcels.pl.in (+1 lines)
Lines 161-166 Link Here
161
			{
161
			{
162
				$local_install_dir = "/usr/local/$dest";
162
				$local_install_dir = "/usr/local/$dest";
163
			}
163
			}
164
			print SCRIPT "mkdir -p \${DESTDIR}$install_into_dir/\n";
164
			print SCRIPT "install $name " .
165
			print SCRIPT "install $name " .
165
				"\$DESTDIR$local_install_dir\n";
166
				"\$DESTDIR$local_install_dir\n";
166
		}
167
		}

Return to bug 205558