Index: trunk/Nebulous-Server/Build.PL =================================================================== --- trunk/Nebulous-Server/Build.PL (revision 19495) +++ trunk/Nebulous-Server/Build.PL (revision 19623) @@ -37,5 +37,5 @@ }, script_files => [qw( - bin/neb-addvol + bin/neb-voladd bin/neb-admin bin/neb-fsck Index: trunk/Nebulous-Server/Changes =================================================================== --- trunk/Nebulous-Server/Changes (revision 19495) +++ trunk/Nebulous-Server/Changes (revision 19623) @@ -1,3 +1,6 @@ Revision history for Nebulous + +0.16 + - rename neb-addvol -> neb-voladd 0.15 Thu Sep 11 13:00:59 HST 2008 Index: trunk/Nebulous-Server/bin/neb-addvol =================================================================== --- trunk/Nebulous-Server/bin/neb-addvol (revision 19495) +++ (revision ) @@ -1,184 +1,0 @@ -#!/usr/bin/env perl - -# Copyright (C) 2005-2008 Joshua Hoblitt -# -# $Id: neb-addvol,v 1.10 2008-06-30 23:14:49 jhoblitt Exp $ - -use strict; -use warnings FATAL => qw( all ); - -use vars qw( $VERSION ); -$VERSION = '0.02'; - -use DBI; -use Nebulous::Server::SQL; -use URI::file; -use URI; - -use Getopt::Long qw( GetOptions :config auto_help auto_version ); -use Pod::Usage qw( pod2usage ); - -my ($db, $dbhost, $dbuser, $dbpass, $vname, $vhost, $uri); - -$db = $ENV{'NEB_DB'} unless $db; -$dbhost = $ENV{'NEB_DBHOST'} || 'localhost'; -$dbuser = $ENV{'NEB_USER'} unless $dbuser; -$dbpass = $ENV{'NEB_PASS'} unless $dbpass; - -GetOptions( - 'db|d=s' => \$db, - 'host=s' => \$dbhost, - 'user|u=s' => \$dbuser, - 'pass|p=s' => \$dbpass, - 'vname|n=s' => \$vname, - 'vhost=s' => \$vhost, - 'uri|u=s' => \$uri, -) || pod2usage( 2 ); - -pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV; -pod2usage( -msg => "Required options: --db --user --pass --vname --vhost --uri", -exitval => 2 ) - unless $db && $dbuser && $dbpass && $vname && $vhost && $uri; - -my $dbh = DBI->connect( - "DBI:mysql:database=$db:host=$dbhost", - $dbuser, - $dbpass, - { - RaiseError => 1, - PrintError => 0, - AutoCommit => 1, - }, -); - -my $sql = Nebulous::Server::SQL->new(); - -print "Checking URI..."; - -my $path = URI->new($uri)->path; -unless (-d $path) { - die "path: $path dirived from URI: $uri does not exist"; -} - -print " OK\n"; - -print "Adding volume..."; - -my $query = $dbh->prepare( $sql->new_volume ); -$query->execute( $vname, $vhost, $path ); - -print " OK\n"; - -__END__ - -=pod - -=head1 NAME - -neb-addvol - add a storage volume to a Nebulous server - -=head1 SYNOPSIS - - neb-addvol --volume --uri - [--db ] [--user ] [--pass ] - -=head1 DESCRIPTION - -This program initialize a database for use by L by creating -the appropriate set of tables. Any pre-existing tables with conflicting names -are first removed. - -=head1 OPTIONS - -=over 4 - -=item * --volume - -Symbolic name of volume being added. - -=item * --uri|-u - -URI to the volume being added. - -=item * --db|-d - -Name of database (C) to create tables in. - -Optional if the appropriate environment variable is set. - -=item * --user|-u - -Username to authenticate with. - -Optional if the appropriate environment variable is set. - -=item * --pass|-p - -Password to authenticate with. - -Optional if the appropriate environment variable is set. - -=back - -=head1 ENVIRONMENT - -These environment variables may be used in place of the specified command line -options. All command line option will override the corresponding environment -value. - -=over 4 - -=item * C - -Equivalent to --db|-d - -=item * C - -Equivalent to --host - -=item * C - -Equivalent to --user|-u - -=item * C - -Equivalent to --pass|-p - -=back - -=head1 CREDITS - -Just me, myself, and I. - -=head1 SUPPORT - -Please contact the author directly via e-mail. - -=head1 AUTHOR - -Joshua Hoblitt - -=head1 COPYRIGHT - -Copyright (C) 2005-2008 Joshua Hoblitt. All rights reserved. - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; either version 2 of the License, or (at your option) any later -version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place - Suite 330, Boston, MA 02111-1307, USA. - -The full text of the license can be found in the L Pod as supplied -with Perl 5.8.1 and later. - -=head1 SEE ALSO - -L, L, L, L - -=cut Index: trunk/Nebulous-Server/bin/neb-voladd =================================================================== --- trunk/Nebulous-Server/bin/neb-voladd (revision 19623) +++ trunk/Nebulous-Server/bin/neb-voladd (revision 19623) @@ -0,0 +1,184 @@ +#!/usr/bin/env perl + +# Copyright (C) 2005-2008 Joshua Hoblitt +# +# $Id: neb-voladd,v 1.1 2008-09-20 02:42:24 jhoblitt Exp $ + +use strict; +use warnings FATAL => qw( all ); + +use vars qw( $VERSION ); +$VERSION = '0.02'; + +use DBI; +use Nebulous::Server::SQL; +use URI::file; +use URI; + +use Getopt::Long qw( GetOptions :config auto_help auto_version ); +use Pod::Usage qw( pod2usage ); + +my ($db, $dbhost, $dbuser, $dbpass, $vname, $vhost, $uri); + +$db = $ENV{'NEB_DB'} unless $db; +$dbhost = $ENV{'NEB_DBHOST'} || 'localhost'; +$dbuser = $ENV{'NEB_USER'} unless $dbuser; +$dbpass = $ENV{'NEB_PASS'} unless $dbpass; + +GetOptions( + 'db|d=s' => \$db, + 'host=s' => \$dbhost, + 'user|u=s' => \$dbuser, + 'pass|p=s' => \$dbpass, + 'vname|n=s' => \$vname, + 'vhost=s' => \$vhost, + 'uri|u=s' => \$uri, +) || pod2usage( 2 ); + +pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV; +pod2usage( -msg => "Required options: --db --user --pass --vname --vhost --uri", -exitval => 2 ) + unless $db && $dbuser && $dbpass && $vname && $vhost && $uri; + +my $dbh = DBI->connect( + "DBI:mysql:database=$db:host=$dbhost", + $dbuser, + $dbpass, + { + RaiseError => 1, + PrintError => 0, + AutoCommit => 1, + }, +); + +my $sql = Nebulous::Server::SQL->new(); + +print "Checking URI..."; + +my $path = URI->new($uri)->path; +unless (-d $path) { + die "path: $path dirived from URI: $uri does not exist"; +} + +print " OK\n"; + +print "Adding volume..."; + +my $query = $dbh->prepare( $sql->new_volume ); +$query->execute( $vname, $vhost, $path ); + +print " OK\n"; + +__END__ + +=pod + +=head1 NAME + +neb-voladd - add a storage volume to a Nebulous server + +=head1 SYNOPSIS + + neb-voladd --volume --uri + [--db ] [--user ] [--pass ] + +=head1 DESCRIPTION + +This program initialize a database for use by L by creating +the appropriate set of tables. Any pre-existing tables with conflicting names +are first removed. + +=head1 OPTIONS + +=over 4 + +=item * --volume + +Symbolic name of volume being added. + +=item * --uri|-u + +URI to the volume being added. + +=item * --db|-d + +Name of database (C) to create tables in. + +Optional if the appropriate environment variable is set. + +=item * --user|-u + +Username to authenticate with. + +Optional if the appropriate environment variable is set. + +=item * --pass|-p + +Password to authenticate with. + +Optional if the appropriate environment variable is set. + +=back + +=head1 ENVIRONMENT + +These environment variables may be used in place of the specified command line +options. All command line option will override the corresponding environment +value. + +=over 4 + +=item * C + +Equivalent to --db|-d + +=item * C + +Equivalent to --host + +=item * C + +Equivalent to --user|-u + +=item * C + +Equivalent to --pass|-p + +=back + +=head1 CREDITS + +Just me, myself, and I. + +=head1 SUPPORT + +Please contact the author directly via e-mail. + +=head1 AUTHOR + +Joshua Hoblitt + +=head1 COPYRIGHT + +Copyright (C) 2005-2008 Joshua Hoblitt. All rights reserved. + +This program is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free Software +Foundation; either version 2 of the License, or (at your option) any later +version. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with +this program; if not, write to the Free Software Foundation, Inc., 59 Temple +Place - Suite 330, Boston, MA 02111-1307, USA. + +The full text of the license can be found in the L Pod as supplied +with Perl 5.8.1 and later. + +=head1 SEE ALSO + +L, L, L, L + +=cut