projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7422aa7
)
tiny bit of cleanup from the conf merge
author
ivan
<ivan>
Fri, 15 Dec 2006 00:28:46 +0000
(
00:28
+0000)
committer
ivan
<ivan>
Fri, 15 Dec 2006 00:28:46 +0000
(
00:28
+0000)
FS/bin/freeside-addoutsource
patch
|
blob
|
history
FS/bin/freeside-deloutsource
patch
|
blob
|
history
FS/bin/freeside-queued
patch
|
blob
|
history
FS/bin/freeside-selfservice-server
patch
|
blob
|
history
FS/bin/freeside-sqlradius-radacctd
patch
|
blob
|
history
Makefile
patch
|
blob
|
history
htetc/handler.pl
patch
|
blob
|
history
diff --git
a/FS/bin/freeside-addoutsource
b/FS/bin/freeside-addoutsource
index
8291c64
..
9cb1219
100644
(file)
--- a/
FS/bin/freeside-addoutsource
+++ b/
FS/bin/freeside-addoutsource
@@
-3,6
+3,8
@@
domain=$1
FREESIDE_CONF=%%%FREESIDE_CONF%%%
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
#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 && \
\
\
echo -e "DBI:Pg:dbname=$domain\nfreeside\n" >$FREESIDE_CONF/conf.DBI:Pg:dbname=$domain/secrets && \
\
-mkdir $FREESIDE_C
ONF
/counters.DBI:Pg:dbname=$domain && \
-mkdir $FREESIDE_C
ONF
/cache.DBI:Pg:dbname=$domain && \
-mkdir $FREESIDE_
CONF
/export.DBI:Pg:dbname=$domain
+mkdir $FREESIDE_C
ACHE
/counters.DBI:Pg:dbname=$domain && \
+mkdir $FREESIDE_C
ACHE
/cache.DBI:Pg:dbname=$domain && \
+mkdir $FREESIDE_
EXPORT
/export.DBI:Pg:dbname=$domain
diff --git
a/FS/bin/freeside-deloutsource
b/FS/bin/freeside-deloutsource
index
72aca04
..
afc3a01
100644
(file)
--- a/
FS/bin/freeside-deloutsource
+++ b/
FS/bin/freeside-deloutsource
@@
-2,11
+2,13
@@
domain=$1
FREESIDE_CONF=%%%FREESIDE_CONF%%%
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 && \
dropdb $domain && \
rm -rf $FREESIDE_CONF/conf.DBI:Pg:host=localhost\;dbname=$domain && \
-rm -rf $FREESIDE_C
ONF
/counters.DBI:Pg:host=localhost\;dbname=$domain && \
-rm -rf $FREESIDE_C
ONF
/cache.DBI:Pg:host=localhost\;dbname=$domain && \
-rm -rf $FREESIDE_
CONF
/export.DBI:Pg:host=localhost\;dbname=$domain && \
+rm -rf $FREESIDE_C
ACHE
/counters.DBI:Pg:host=localhost\;dbname=$domain && \
+rm -rf $FREESIDE_C
ACHE
/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
rm $FREESIDE_CONF/dbdef.DBI:Pg:host=localhost\;dbname=$domain
diff --git
a/FS/bin/freeside-queued
b/FS/bin/freeside-queued
index
d16513b
..
93d735d
100644
(file)
--- a/
FS/bin/freeside-queued
+++ b/
FS/bin/freeside-queued
@@
-41,7
+41,7
@@
while ( $@ ) {
}
}
}
}
-logfile( "%%%FREESIDE_
CONF
%%%/queuelog.". $FS::UID::datasrc );
+logfile( "%%%FREESIDE_
LOG
%%%/queuelog.". $FS::UID::datasrc );
warn "completing daemonization (detaching))\n" if $DEBUG;
daemonize2();
warn "completing daemonization (detaching))\n" if $DEBUG;
daemonize2();
diff --git
a/FS/bin/freeside-selfservice-server
b/FS/bin/freeside-selfservice-server
index
fc04ee9
..
187bc14
100644
(file)
--- a/
FS/bin/freeside-selfservice-server
+++ b/
FS/bin/freeside-selfservice-server
@@
-1,6
+1,7
@@
#!/usr/bin/perl -w
use strict;
#!/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 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::Conf;
use FS::cust_bill;
use FS::cust_pkg;
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
$Debug = 1; # 2 will turn on more logging
# 3 will log packet contents, including passwords
@@
-31,8
+33,7
@@
my $user = shift or die &usage;
my $machine = shift or die &usage;
my $tag = scalar(@ARGV) ? shift : '';
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
# to keep pid files unique w/multi machines (and installs!)
# $FS::UID::datasrc not posible
@@
-52,7
+53,7
@@
$ENV{HOME} = (getpwuid($>))[7]; #for ssh
adminsuidsetup $user;
#logfile("/usr/local/etc/freeside/selfservice.". $FS::UID::datasrc); #MACHINE
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();
daemonize2();
diff --git
a/FS/bin/freeside-sqlradius-radacctd
b/FS/bin/freeside-sqlradius-radacctd
index
bf41596
..
83fd4bf
100644
(file)
--- a/
FS/bin/freeside-sqlradius-radacctd
+++ b/
FS/bin/freeside-sqlradius-radacctd
@@
-23,7
+23,7
@@
drop_root();
adminsuidsetup $user;
adminsuidsetup $user;
-logfile( "%%%FREESIDE_
CONF
%%%/sqlradius-radacctd-log.". $FS::UID::datasrc );
+logfile( "%%%FREESIDE_
LOG
%%%/sqlradius-radacctd-log.". $FS::UID::datasrc );
daemonize2();
daemonize2();
diff --git
a/Makefile
b/Makefile
index
c9a3e67
..
ed77ff8
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-9,13
+9,18
@@
DATASOURCE = DBI:Pg:dbname=freeside
DB_USER = freeside
DB_PASSWORD=
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
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
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
#deb
FREESIDE_DOCUMENT_ROOT = /var/www/freeside
@@
-160,7
+165,7
@@
install-docs: docs
perl -p -i -e "\
s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
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}
" ${MASON_HANDLER}
[ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
chown -R freeside ${MASONDATA}
@@
-183,16
+188,19
@@
perl-modules:
make; \
perl -p -i -e "\
s/%%%VERSION%%%/${VERSION}/g;\
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 "\
" 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;\
" 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
" blib/script/*
install-perl-modules: perl-modules
@@
-227,7
+235,6
@@
install-apache:
( [ ${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; \
( [ ${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
" ${APACHE_CONF}/freeside-*.conf \
) || true
@@
-279,14
+286,14
@@
create-config: install-perl-modules
cp `ls -d conf/[a-z]* | grep -v CVS` "${FREESIDE_CONF}/conf.${DATASOURCE}"
chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
cp `ls -d conf/[a-z]* | grep -v CVS` "${FREESIDE_CONF}/conf.${DATASOURCE}"
chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
- mkdir "${FREESIDE_C
ONF
}/counters.${DATASOURCE}"
- chown freeside "${FREESIDE_C
ONF
}/counters.${DATASOURCE}"
+ mkdir "${FREESIDE_C
ACHE
}/counters.${DATASOURCE}"
+ chown freeside "${FREESIDE_C
ACHE
}/counters.${DATASOURCE}"
- mkdir "${FREESIDE_C
ONF
}/cache.${DATASOURCE}"
- chown freeside "${FREESIDE_C
ONF
}/cache.${DATASOURCE}"
+ mkdir "${FREESIDE_C
ACHE
}/cache.${DATASOURCE}"
+ chown freeside "${FREESIDE_C
ACHE
}/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; \
configure-rt:
cd rt; \
diff --git
a/htetc/handler.pl
b/htetc/handler.pl
index
3f3886b
..
2d82673
100644
(file)
--- a/
htetc/handler.pl
+++ b/
htetc/handler.pl
@@
-60,7
+60,7
@@
my $ah = new HTML::Mason::ApacheHandler (
[ 'freeside' => '%%%FREESIDE_DOCUMENT_ROOT%%%' ],
[ 'rt' => '%%%FREESIDE_DOCUMENT_ROOT%%%/rt' ],
],
[ 'freeside' => '%%%FREESIDE_DOCUMENT_ROOT%%%' ],
[ 'rt' => '%%%FREESIDE_DOCUMENT_ROOT%%%/rt' ],
],
- data_dir=>'%%%
FREESIDE_CONF%%%/masondata
',
+ data_dir=>'%%%
MASONDATA%%%
',
#out_mode=>'stream',
#RT
#out_mode=>'stream',
#RT