X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-setup;h=a6908e17226a6db7a9562dab6b06fee92a4fe842;hp=12d9a949c704d4da20cdc1d4c6f3e12c9b21248d;hb=ac8410cdb67639afeb84c84e975fffadf3e6cce1;hpb=c8de2cc983d3f014deefb06f1c0b982bc0852247

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 12d9a949c..a6908e172 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -1,14 +1,15 @@
-#!/usr/bin/perl -Tw
+#!/usr/bin/perl -w
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Schema::setup_hack = 1; }
 
 #to allow initial insert
+use FS::part_pkg;
 $FS::part_pkg::setup_hack = 1;
 $FS::part_pkg::setup_hack = 1;
 
 use strict;
-use vars qw($opt_u $opt_d $opt_v);
+use vars qw($opt_u $opt_d $opt_v $opt_q);
 use Getopt::Std;
 use FS::UID qw(adminsuidsetup datasrc checkeuid getsecrets);
 use FS::CurrentUser;
@@ -23,66 +24,27 @@ die "Not running uid freeside!" unless checkeuid();
 #my %attrib2db =
 #  map { lc($FS::raddb::attrib{$_}) => $_ } keys %FS::raddb::attrib;
 
-getopts("u:vd:");
+getopts("u:vqd:");
+$opt_v = 1 unless $opt_q; #verbose by default now
+
 my $config_dir = shift || '%%%DIST_CONF%%%' ;
 $config_dir =~ /^([\w.:=\/]+)$/
   or die "unacceptable configuration directory name";
 $config_dir = $1;
 
-getsecrets($opt_u);
+getsecrets();
 
 #needs to match FS::Record
 my($dbdef_file) = "%%%FREESIDE_CONF%%%/dbdef.". datasrc;
 
-###
-
 my $username_len = 32;
 
-#print "\n\n", <<END, ":";
-#Freeside tracks the RADIUS User-Name, check attribute Password and
-#reply attribute Framed-IP-Address for each user.  You can specify additional
-#check and reply attributes (or you can add them later with the
-#fs-radius-add-check and fs-radius-add-reply programs).
-#
-#First enter any additional RADIUS check attributes you need to track for each 
-#user, separated by whitespace.
-#END
-#my @check_attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
-#                         split(" ",&getvalue);
-#
-#print "\n\n", <<END, ":";
-#Now enter any additional reply attributes you need to track for each user,
-#separated by whitespace.
-#END
-#my @attributes = map { $attrib2db{lc($_)} or die "unknown attribute $_"; }
-#                   split(" ",&getvalue);
-#
-#print "\n\n", <<END, ":";
-#Do you wish to enable the tracking of a second, separate shipping/service
-#address?
-#END
-#my $ship = &_yesno;
-#
-#sub getvalue {
-#  my($x)=scalar(<STDIN>);
-#  chop $x;
-#  $x;
-#}
-#
-#sub _yesno {
-#  print " [y/N]:";
-#  my $x = scalar(<STDIN>);
-#  $x =~ /^y/i;
-#}
-
-#my @check_attributes = (); #add later
-#my @attributes = (); #add later
-#my $ship = $opt_s;
-
 ###
 # create a dbdef object from the old data structure
 ###
 
+warn "Loading schema objects\n" if $opt_v;
+
 my $dbdef = dbdef_dist(datasrc);
 
 #important
@@ -93,6 +55,8 @@ $dbdef->save($dbdef_file);
 # create 'em
 ###
 
+warn "Connecting to database\n" if $opt_v;
+
 $FS::CurrentUser::upgrade_hack = 1;
 $FS::UID::callback_hack = 1;
 my $dbh = adminsuidsetup $opt_u; #$user;
@@ -101,6 +65,8 @@ $FS::UID::callback_hack = 0;
 #create tables
 $|=1;
 
+warn "Creating tables and indices\n" if $opt_v;
+
 foreach my $statement ( $dbdef->sql($dbh) ) {
   $dbh->do( $statement )
     or die "CREATE error: ". $dbh->errstr. "\ndoing statement: $statement";
@@ -112,14 +78,12 @@ dbdef_create($dbh, $dbdef_file);
 delete $FS::Schema::dbdef_cache{$dbdef_file}; #force an actual reload
 reload_dbdef($dbdef_file);
 
-warn "Freeside schema initialized - commiting transaction\n" if $opt_v;
-
+warn "Tables and indices created - commiting transaction\n" if $opt_v;
 $dbh->commit or die $dbh->errstr;
 $dbh->disconnect or die $dbh->errstr;
-
 warn "Database schema committed successfully\n" if $opt_v;
 
-warn "Initializing freeside configuration\n" if $opt_v;
+warn "Initializing configuration\n" if $opt_v;
 $FS::UID::callback_hack = 1;
 $dbh = adminsuidsetup $opt_u;
 $FS::UID::callback_hack = 0;
@@ -131,21 +95,17 @@ if (!scalar(qsearch('conf', {}))) {
   }
 }
 
-warn "Freeside configuration initialized - commiting transaction\n" if $opt_v;
-
+warn "Configuration initialized - commiting transaction\n" if $opt_v;
 $dbh->commit or die $dbh->errstr;
 $dbh->disconnect or die $dbh->errstr;
-
-warn "Freeside configuration committed successfully\n" if $opt_v;
+warn "Configuration committed successfully\n" if $opt_v;
 
 $dbh = adminsuidsetup $opt_u;
 create_initial_data('domain' => $opt_d);
 
-warn "Freeside database initialized - commiting transaction\n" if $opt_v;
-
+warn "Database initialized - commiting transaction\n" if $opt_v;
 $dbh->commit or die $dbh->errstr;
 $dbh->disconnect or die $dbh->errstr;
-
 warn "Database initialization committed successfully\n" if $opt_v;
 
 sub dbdef_create { # reverse engineer the schema from the DB and save to file
@@ -155,7 +115,7 @@ sub dbdef_create { # reverse engineer the schema from the DB and save to file
 }
 
 sub usage {
-  die "Usage:\n  freeside-setup -d domain.name [ -v ] [ config/dir ]\n"
+  die "Usage:\n  freeside-setup -d domain.name [ -q ] [ config/dir ]\n"
   # [ -u user ] for devel/multi-db installs
 }