Changeset 2094


Ignore:
Timestamp:
27/02/2008 18:50:44 (4 years ago)
Author:
jamesog
Message:
  • Move all commands from bin to sbin on Unix platforms
  • Update all associated docs and contributed distribution files
Location:
box/trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • box/trunk/bin/bbackupd/bbackupd-config.in

    r2091 r2094  
    578578 
    5795796) Start the backup daemon with the command 
    580       @bindir_expanded@/bbackupd$daemon_args 
     580      @sbindir_expanded@/bbackupd$daemon_args 
    581581   in /etc/rc.local, or your local equivalent. 
    582582   Note that bbackupd must run as root. 

  • box/trunk/bin/bbstored/bbstored-config.in

    r2063 r2094  
    235235 
    2362365) Start the backup store daemon with the command 
    237       @bindir_expanded@/bbstored$daemon_args 
     237      @sbindir_expanded@/bbstored$daemon_args 
    238238   in /etc/rc.local, or your local equivalent. 
    239239 

  • box/trunk/configure.ac

    r2080 r2094  
    280280test "x$prefix" = xNONE && prefix=$ac_default_prefix 
    281281test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' 
    282 bindir_expanded=`       eval "echo $bindir"` 
    283 bindir_expanded=`       eval "echo $bindir_expanded"` 
    284 sysconfdir_expanded=`   eval "echo $sysconfdir"` 
    285 localstatedir_expanded=`eval "echo $localstatedir"` 
     282eval bindir_expanded=`       eval "echo $bindir"` 
     283eval sbindir_expanded=`      eval "echo $sbindir"` 
     284eval sysconfdir_expanded=`   eval "echo $sysconfdir"` 
     285eval localstatedir_expanded=`eval "echo $localstatedir"` 
    286286prefix=$saved_prefix 
    287287exec_prefix=$saved_exec_prefix 

  • box/trunk/contrib/debian/bbackupd.in

    r2066 r2094  
    33# Start and stop the Box Backup client daemon. 
    44 
    5 BBACKUPD=@bindir_expanded@/bbackupd 
     5BBACKUPD=@sbindir_expanded@/bbackupd 
    66CONFIG=@sysconfdir_expanded@/box/bbackupd.conf 
    77PIDFILE=@localstatedir_expanded@/bbackupd.pid 

  • box/trunk/contrib/debian/bbstored.in

    r2066 r2094  
    33# Start and stop the Box Backup server daemon. 
    44 
    5 BBSTORED=@bindir_expanded@/bbstored 
     5BBSTORED=@sbindir_expanded@/bbstored 
    66CONFIG=@sysconfdir_expanded@/box/bbstored.conf 
    77PIDFILE=@localstatedir_expanded@/bbstored.pid 

  • box/trunk/contrib/redhat/bbackupd.in

    r2066 r2094  
    2424start() { 
    2525        echo -n $"Starting $prog: " 
    26         daemon $prog 
     26        daemon @sbindir_expanded@/$prog 
    2727        RETVAL=$? 
    2828        echo 
    … …  
    3333stop() { 
    3434        echo -n $"Stopping $prog: " 
    35         killproc $prog 
     35        killproc @sbindir_expanded@/$prog 
    3636        RETVAL=$? 
    3737        echo 
    … …  
    4141 
    4242rhstatus() { 
    43         status $prog 
     43        status @sbindir_expanded@/$prog 
    4444} 
    4545 
    … …  
    5151reload() { 
    5252        echo -n $"Reloading $prog configuration: " 
    53         killproc $prog -HUP 
     53        killproc @sbindir_expanded@/$prog -HUP 
    5454        retval=$? 
    5555        echo 

  • box/trunk/contrib/redhat/bbstored.in

    r2066 r2094  
    2424start() { 
    2525        echo -n $"Starting $prog: " 
    26         daemon $prog 
     26        daemon @sbindir_expanded@/$prog 
    2727        RETVAL=$? 
    2828        echo 
    … …  
    3333stop() { 
    3434        echo -n $"Stopping $prog: " 
    35         killproc $prog 
     35        killproc @sbindir_expanded@/$prog 
    3636        RETVAL=$? 
    3737        echo 
    … …  
    4141 
    4242rhstatus() { 
    43         status $prog 
     43        status @sbindir_expanded@/$prog 
    4444} 
    4545 
    … …  
    5151reload() { 
    5252        echo -n $"Reloading $prog configuration: " 
    53         killproc $prog -HUP 
     53        killproc @sbindir_expanded@/$prog -HUP 
    5454        retval=$? 
    5555        echo 

  • box/trunk/contrib/rpm/boxbackup.spec

    r2065 r2094  
    4040License: BSD 
    4141Group: Applications/Archiving 
    42 Packager: Martin Ebourne <boxbackup-dev@fluffy.co.uk> 
    43 URL: http://www.fluffy.co.uk/boxbackup/ 
     42Packager: Martin Ebourne <boxbackup-dev@boxbackup.org> 
     43URL: http://www.boxbackup.org/ 
    4444Source0: %{ident}.tgz 
    4545Requires: openssl >= 0.9.7a 
    … …  
    144144install %{server_dir}/bbstored $RPM_BUILD_ROOT%{_sbindir} 
    145145install %{server_dir}/bbstoreaccounts $RPM_BUILD_ROOT%{_sbindir} 
    146 install %{server_dir}/bbstored-certs $RPM_BUILD_ROOT%{_bindir} 
     146install %{server_dir}/bbstored-certs $RPM_BUILD_ROOT%{_sbindir} 
    147147install %{server_dir}/bbstored-config $RPM_BUILD_ROOT%{_sbindir} 
    148148install %{server_dir}/raidfile-config $RPM_BUILD_ROOT%{_sbindir} 

  • box/trunk/contrib/solaris/bbackupd-smf-method.in

    r2066 r2094  
    66        # SMF arguments (start and restart [really "refresh"]) 
    77'start') 
    8         @bindir_expanded@/bbackupd 
     8        @sbindir_expanded@/bbackupd 
    99        ;; 
    1010 

  • box/trunk/contrib/solaris/bbstored-smf-method.in

    r2066 r2094  
    55        # SMF arguments (start and restart [really "refresh"]) 
    66'start') 
    7         @bindir_expanded@/bbstored 
     7        @sbindir_expanded@/bbstored 
    88        ;; 
    99 

  • box/trunk/contrib/suse/bbackupd.in

    r2066 r2094  
    2929 
    3030# Check for missing binaries (stale symlinks should not happen) 
    31 BBACKUPD_BIN=@bindir_expanded@/bbackupd 
     31BBACKUPD_BIN=@sbindir_expanded@/bbackupd 
    3232if [ ! -x $BBACKUPD_BIN ] ; then 
    3333        echo "$BBACKUPD_BIN not installed" 

  • box/trunk/contrib/suse/bbstored.in

    r2066 r2094  
    3030 
    3131# Check for missing binaries (stale symlinks should not happen) 
    32 BBSTORED_BIN=@bindir_expanded@/bbstored 
     32BBSTORED_BIN=@sbindir_expanded@/bbstored 
    3333if [ ! -x $BBSTORED_BIN ] ; then 
    3434        echo "$BBSTORED_BIN not installed" 

  • box/trunk/documentation/adminguide.xml

    r1871 r2094  
    9797chown _bbstored /tmp/boxbackupRepository/             # Change the owner to the new boxbackup daemon user 
    9898 
    99 /usr/local/bin/raidfile-config /etc/box/  1024 /tmp/boxbackupRepository 
     99/usr/local/sbin/raidfile-config /etc/box/  1024 /tmp/boxbackupRepository 
    100100 
    101101#substitute 1024 with the desired blocksize 
    102102#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> 
     103#/usr/local/sbin/raidfile-config --help shows you the options</programlisting> 
    104104 
    105105        <para>Then create the configuration file /etc/box/bbstored.conf The 
    … …  
    112112        <filename>/etc/box/bbstored.conf</filename> file.</para> 
    113113 
    114         <programlisting>/usr/local/bin/bbstored-config /etc/box hostname _bbstored</programlisting> 
     114        <programlisting>/usr/local/sbin/bbstored-config /etc/box hostname _bbstored</programlisting> 
    115115 
    116116        <para>This last step outputs 5 instructions that you must execute to 
    … …  
    165165          <para>To setup the basic key structure, do the following:</para> 
    166166 
    167           <programlisting>/usr/local/bin/bbstored-certs ca init</programlisting> 
     167          <programlisting>/usr/local/sbin/bbstored-certs ca init</programlisting> 
    168168 
    169169          <para>(See <ulink url="instguide.xml">OpenSSL notes</ulink> if you 
    … …  
    182182          do:</para> 
    183183 
    184           <programlisting>/usr/local/bin/bbstored-certs ca sign-server hostname-csr.pem</programlisting> 
     184          <programlisting>/usr/local/sbin/bbstored-certs ca sign-server hostname-csr.pem</programlisting> 
    185185 
    186186          <para>This signs the certificate for the server. Follow the 
    … …  
    200200          create the account with:</para> 
    201201 
    202           <programlisting>/usr/local/bin/bbstoreaccounts create 75AB23C 0 4096M 4505M</programlisting> 
     202          <programlisting>/usr/local/sbin/bbstoreaccounts create 75AB23C 0 4096M 4505M</programlisting> 
    203203 
    204204          <para>This looks complicated. The numbers are, in order:</para> 
    … …  
    262262          <para>Sign this CSR with this command:</para> 
    263263 
    264           <programlisting>/usr/local/bin/bbstored-certs ca sign 75AB23C-csr.pem</programlisting> 
     264          <programlisting>/usr/local/sbin/bbstored-certs ca sign 75AB23C-csr.pem</programlisting> 
    265265 
    266266          <para>Don't forget to check that the embedded account number is 
    … …  
    346346          request.</para> 
    347347 
    348           <programlisting>/usr/local/bin/bbackupd-config /etc/box lazy <emphasis 
     348          <programlisting>/usr/local/sbin/bbackupd-config /etc/box lazy <emphasis 
    349349              role="bold">999 hostname</emphasis> /var/bbackupd <emphasis 
    350350              role="bold">/home</emphasis></programlisting> 
    … …  
    408408 
    409409          <para>You can then run the daemon (as root) by running 
    410           <command>/usr/local/bin/bbackupd</command>, and of course, adding it 
     410          <command>/usr/local/sbin/bbackupd</command>, and of course, adding it 
    411411          to your system's startup scripts. The first time it's run it will 
    412412          upload everything. Interrupting it and restarting it will only 
    … …  
    518518          </important> 
    519519 
    520           <programlisting>/usr/local/bin/bbackupd-config /etc/box lazy 51 server.example.com /var/bbackupd /home /etc/samba 
     520          <programlisting>/usr/local/sbin/bbackupd-config /etc/box lazy 51 server.example.com /var/bbackupd /home /etc/samba 
    521521 
    522522Setup bbackupd config utility. 
    … …  
    580580 
    5815816) Start the backup daemon with the command 
    582       /usr/local/bin/bbackupd 
     582      /usr/local/sbin/bbackupd 
    583583   in /etc/rc.local, or your local equivalent. 
    584584   Note that bbackupd must run as root. 
    … …  
    13051305        <para>The command line syntax is:</para> 
    13061306 
    1307         <programlisting>/usr/local/bin/bbackupctl [-q] [-c config-file] command</programlisting> 
     1307        <programlisting>/usr/local/sbin/bbackupctl [-q] [-c config-file] command</programlisting> 
    13081308 
    13091309        <para>The -q option reduces the amount of output the program emits, 
    … …  
    13591359        mode, and then run the following command as a cron job.</para> 
    13601360 
    1361         <programlisting>/usr/local/bin/bbackupctl -q sync</programlisting> 
     1361        <programlisting>/usr/local/sbin/bbackupctl -q sync</programlisting> 
    13621362 
    13631363        <para>This will cause the backup daemon to upload all changed files 
    … …  
    13771377          or type:</para> 
    13781378 
    1379           <programlisting>/usr/local/bin/bbackupquery -q usage quit</programlisting> 
     1379          <programlisting>/usr/local/sbin/bbackupquery -q usage quit</programlisting> 
    13801380 
    13811381          <para>to show the space used as a single command.</para> 
    … …  
    13891389          use:</para> 
    13901390 
    1391           <programlisting>/usr/local/bin/bbstoreaccounts info 75AB23C</programlisting> 
     1391          <programlisting>/usr/local/sbin/bbstoreaccounts info 75AB23C</programlisting> 
    13921392 
    13931393          <para>To adjust the soft and hard limits on an account, use:</para> 
    13941394 
    1395           <programlisting>/usr/local/bin/bbstoreaccounts setlimit 75AB23C new-soft-limit new-hard-limit</programlisting> 
     1395          <programlisting>/usr/local/sbin/bbstoreaccounts setlimit 75AB23C new-soft-limit new-hard-limit</programlisting> 
    13961396 
    13971397          <para>You do not need to restart the server.</para> 
    … …  
    15391539          follows:</para> 
    15401540 
    1541           <programlisting>/usr/local/bin/bbackupquery "compare -a" quit</programlisting> 
     1541          <programlisting>/usr/local/sbin/bbackupquery "compare -a" quit</programlisting> 
    15421542 
    15431543          <para>This command will report all the differences found between the 
    … …  
    15621562          file checksums and compares against that, then run:</para> 
    15631563 
    1564           <programlisting>/usr/local/bin/bbackupquery "compare -aq" quit</programlisting> 
     1564          <programlisting>/usr/local/sbin/bbackupquery "compare -aq" quit</programlisting> 
    15651565 
    15661566          <para>However, this does not check that the file attributes are 
    … …  
    15961596          <para>Type:</para> 
    15971597 
    1598           <programlisting>/usr/local/bin/bbackupquery</programlisting> 
     1598          <programlisting>/usr/local/sbin/bbackupquery</programlisting> 
    15991599 
    16001600          <para>to run it in interactive mode.</para> 
    … …  
    16291629          similar manner to a command line sftp client.</para> 
    16301630 
    1631           <programlisting>/usr/local/bin/bbackupquery</programlisting> 
     1631          <programlisting>/usr/local/sbin/bbackupquery</programlisting> 
    16321632 
    16331633          <para>Then navigate to the directory containing the file you want, 
    … …  
    17451745        reports.</para> 
    17461746 
    1747         <programlisting>/usr/local/bin/bbstoreaccounts check 1234</programlisting> 
     1747        <programlisting>/usr/local/sbin/bbstoreaccounts check 1234</programlisting> 
    17481748 
    17491749        <para>This will take some time, and use a fair bit of memory (about 16 
    … …  
    17521752        flag:</para> 
    17531753 
    1754         <programlisting>/usr/local/bin/bbstoreaccounts check 1234 fix</programlisting> 
     1754        <programlisting>/usr/local/sbin/bbstoreaccounts check 1234 fix</programlisting> 
    17551755 
    17561756        <para>This will fix any errors, and remove unrecoverable files. 
    … …  
    18421842        example</para> 
    18431843 
    1844         <programlisting>/usr/local/bin/bbstored /some/other/dir/bbstored.config /usr/local/bin/bbackupquery -c /some/other/dir/bbackupd.config</programlisting> 
     1844        <programlisting>/usr/local/sbin/bbstored /some/other/dir/bbstored.config /usr/local/sbin/bbackupquery -c /some/other/dir/bbackupd.config</programlisting> 
    18451845 
    18461846        <para>(daemons specify the name as the first argument, utility 

  • box/trunk/infrastructure/BoxPlatform.pm.in

    r1906 r2094  
    7777 
    7878        # where to put the files 
    79         $install_into_dir = '@bindir_expanded@'; 
     79        $install_into_dir = '@sbindir_expanded@'; 
    8080 
    8181        # if it's Darwin, 
Note: See TracChangeset for help on using the changeset viewer.