X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=4a2afd000851726b3bcbbdf36bdd549b4219c8f1;hp=eb762e157fde358356afeef5841905332f970569;hb=f5a81134be779b26688d3d4703840f3b038ca2f7;hpb=80fd40b3a6cfa53d7dee30dfaa61d89c2075a7c7

diff --git a/Makefile b/Makefile
index eb762e157..4a2afd000 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
+#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, 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
+#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, others?
 INSTALLGROUP = root
-#freebsd
+#freebsd,openbsd
 #INSTALLGROUP = wheel
 
 #edit the stuff below to have the daemons start
@@ -42,14 +50,6 @@ 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
 
@@ -58,8 +58,8 @@ SELFSERVICE_MACHINE = localhost
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.5.0pre2
-TAG=freeside_1_5_0pre2
+VERSION=1.5.0pre4
+TAG=freeside_1_5_0pre4
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -136,12 +136,6 @@ 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;\
 	" ${INIT_FILE}