X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=bin%2Fmapsecrets2access_user;h=d632360f56a3716b3e2c674db0ac1a1f1ac3075f;hp=4efd90b2ba9376e975cb842a50861ae2401dfe94;hb=f73a37bd1dfd6f8e5cd497b8ac2843a7b8b1247b;hpb=e9643bdc9a6d493b4b8e02f7949885e6e126c43e

diff --git a/bin/mapsecrets2access_user b/bin/mapsecrets2access_user
index 4efd90b2b..d632360f5 100755
--- a/bin/mapsecrets2access_user
+++ b/bin/mapsecrets2access_user
@@ -24,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,
@@ -46,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;