X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=13e8cf095ebdb54e9a07f68526de30d10edd5829;hp=da56c7342630b81b502424511746e3b2b737be6d;hb=abf5c5442afce5198f6289840791c96f58254e85;hpb=2f9eb7976dca75dc6c585ea9c62f1b0898e3e953

diff --git a/Makefile b/Makefile
index da56c7342..13e8cf095 100644
--- a/Makefile
+++ b/Makefile
@@ -6,10 +6,12 @@ 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?
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
@@ -48,7 +50,7 @@ SIGNUP_MACHINE = localhost
 SIGNUP_AGENTNUM = 2
 SIGNUP_REFNUM = 2
 
-SELFSERVICE_USER = nostart
+SELFSERVICE_USER = fs_selfservice
 SELFSERVICE_MACHINE = localhost
 
 #---
@@ -56,8 +58,8 @@ SELFSERVICE_MACHINE = localhost
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.5.0pre1
-TAG=freeside_1_5_0pre1
+VERSION=1.5.0pre3
+TAG=freeside_1_5_0pre3
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -115,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; \
@@ -137,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