[Box Backup-dev] bin vs sbin
James O'Gorman
boxbackup-dev at fluffy.co.uk
Tue Feb 26 22:29:51 GMT 2008
--9sSKoi6Rw660DLir
Content-Type: multipart/mixed; boundary="bO4vSxwwZtUjUWHo"
Content-Disposition: inline
--bO4vSxwwZtUjUWHo
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Just as a follow up to:
On Wed, Jan 30, 2008 at 10:34:13PM +0000, James O'Gorman wrote:
> I'm just going over the manpages as I've noticed some of the sections
> seem to be incorrect, and just thought - currently we put everything in
> $prefix/bin.
>=20
> Should we move the "system" commands to $prefix/sbin? By this I mean:
>=20
> * bbackupd
> * bbackupctl
> * bbackupd-config
> * bbstored
> * bbstoreaccounts
> * bbstored-certs
> * bbstored-config
Does anyone have an objection to the attacted patch? If not I'll commit
it tomorrow.
James
--bO4vSxwwZtUjUWHo
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="sbin.patch"
Content-Transfer-Encoding: quoted-printable
Index: configure.ac
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- configure.ac (revision 2093)
+++ configure.ac (working copy)
@@ -279,10 +279,10 @@
saved_exec_prefix=3D$exec_prefix
test "x$prefix" =3D xNONE && prefix=3D$ac_default_prefix
test "x$exec_prefix" =3D xNONE && exec_prefix=3D'${prefix}'
-bindir_expanded=3D` eval "echo $bindir"`
-bindir_expanded=3D` eval "echo $bindir_expanded"`
-sysconfdir_expanded=3D` eval "echo $sysconfdir"`
-localstatedir_expanded=3D`eval "echo $localstatedir"`
+eval bindir_expanded=3D` eval "echo $bindir"`
+eval sbindir_expanded=3D` eval "echo $sbindir"`
+eval sysconfdir_expanded=3D` eval "echo $sysconfdir"`
+eval localstatedir_expanded=3D`eval "echo $localstatedir"`
prefix=3D$saved_prefix
exec_prefix=3D$saved_exec_prefix
AC_SUBST([bindir_expanded sysconfdir_expanded localstatedir_expanded])
Index: parcels.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- parcels.txt (revision 2093)
+++ parcels.txt (working copy)
@@ -4,10 +4,10 @@
# a particular task
=20
backup-client
- bin bbackupd
+ bin bbackupd sbin
bin bbackupquery
bin bbackupctl
- script bin/bbackupd/bbackupd-config
+ script bin/bbackupd/bbackupd-config sbin
script LICENSE.txt
=20
ONLY:mingw32,mingw32msvc
@@ -28,11 +28,11 @@
END-ONLY
=20
backup-server
- bin bbstored
- bin bbstoreaccounts
- script bin/bbstored/bbstored-certs
- script bin/bbstored/bbstored-config
- script lib/raidfile/raidfile-config
+ bin bbstored sbin
+ bin bbstoreaccounts sbin
+ script bin/bbstored/bbstored-certs sbin
+ script bin/bbstored/bbstored-config sbin
+ script lib/raidfile/raidfile-config sbin
=20
ONLY:SunOS
script contrib/solaris/bbstored-manifest.xml lib/svc/manifest
Index: bin/bbstored/bbstored-config.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- bin/bbstored/bbstored-config.in (revision 2093)
+++ bin/bbstored/bbstored-config.in (working copy)
@@ -234,7 +234,7 @@
4) Create accounts with bbstoreaccounts
=20
5) Start the backup store daemon with the command
- @bindir_expanded@/bbstored$daemon_args
+ @sbindir_expanded@/bbstored$daemon_args
in /etc/rc.local, or your local equivalent.
=20
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
Index: bin/bbackupd/bbackupd-config.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- bin/bbackupd/bbackupd-config.in (revision 2093)
+++ bin/bbackupd/bbackupd-config.in (working copy)
@@ -577,7 +577,7 @@
more files will be backed up. You want to know about this.
=20
6) Start the backup daemon with the command
- @bindir_expanded@/bbackupd$daemon_args
+ @sbindir_expanded@/bbackupd$daemon_args
in /etc/rc.local, or your local equivalent.
Note that bbackupd must run as root.
__E
Index: documentation/adminguide.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- documentation/adminguide.xml (revision 2093)
+++ documentation/adminguide.xml (working copy)
@@ -111,7 +111,7 @@
<literal>ListenAddresses</literal> directive in the
<filename>/etc/box/bbstored.conf</filename> file.</para>
=20
- <programlisting>/usr/local/bin/bbstored-config /etc/box hostname _=
bbstored</programlisting>
+ <programlisting>/usr/local/sbin/bbstored-config /etc/box hostname =
_bbstored</programlisting>
=20
<para>This last step outputs 5 instructions that you must execute =
to
the letter. A lot of questions are raised on the mailing list beca=
use
@@ -164,7 +164,7 @@
=20
<para>To setup the basic key structure, do the following:</para>
=20
- <programlisting>/usr/local/bin/bbstored-certs ca init</programli=
sting>
+ <programlisting>/usr/local/sbin/bbstored-certs ca init</programl=
isting>
=20
<para>(See <ulink url=3D"instguide.xml">OpenSSL notes</ulink> if=
you
get an OpenSSL error)</para>
@@ -181,7 +181,7 @@
request (CSR) for you. Transfer it to the machine with your CA, =
then
do:</para>
=20
- <programlisting>/usr/local/bin/bbstored-certs ca sign-server hos=
tname-csr.pem</programlisting>
+ <programlisting>/usr/local/sbin/bbstored-certs ca sign-server ho=
stname-csr.pem</programlisting>
=20
<para>This signs the certificate for the server. Follow the
instructions in the output on which files to install on the serv=
er.
@@ -199,7 +199,7 @@
0, for example, 1 or 75AB23C. Then on the backup store server,
create the account with:</para>
=20
- <programlisting>/usr/local/bin/bbstoreaccounts create 75AB23C 0 =
4096M 4505M</programlisting>
+ <programlisting>/usr/local/sbin/bbstoreaccounts create 75AB23C 0=
4096M 4505M</programlisting>
=20
<para>This looks complicated. The numbers are, in order:</para>
=20
@@ -261,7 +261,7 @@
=20
<para>Sign this CSR with this command:</para>
=20
- <programlisting>/usr/local/bin/bbstored-certs ca sign 75AB23C-cs=
r.pem</programlisting>
+ <programlisting>/usr/local/sbin/bbstored-certs ca sign 75AB23C-c=
sr.pem</programlisting>
=20
<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
@@ -345,7 +345,7 @@
the configuration files and generate a private key and certifica=
te
request.</para>
=20
- <programlisting>/usr/local/bin/bbackupd-config /etc/box lazy <em=
phasis
+ <programlisting>/usr/local/sbin/bbackupd-config /etc/box lazy <e=
mphasis
role=3D"bold">999 hostname</emphasis> /var/bbackupd <emphasis
role=3D"bold">/home</emphasis></programlisting>
=20
@@ -407,7 +407,7 @@
basic bbackupd configuration.</para>
=20
<para>You can then run the daemon (as root) by running
- <command>/usr/local/bin/bbackupd</command>, and of course, addin=
g it
+ <command>/usr/local/sbin/bbackupd</command>, and of course, addi=
ng 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
@@ -517,7 +517,7 @@
here -- they may be different for your system.</para>
</important>
=20
- <programlisting>/usr/local/bin/bbackupd-config /etc/box lazy 51 =
server.example.com /var/bbackupd /home /etc/samba
+ <programlisting>/usr/local/sbin/bbackupd-config /etc/box lazy 51=
server.example.com /var/bbackupd /home /etc/samba
=20
Setup bbackupd config utility.
=20
@@ -579,7 +579,7 @@
more files will be backed up. You want to know about this.
=20
6) Start the backup daemon with the command
- /usr/local/bin/bbackupd
+ /usr/local/sbin/bbackupd
in /etc/rc.local, or your local equivalent.
Note that bbackupd must run as root.
=20
@@ -1388,11 +1388,11 @@
the limits. To display the space used on the server for an accou=
nt,
use:</para>
=20
- <programlisting>/usr/local/bin/bbstoreaccounts info 75AB23C</pro=
gramlisting>
+ <programlisting>/usr/local/sbin/bbstoreaccounts info 75AB23C</pr=
ogramlisting>
=20
<para>To adjust the soft and hard limits on an account, use:</pa=
ra>
=20
- <programlisting>/usr/local/bin/bbstoreaccounts setlimit 75AB23C =
new-soft-limit new-hard-limit</programlisting>
+ <programlisting>/usr/local/sbin/bbstoreaccounts setlimit 75AB23C=
new-soft-limit new-hard-limit</programlisting>
=20
<para>You do not need to restart the server.</para>
</section>
@@ -1744,14 +1744,14 @@
<para>First, run the check utility, and see what errors it
reports.</para>
=20
- <programlisting>/usr/local/bin/bbstoreaccounts check 1234</program=
listing>
+ <programlisting>/usr/local/sbin/bbstoreaccounts check 1234</progra=
mlisting>
=20
<para>This will take some time, and use a fair bit of memory (abou=
t 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>
=20
- <programlisting>/usr/local/bin/bbstoreaccounts check 1234 fix</pro=
gramlisting>
+ <programlisting>/usr/local/sbin/bbstoreaccounts check 1234 fix</pr=
ogramlisting>
=20
<para>This will fix any errors, and remove unrecoverable files.
Directories will be recreated if necessary.</para>
@@ -1841,7 +1841,7 @@
configuration file locations to daemons and programs. For
example</para>
=20
- <programlisting>/usr/local/bin/bbstored /some/other/dir/bbstored.c=
onfig /usr/local/bin/bbackupquery -c /some/other/dir/bbackupd.config</progr=
amlisting>
+ <programlisting>/usr/local/sbin/bbstored /some/other/dir/bbstored.=
config /usr/local/bin/bbackupquery -c /some/other/dir/bbackupd.config</prog=
ramlisting>
=20
<para>(daemons specify the name as the first argument, utility
programs with the -c option).</para>
--bO4vSxwwZtUjUWHo--
--9sSKoi6Rw660DLir
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)
iQEVAwUBR8SS3v8Z3wLA10m9AQKQXAf9Hlq+o8xMQniYWWTvzeRTs5lgfZJJkMC0
sE9vmoD3SfV77ghDNBEOU9lHQrMMFCU1fAG+7mg9k/0wW1/FvKXdUrsgOxVSQ8o2
OSwnCvvPlQiNs74J3sqhOSv0pjfjleo4V7U6v/CautuqqspbxPXSkeK8aUy0TgIJ
d1Bm61lLrX7Y0QcdfSotHEZuGDkNS4BL5Xl8bGhcQC6dvmeGWo/IMPTIorGJyww4
EayJhT6ZELVBDW1yato+YFhrmRXLLn0TYjdDPqzoemxb7JuwcuYuk8x/HZBIcFKa
84t/If6Vhwj9hCpVi3cA2TI1v7D4RhMs0yKHiEJkbXIk2yhZyJPN4Q==
=heqI
-----END PGP SIGNATURE-----
--9sSKoi6Rw660DLir--
More information about the Boxbackup-dev
mailing list