X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=ce682ef2eae08b2f125422bdf8c3ce1b75ea773d;hb=e802abcfc55d928fb96d5272548133e1cab56fad;hp=afcfe68859edc6e65e7d37125d6feefcd2db8997;hpb=70020f6e384a102c806d47df111f768ad98123d2;p=freeside.git

diff --git a/Makefile b/Makefile
index afcfe6885..ce682ef2e 100644
--- a/Makefile
+++ b/Makefile
@@ -10,19 +10,34 @@ 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?
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
+#freebsd
+#FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
 
+#deb, others?
 INIT_FILE = /etc/init.d/freeside
+#freebsd
+#INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
 
+#deb, others?
 HTTPD_RESTART = /etc/init.d/apache restart
-FREESIDE_RESTART = /etc/init.d/freeside restart
+#freebsd
+#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
 
+FREESIDE_RESTART = ${INIT_FILE} restart
+
+#deb, others?
 INSTALLGROUP = root
+#freebsd
+#INSTALLGROUP = wheel
 
 #edit the stuff below to have the daemons start
 
-QUEUED_USER=ivan
+QUEUED_USER=fs_queue
 
 #eventually this shouldn't be needed
 FREESIDE_PATH = `pwd`
@@ -35,13 +50,16 @@ SIGNUP_MACHINE = localhost
 SIGNUP_AGENTNUM = 2
 SIGNUP_REFNUM = 2
 
+SELFSERVICE_USER = nostart
+SELFSERVICE_MACHINE = localhost
+
 #---
 
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.4.1beta4
-TAG=freeside_1_4_1beta4
+VERSION=1.4.1rc5
+TAG=freeside_1_4_1rc5
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -99,6 +117,9 @@ install-docs: docs
 	[ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL} || true
 	[ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
 	[ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
+	[ "${TEMPLATE}" = "mason" ] && cp htetc/handler.pl ${MASON_HANDLER} || true
+	[ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
+	[ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true
 
 perl-modules:
 	cd FS; \
@@ -121,6 +142,8 @@ install-init:
 	  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;\
 	" ${INIT_FILE}
 
 install: install-perl-modules install-docs install-init
@@ -170,7 +193,8 @@ upload-docs: forcehtmlman
 	ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/docs
 	scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/docs
 
-release: upload-docs update-webdemo
+#release: upload-docs update-webdemo
+release: upload-docs
 	cd /home/ivan/freeside1.4
 	#cvs tag ${TAG}
 	cvs tag -F ${TAG}