X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-addoutsourceuser;h=cbe792acc9b8b93e0c13f4db8eb6c435b52e30a9;hp=f76f39808c1515141f0d6d425446b6efcd159181;hb=6de06472ab43534bd889e531ae060bbd4c935518;hpb=f8a3854cc6186ae9dc2bfafd3a756224ed999cd7

diff --git a/FS/bin/freeside-addoutsourceuser b/FS/bin/freeside-addoutsourceuser
index f76f39808..cbe792acc 100644
--- a/FS/bin/freeside-addoutsourceuser
+++ b/FS/bin/freeside-addoutsourceuser
@@ -2,13 +2,17 @@
 
 username=$1
 domain=$2
+password=$3
+realdomain=$4
+FREESIDE_CONF=%%%FREESIDE_CONF%%%
 
-freeside-adduser -h /usr/local/etc/freeside/htpasswd \
- -s /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain/secrets \
- -b \
- $username $password
+freeside-adduser -s conf.DBI:Pg:dbname=$domain/secrets \
+                 -n \
+                 $username #2>/dev/null
 
-[ -e /usr/local/etc/freeside/dbdef.DBI:Pg:host=localhost\;dbname=$domain ] \
- || ( freeside-setup $username; \
-      /home/ivan/freeside/bin/populate-msgcat $username )
+[ -e $FREESIDE_CONF/dbdef.DBI:Pg:dbname=$domain ] \
+ || ( freeside-setup -d $realdomain -u $username )
 
+freeside-adduser -g 1 $username
+
+htpasswd -b $FREESIDE_CONF/htpasswd $username $password