3 files changed, 25 insertions, 9 deletions
diff --git a/FS/bin/freeside-addoutsource b/FS/bin/freeside-addoutsource
index db4e7a307..386e76315 100644
--- a/FS/bin/freeside-addoutsource
+++ b/FS/bin/freeside-addoutsource
@@ -8,8 +8,9 @@ mkdir /usr/local/etc/freeside/conf.DBI:Pg:dbname=$domain && \
 \
 chown freeside /usr/local/etc/freeside/conf.DBI:Pg:dbname=$domain && \
 \
-cp /home/ivan/freeside/conf/[a-z]* /usr/local/etc/freeside/conf.DBI:Pg:dbname=$domain && \
-\
+cp /home/ivan/freeside/conf/[a-z]* /usr/local/etc/freeside/conf.DBI:Pg:dbname=$domain
+
+
 touch /usr/local/etc/freeside/conf.DBI:Pg:dbname=$domain/secrets && \
 \
 chown freeside /usr/local/etc/freeside/conf.DBI:Pg:dbname=$domain/secrets && \
diff --git a/FS/bin/freeside-addoutsourceuser b/FS/bin/freeside-addoutsourceuser
index 02a435141..889d28adb 100644
--- a/FS/bin/freeside-addoutsourceuser
+++ b/FS/bin/freeside-addoutsourceuser
@@ -5,11 +5,15 @@ domain=$2
 password=$3
 realdomain=$4
 
-freeside-adduser -h /usr/local/etc/freeside/htpasswd \
-                 -s conf.DBI:Pg:dbname=$domain/secrets \
-                 -b \
-                 $username $password 2>/dev/null
+
+freeside-adduser -s conf.DBI:Pg:dbname=$domain/secrets \
+                 -n \
+                 $username #2>/dev/null
 
 [ -e /usr/local/etc/freeside/dbdef.DBI:Pg:dbname=$domain ] \
- || ( freeside-setup -d $realdomain $username 2>/dev/null )
+ || ( freeside-setup -d $realdomain -u $username )
+# 2>/dev/null
+
+freeside-adduser -g 1 $username
 
+htpasswd -b /usr/local/etc/freeside/htpasswd $username $password
diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index 8f9d4a33f..a315f1082 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -22,11 +22,22 @@ if ( $opt_s ) {
   #  close MAPSECRETS;
   #}
 
-  open(MAPSECRETS,">>$FREESIDE_CONF/mapsecrets")
+  #insert new entry before a wildcard...
+  open(MAPSECRETS,"<$FREESIDE_CONF/mapsecrets")
     and flock(MAPSECRETS,LOCK_EX)
       or die "can't open $FREESIDE_CONF/mapsecrets: $!";
-  print MAPSECRETS "$user $opt_s\n";
+  open(NEW,">$FREESIDE_CONF/mapsecrets.new")
+    or die "can't open $FREESIDE_CONF/mapsecrets.new: $!";
+  while(<MAPSECRETS>) {
+    if ( /^\*\s/ ) {
+      print NEW "$user $opt_s\n";
+    }
+    print NEW $_;
+  }
   close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
+  close NEW or die "can't close $FREESIDE_CONF/mapsecrets.new: $!";
+  rename("$FREESIDE_CONF/mapsecrets.new", "$FREESIDE_CONF/mapsecrets")
+    or die "can't move mapsecrets.new into place: $!";
 
 }