From 2c757d7db4cb6a7b9655de13206fcc84fb7ce61f Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 14 May 2006 16:47:31 +0000 Subject: first part of ACL and re-skinning work and some other small stuff --- FS/bin/freeside-addoutsourceuser | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'FS/bin/freeside-addoutsourceuser') diff --git a/FS/bin/freeside-addoutsourceuser b/FS/bin/freeside-addoutsourceuser index cad07f1fd..02a435141 100644 --- a/FS/bin/freeside-addoutsourceuser +++ b/FS/bin/freeside-addoutsourceuser @@ -3,6 +3,7 @@ username=$1 domain=$2 password=$3 +realdomain=$4 freeside-adduser -h /usr/local/etc/freeside/htpasswd \ -s conf.DBI:Pg:dbname=$domain/secrets \ @@ -10,6 +11,5 @@ freeside-adduser -h /usr/local/etc/freeside/htpasswd \ $username $password 2>/dev/null [ -e /usr/local/etc/freeside/dbdef.DBI:Pg:dbname=$domain ] \ - || ( freeside-setup -s $username 2>/dev/null; \ - /home/ivan/freeside/bin/populate-msgcat $username 2>/dev/null ) + || ( freeside-setup -d $realdomain $username 2>/dev/null ) -- cgit v1.2.1 From 5ca0a811040aa6037b8423571236705df4bd3db1 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 9 Oct 2006 01:05:27 +0000 Subject: update the tools for dev installs --- FS/bin/freeside-addoutsourceuser | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'FS/bin/freeside-addoutsourceuser') 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 -- cgit v1.2.1 From 7422aa77086326ba1e6032150ce5704d1003ea6f Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 14 Dec 2006 09:27:26 +0000 Subject: make the config directory configurable --- FS/bin/freeside-addoutsourceuser | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'FS/bin/freeside-addoutsourceuser') diff --git a/FS/bin/freeside-addoutsourceuser b/FS/bin/freeside-addoutsourceuser index 889d28adb..cbe792acc 100644 --- a/FS/bin/freeside-addoutsourceuser +++ b/FS/bin/freeside-addoutsourceuser @@ -4,16 +4,15 @@ username=$1 domain=$2 password=$3 realdomain=$4 - +FREESIDE_CONF=%%%FREESIDE_CONF%%% freeside-adduser -s conf.DBI:Pg:dbname=$domain/secrets \ -n \ $username #2>/dev/null -[ -e /usr/local/etc/freeside/dbdef.DBI:Pg:dbname=$domain ] \ +[ -e $FREESIDE_CONF/dbdef.DBI:Pg:dbname=$domain ] \ || ( freeside-setup -d $realdomain -u $username ) -# 2>/dev/null freeside-adduser -g 1 $username -htpasswd -b /usr/local/etc/freeside/htpasswd $username $password +htpasswd -b $FREESIDE_CONF/htpasswd $username $password -- cgit v1.2.1