summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile57
1 files changed, 26 insertions, 31 deletions
diff --git a/Makefile b/Makefile
index 6256ccc3e..72b3e58ff 100644
--- a/Makefile
+++ b/Makefile
@@ -6,33 +6,41 @@ DATASOURCE = DBI:Pg:dbname=freeside
DB_USER = freeside
DB_PASSWORD=
-TEMPLATE = asp
-#TEMPLATE = mason
+#TEMPLATE = asp
+TEMPLATE = mason
ASP_GLOBAL = /usr/local/etc/freeside/asp-global
MASON_HANDLER = /usr/local/etc/freeside/handler.pl
MASONDATA = /usr/local/etc/freeside/masondata
-#deb, others?
+#deb
FREESIDE_DOCUMENT_ROOT = /var/www/freeside
+#redhat, mandrake
+#FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside
#freebsd
#FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
+#openbsd
+#FREESIDE_DOCUMENT_ROOT = /var/www/htdocs/freeside
-#deb, others?
+#deb, redhat, mandrake, others?
INIT_FILE = /etc/init.d/freeside
#freebsd
#INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
-#deb, others?
+#deb
HTTPD_RESTART = /etc/init.d/apache restart
+#redhat, mandrake
+#HTTPD_RESTART = /etc/init.d/httpd restart
#freebsd
#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
+#openbsd
+#HTTPD_RESTART = kill -TERM `cat /var/www/logs/httpd.pid`; sleep 1; /usr/sbin/httpd -u -DSSL
FREESIDE_RESTART = ${INIT_FILE} restart
-#deb, others?
+#deb, redhat, mandrake, others?
INSTALLGROUP = root
-#freebsd
+#freebsd, openbsd
#INSTALLGROUP = wheel
#edit the stuff below to have the daemons start
@@ -42,24 +50,17 @@ QUEUED_USER=fs_queue
#eventually this shouldn't be needed
FREESIDE_PATH = `pwd`
-PASSWD_USER = nostart
-PASSWD_MACHINE = localhost
-
-SIGNUP_USER = nostart
-SIGNUP_MACHINE = localhost
-SIGNUP_AGENTNUM = 2
-SIGNUP_REFNUM = 2
-
SELFSERVICE_USER = fs_selfservice
-SELFSERVICE_MACHINE = localhost
+SELFSERVICE_MACHINES = localhost
+# SELFSERVICE_MACHINES = web1.example.com web2.example.com
#---
#not changable yet
FREESIDE_CONF = /usr/local/etc/freeside
-VERSION=1.5.0pre3
-TAG=freeside_1_5_0pre3
+VERSION=1.5.0pre4
+TAG=freeside_1_5_0pre4
help:
@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -136,14 +137,8 @@ install-init:
perl -p -i -e "\
s/%%%QUEUED_USER%%%/${QUEUED_USER}/g;\
s'%%%FREESIDE_PATH%%%'${FREESIDE_PATH}'g;\
- s/%%%PASSWD_USER%%%/${PASSWD_USER}/g;\
- s/%%%PASSWD_MACHINE%%%/${PASSWD_MACHINE}/g;\
- s/%%%SIGNUP_USER%%%/${SIGNUP_USER}/g;\
- s/%%%SIGNUP_MACHINE%%%/${SIGNUP_MACHINE}/g;\
- s/%%%SIGNUP_AGENTNUM%%%/${SIGNUP_AGENTNUM}/g;\
- s/%%%SIGNUP_REFNUM%%%/${SIGNUP_REFNUM}/g;\
s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
- s/%%%SELFSERVICE_MACHINE%%%/${SELFSERVICE_MACHINE}/g;\
+ s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\
" ${INIT_FILE}
install: install-perl-modules install-docs install-init
@@ -157,8 +152,7 @@ create-database:
create-config: install-perl-modules
[ -e ${FREESIDE_CONF} ] && mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S` || true
- mkdir ${FREESIDE_CONF}
- chown freeside ${FREESIDE_CONF}
+ install -d -o freeside ${FREESIDE_CONF}
touch ${FREESIDE_CONF}/secrets
chown freeside ${FREESIDE_CONF}/secrets
@@ -170,7 +164,8 @@ create-config: install-perl-modules
mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
rm -rf conf/registries #old dirs just won't go away
- cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
+ #cp conf/[a-z]* "${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_CONF}/counters.${DATASOURCE}"
@@ -190,8 +185,8 @@ clean:
#these are probably only useful if you're me...
upload-docs: forcehtmlman
- ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
- scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs
+ ssh pouncequick.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
+ scp -pr httemplate/docs pouncequick.420.am:/var/www/www.sisd.com/freeside/devdocs
release: upload-docs
cd /home/ivan/freeside
@@ -202,7 +197,7 @@ release: upload-docs
cvs export -r ${TAG} -d freeside-${VERSION} freeside
tar czvf freeside-${VERSION}.tar.gz freeside-${VERSION}
- scp freeside-${VERSION}.tar.gz ivan@cleanwhisker.420.am:/var/www/sisd.420.am/freeside/
+ scp freeside-${VERSION}.tar.gz ivan@pouncequick.420.am:/var/www/sisd.420.am/freeside/
mv freeside-${VERSION} freeside-${VERSION}.tar.gz ..
update-webdemo: