From 5ca0a811040aa6037b8423571236705df4bd3db1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 9 Oct 2006 01:05:27 +0000
Subject: update the tools for dev installs

---
 FS/bin/freeside-addoutsource | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'FS/bin/freeside-addoutsource')

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 && \
-- 
cgit v1.2.1


From 7422aa77086326ba1e6032150ce5704d1003ea6f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 14 Dec 2006 09:27:26 +0000
Subject: make the config directory configurable

---
 FS/bin/freeside-addoutsource | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'FS/bin/freeside-addoutsource')

diff --git a/FS/bin/freeside-addoutsource b/FS/bin/freeside-addoutsource
index 386e76315..8291c6434 100644
--- a/FS/bin/freeside-addoutsource
+++ b/FS/bin/freeside-addoutsource
@@ -2,24 +2,29 @@
 
 domain=$1
 
+FREESIDE_CONF=%%%FREESIDE_CONF%%%
+
+#without this, [a-z]* matches CVS/, the copy doesn't return a sucessful error
+# status, and the rest of the commands aren't run
+export LANG=C
+
 createdb $domain && \
 \
-mkdir /usr/local/etc/freeside/conf.DBI:Pg:dbname=$domain && \
+mkdir $FREESIDE_CONF/conf.DBI:Pg:dbname=$domain && \
 \
-chown freeside /usr/local/etc/freeside/conf.DBI:Pg:dbname=$domain && \
+chown freeside $FREESIDE_CONF/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 && \
+cp /home/ivan/freeside/conf/[a-z]* $FREESIDE_CONF/conf.DBI:Pg:dbname=$domain && \
+\
+touch $FREESIDE_CONF/conf.DBI:Pg:dbname=$domain/secrets && \
 \
-chown freeside /usr/local/etc/freeside/conf.DBI:Pg:dbname=$domain/secrets && \
+chown freeside $FREESIDE_CONF/conf.DBI:Pg:dbname=$domain/secrets && \
 \
-chmod 600 /usr/local/etc/freeside/conf.DBI:Pg:dbname=$domain/secrets && \
+chmod 600 $FREESIDE_CONF/conf.DBI:Pg:dbname=$domain/secrets && \
 \
-echo -e "DBI:Pg:dbname=$domain\nfreeside\n" >/usr/local/etc/freeside/conf.DBI:Pg:dbname=$domain/secrets && \
+echo -e "DBI:Pg:dbname=$domain\nfreeside\n" >$FREESIDE_CONF/conf.DBI:Pg:dbname=$domain/secrets && \
 \
-mkdir /usr/local/etc/freeside/counters.DBI:Pg:dbname=$domain && \
-mkdir /usr/local/etc/freeside/cache.DBI:Pg:dbname=$domain && \
-mkdir /usr/local/etc/freeside/export.DBI:Pg:dbname=$domain
+mkdir $FREESIDE_CONF/counters.DBI:Pg:dbname=$domain && \
+mkdir $FREESIDE_CONF/cache.DBI:Pg:dbname=$domain && \
+mkdir $FREESIDE_CONF/export.DBI:Pg:dbname=$domain
 
-- 
cgit v1.2.1


From 1163d4d5044ca487ae9cf2176346e297979aa1e1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 15 Dec 2006 00:28:46 +0000
Subject: tiny bit of cleanup from the conf merge

---
 FS/bin/freeside-addoutsource | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'FS/bin/freeside-addoutsource')

diff --git a/FS/bin/freeside-addoutsource b/FS/bin/freeside-addoutsource
index 8291c6434..9cb12195a 100644
--- a/FS/bin/freeside-addoutsource
+++ b/FS/bin/freeside-addoutsource
@@ -3,6 +3,8 @@
 domain=$1
 
 FREESIDE_CONF=%%%FREESIDE_CONF%%%
+FREESIDE_CACHE=%%%FREESIDE_CACHE%%%
+FREESIDE_EXPORT=%%%FREESIDE_EXPORT%%%
 
 #without this, [a-z]* matches CVS/, the copy doesn't return a sucessful error
 # status, and the rest of the commands aren't run
@@ -24,7 +26,7 @@ chmod 600 $FREESIDE_CONF/conf.DBI:Pg:dbname=$domain/secrets && \
 \
 echo -e "DBI:Pg:dbname=$domain\nfreeside\n" >$FREESIDE_CONF/conf.DBI:Pg:dbname=$domain/secrets && \
 \
-mkdir $FREESIDE_CONF/counters.DBI:Pg:dbname=$domain && \
-mkdir $FREESIDE_CONF/cache.DBI:Pg:dbname=$domain && \
-mkdir $FREESIDE_CONF/export.DBI:Pg:dbname=$domain
+mkdir $FREESIDE_CACHE/counters.DBI:Pg:dbname=$domain && \
+mkdir $FREESIDE_CACHE/cache.DBI:Pg:dbname=$domain && \
+mkdir $FREESIDE_EXPORT/export.DBI:Pg:dbname=$domain
 
-- 
cgit v1.2.1