make the config directory configurable

[freeside.git] / FS / bin / freeside-setup

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 9f87f10..ddc210f 100755 (executable)
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -4,9 +4,10 @@
 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;
 use FS::Schema qw( dbdef_dist reload_dbdef );
 use FS::Record;
 #use FS::raddb;
@@ -17,12 +18,13 @@ die "Not running uid freeside!" unless checkeuid();
 #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 $user = shift or die &usage;
+
+getsecrets($opt_u); #$user);
 
 #needs to match FS::Record
-my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;
+my($dbdef_file) = "%%%FREESIDE_CONF%%%/dbdef.". datasrc;
 
 ###
 
@@ -85,7 +87,8 @@ $dbdef->save($dbdef_file);
 # create 'em
 ###
 
-my $dbh = adminsuidsetup $user;
+$FS::CurrentUser::upgrade_hack = 1;
+my $dbh = adminsuidsetup $opt_u; #$user;
 
 #create tables
 $|=1;
@@ -118,8 +121,10 @@ 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 ] user\n"; 
+  die "Usage:\n  freeside-setup -d domain.name [ -v ]\n"
+  # [ -u user ] for devel/multi-db installs
 }
 
 1;
 
+