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
\
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
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
}
}
-logfile( "%%%FREESIDE_CONF%%%/queuelog.". $FS::UID::datasrc );
+logfile( "%%%FREESIDE_LOG%%%/queuelog.". $FS::UID::datasrc );
warn "completing daemonization (detaching))\n" if $DEBUG;
daemonize2();
#!/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);
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
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
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();
adminsuidsetup $user;
-logfile( "%%%FREESIDE_CONF%%%/sqlradius-radacctd-log.". $FS::UID::datasrc );
+logfile( "%%%FREESIDE_LOG%%%/sqlradius-radacctd-log.". $FS::UID::datasrc );
daemonize2();
DB_USER = freeside
DB_PASSWORD=
-#changable now
+#changable now (some things which should go to the others still go to CONF)
FREESIDE_CONF = /usr/local/etc/freeside
-
-TEMPLATE = mason
+FREESIDE_LOG = /usr/local/etc/freeside
+FREESIDE_LOCK = /usr/local/etc/freeside
+FREESIDE_CACHE = /usr/local/etc/freeside
+FREESIDE_EXPORT = /usr/local/etc/freeside
MASON_HANDLER = ${FREESIDE_CONF}/handler.pl
-MASONDATA = ${FREESIDE_CONF}/masondata
+MASONDATA = ${FREESIDE_CACHE}/masondata
+
+# only mason now
+TEMPLATE = mason
#deb
FREESIDE_DOCUMENT_ROOT = /var/www/freeside
perl -p -i -e "\
s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
- s'%%%FREESIDE_CONF%%%'${FREESIDE_CONF}'g;\
+ s'%%%MASONDATA%%%'${MASONDATA}'g;\
" ${MASON_HANDLER}
[ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
chown -R freeside ${MASONDATA}
make; \
perl -p -i -e "\
s/%%%VERSION%%%/${VERSION}/g;\
- s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
" blib/lib/FS.pm;\
perl -p -i -e "\
s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
" blib/lib/FS/*.pm;\
perl -p -i -e "\
- s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
+ s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
" blib/lib/FS/part_export/*.pm;\
perl -p -i -e "\
s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
+ s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
+ s|%%%FREESIDE_LOCK%%%|${FREESIDE_LOCK}|g;\
+ s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
+ s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
" blib/script/*
install-perl-modules: perl-modules
( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \
perl -p -i -e "\
s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
- s'%%%FREESIDE_CONF%%%'${FREESIDE_CONF}'g; \
" ${APACHE_CONF}/freeside-*.conf \
) || true
cp `ls -d conf/[a-z]* | grep -v CVS` "${FREESIDE_CONF}/conf.${DATASOURCE}"
chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
- mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"
- chown freeside "${FREESIDE_CONF}/counters.${DATASOURCE}"
+ mkdir "${FREESIDE_CACHE}/counters.${DATASOURCE}"
+ chown freeside "${FREESIDE_CACHE}/counters.${DATASOURCE}"
- mkdir "${FREESIDE_CONF}/cache.${DATASOURCE}"
- chown freeside "${FREESIDE_CONF}/cache.${DATASOURCE}"
+ mkdir "${FREESIDE_CACHE}/cache.${DATASOURCE}"
+ chown freeside "${FREESIDE_CACHE}/cache.${DATASOURCE}"
- mkdir "${FREESIDE_CONF}/export.${DATASOURCE}"
- chown freeside "${FREESIDE_CONF}/export.${DATASOURCE}"
+ mkdir "${FREESIDE_EXPORT}/export.${DATASOURCE}"
+ chown freeside "${FREESIDE_EXPORT}/export.${DATASOURCE}"
configure-rt:
cd rt; \
[ 'freeside' => '%%%FREESIDE_DOCUMENT_ROOT%%%' ],
[ 'rt' => '%%%FREESIDE_DOCUMENT_ROOT%%%/rt' ],
],
- data_dir=>'%%%FREESIDE_CONF%%%/masondata',
+ data_dir=>'%%%MASONDATA%%%',
#out_mode=>'stream',
#RT