X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=bin%2Fmapsecrets2access_user;h=d632360f56a3716b3e2c674db0ac1a1f1ac3075f;hp=3fcd5069b8d0a99fc7505e6e582b4a62d73e79df;hb=75e11f1d1a5ced24496b5732e290f7762403feb8;hpb=3489c3e13d952972c06b82d1eb2bbd0315ed5a7c

diff --git a/bin/mapsecrets2access_user b/bin/mapsecrets2access_user
index 3fcd5069b..d632360f5 100755
--- a/bin/mapsecrets2access_user
+++ b/bin/mapsecrets2access_user
@@ -14,7 +14,8 @@ use FS::access_groupagent;
 use FS::agent;
 
 $FS::CurrentUser::upgrade_hack = 1;
-adminsuidsetup shift;
+my $user = shift or die &usage;
+adminsuidsetup $user;
 
 my $supergroup = qsearchs('access_group', { 'groupname' => 'Superuser' } );
 unless ( $supergroup ) {
@@ -23,7 +24,7 @@ unless ( $supergroup ) {
   my $error = $supergroup->insert;
   die $error if $error;
 
-  foreach my $rightname ( FS::AccessRight->rights ) {
+  foreach my $rightname ( FS::AccessRight->default_superuser_rights ) {
     my $access_right = new FS::access_right {
       'righttype'   => 'FS::access_group',
       'rightobjnum' => $supergroup->groupnum,
@@ -45,8 +46,10 @@ unless ( $supergroup ) {
 }
 my $supergroupnum = $supergroup->groupnum;
 
-my $mapsecrets = '/usr/local/etc/freeside/mapsecrets';
-open(MAPSECRETS, "<$mapsecrets") or die $!;
+my $conf = new FS::Conf;
+my $dir = $conf->base_dir;
+my $mapsecrets = "$dir/mapsecrets";
+open(MAPSECRETS, "<$mapsecrets") or die "Can't open $mapsecrets: $!";
 while (<MAPSECRETS>) {
   /([\w]+)\s+secrets\s*$/ or die "unparsable line in mapsecrets: $_";
   my $username = $1;
@@ -77,3 +80,8 @@ cp $mapsecrets, "$mapsecrets.bak$$";
 open(MAPSECRETS, ">$mapsecrets") or die $!;
 print MAPSECRETS '* secrets'. "\n";
 close MAPSECRETS or die $!;
+
+sub usage {
+  die "Usage:\n  mapsecrets2access_user user\n"; 
+}
+