[freeside-commits] freeside/FS/bin freeside-sqlradius-radacctd, 1.8, 1.9 freeside-queued, 1.34, 1.35 freeside-addoutsource, 1.5, 1.6 freeside-deloutsource, 1.2, 1.3 freeside-selfservice-server, 1.19, 1.20

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/bin
In directory wavetail:/tmp/cvs-serv12008/FS/bin

Modified Files:
	freeside-sqlradius-radacctd freeside-queued 
	freeside-addoutsource freeside-deloutsource 
	freeside-selfservice-server 
Log Message:
tiny bit of cleanup from the conf merge

Index: freeside-sqlradius-radacctd
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/bin/freeside-sqlradius-radacctd,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- freeside-sqlradius-radacctd	14 Dec 2006 09:27:26 -0000	1.8
+++ freeside-sqlradius-radacctd	15 Dec 2006 00:28:46 -0000	1.9
@@ -23,7 +23,7 @@
 
 adminsuidsetup $user;
 
-logfile( "%%%FREESIDE_CONF%%%/sqlradius-radacctd-log.". $FS::UID::datasrc );
+logfile( "%%%FREESIDE_LOG%%%/sqlradius-radacctd-log.". $FS::UID::datasrc );
 
 daemonize2();
 

Index: freeside-deloutsource
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/bin/freeside-deloutsource,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- freeside-deloutsource	14 Dec 2006 09:27:26 -0000	1.2
+++ freeside-deloutsource	15 Dec 2006 00:28:46 -0000	1.3
@@ -2,11 +2,13 @@
 
 domain=$1
 FREESIDE_CONF=%%%FREESIDE_CONF%%%
+FREESIDE_CACHE=%%%FREESIDE_CACHE%%%
+FREESIDE_EXPORT=%%%FREESIDE_EXPORT%%%
 
 dropdb $domain && \
 rm -rf $FREESIDE_CONF/conf.DBI:Pg:host=localhost\;dbname=$domain && \
-rm -rf $FREESIDE_CONF/counters.DBI:Pg:host=localhost\;dbname=$domain && \
-rm -rf $FREESIDE_CONF/cache.DBI:Pg:host=localhost\;dbname=$domain && \
-rm -rf $FREESIDE_CONF/export.DBI:Pg:host=localhost\;dbname=$domain && \
+rm -rf $FREESIDE_CACHE/counters.DBI:Pg:host=localhost\;dbname=$domain && \
+rm -rf $FREESIDE_CACHE/cache.DBI:Pg:host=localhost\;dbname=$domain && \
+rm -rf $FREESIDE_EXPORT/export.DBI:Pg:host=localhost\;dbname=$domain && \
 rm $FREESIDE_CONF/dbdef.DBI:Pg:host=localhost\;dbname=$domain
 

Index: freeside-queued
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/bin/freeside-queued,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- freeside-queued	14 Dec 2006 09:27:26 -0000	1.34
+++ freeside-queued	15 Dec 2006 00:28:46 -0000	1.35
@@ -41,7 +41,7 @@
   }
 }
 
-logfile( "%%%FREESIDE_CONF%%%/queuelog.". $FS::UID::datasrc );
+logfile( "%%%FREESIDE_LOG%%%/queuelog.". $FS::UID::datasrc );
 
 warn "completing daemonization (detaching))\n" if $DEBUG;
 daemonize2();

Index: freeside-addoutsource
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/bin/freeside-addoutsource,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- freeside-addoutsource	14 Dec 2006 09:27:26 -0000	1.5
+++ freeside-addoutsource	15 Dec 2006 00:28:46 -0000	1.6
@@ -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 @@
 \
 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
 

Index: freeside-selfservice-server
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/bin/freeside-selfservice-server,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- freeside-selfservice-server	14 Dec 2006 09:27:26 -0000	1.19
+++ freeside-selfservice-server	15 Dec 2006 00:28:46 -0000	1.20
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
+use vars qw( $FREESIDE_LOG $FREESIDE_LOCK );
 use vars qw( $Debug %kids $kids $max_kids $ssh_pid %old_ssh_pid $keepalives );
 use subs qw( lock_write unlock_write myshutdown usage );
 use Fcntl qw(:flock);
@@ -18,7 +19,8 @@
 use FS::cust_bill;
 use FS::cust_pkg;
 
-$FREESIDE_CONF = "%%%FREESIDE_CONF%%%";
+$FREESIDE_LOG = "%%%FREESIDE_LOG%%%";
+$FREESIDE_LOCK = "%%%FREESIDE_LOCK%%%";
 
 $Debug = 1; # 2 will turn on more logging
             # 3 will log packet contents, including passwords
@@ -31,8 +33,7 @@
 my $machine = shift or die &usage;
 my $tag = scalar(@ARGV) ? shift : '';
 
-my $lock_file = "/usr/local/etc/freeside/selfservice.$machine.writelock";
-
+my $lock_file = "$FREESIDE_LOCK/selfservice.$machine.writelock";
 
 # to keep pid files unique w/multi machines (and installs!)
 # $FS::UID::datasrc not posible
@@ -52,7 +53,7 @@
 adminsuidsetup $user;
 
 #logfile("/usr/local/etc/freeside/selfservice.". $FS::UID::datasrc); #MACHINE
-logfile("$FREESIDE_SERVER/selfservice.$machine.log");
+logfile("$FREESIDE_LOG/selfservice.$machine.log");
 
 daemonize2();