BEGIN { $FS::Schema::setup_hack = 1; }
use strict;
-use vars qw($opt_s $opt_d $opt_v);
+use vars qw($opt_u $opt_d $opt_v);
use Getopt::Std;
use FS::UID qw(adminsuidsetup datasrc checkeuid getsecrets);
use FS::CurrentUser;
#my %attrib2db =
# map { lc($FS::raddb::attrib{$_}) => $_ } keys %FS::raddb::attrib;
-getopts("svd:");
-my $user = shift or die &usage;
-getsecrets($user);
+getopts("u:vd:");
+my $config_dir = shift || 'conf' ;
+$config_dir =~ /^([\w.:=]+)$/
+ or die "unacceptable configuration directory name";
+$config_dir = $1;
+
+getsecrets($opt_u);
#needs to match FS::Record
-my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;
+my($dbdef_file) = "%%%FREESIDE_CONF%%%/dbdef.". datasrc;
###
###
$FS::CurrentUser::upgrade_hack = 1;
-my $dbh = adminsuidsetup $user;
+$FS::UID::callback_hack = 1;
+my $dbh = adminsuidsetup $opt_u; #$user;
+$FS::UID::callback_hack = 0;
#create tables
$|=1;
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;
+
+$dbh->commit or die $dbh->errstr;
+$dbh->disconnect or die $dbh->errstr;
+
+warn "Database schema committed successfully\n" if $opt_v;
+
+my $init_config = "freeside-init-config";
+$init_config .= " -v" if $opt_v;
+$init_config .= " -u $opt_u" if $opt_u;
+$init_config .= " $config_dir";
+system "$init_config" ;
+
+$dbh = adminsuidsetup $opt_u;
create_initial_data('domain' => $opt_d);
warn "Freeside database initialized - commiting transaction\n" if $opt_v;
}
sub usage {
- die "Usage:\n freeside-setup -d domain.name [ -v ] user\n";
+ die "Usage:\n freeside-setup -d domain.name [ -v ] [ config/dir ]\n"
+ # [ -u user ] for devel/multi-db installs
}
1;
+