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

diff --git a/Makefile b/Makefile
index da56c7342..bf5b73efc 100644
--- a/Makefile
+++ b/Makefile
@@ -6,15 +6,19 @@ 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
 #freebsd
 #FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
+#openbsd
+#FREESIDE_DOCUMENT_ROOT = /var/www/htdocs/freeside
 
 #deb, others?
 INIT_FILE = /etc/init.d/freeside
@@ -25,12 +29,14 @@ INIT_FILE = /etc/init.d/freeside
 HTTPD_RESTART = /etc/init.d/apache 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?
 INSTALLGROUP = root
-#freebsd
+#freebsd,openbsd
 #INSTALLGROUP = wheel
 
 #edit the stuff below to have the daemons start
@@ -48,7 +54,7 @@ SIGNUP_MACHINE = localhost
 SIGNUP_AGENTNUM = 2
 SIGNUP_REFNUM = 2
 
-SELFSERVICE_USER = nostart
+SELFSERVICE_USER = fs_selfservice
 SELFSERVICE_MACHINE = localhost
 
 #---
@@ -56,8 +62,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.0pre4
+TAG=freeside_1_5_0pre4
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -115,6 +121,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 +146,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