This commit was generated by cvs2svn to compensate for changes in r2526,

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 3f5e18d..6256ccc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #!/usr/bin/make
 
-DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
+DATASOURCE = DBI:Pg:dbname=freeside
 #DATASOURCE=DBI:mysql:freeside
 
 DB_USER = freeside
@@ -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,15 +50,16 @@ SIGNUP_MACHINE = localhost
 SIGNUP_AGENTNUM = 2
 SIGNUP_REFNUM = 2
 
+SELFSERVICE_USER = fs_selfservice
+SELFSERVICE_MACHINE = localhost
+
 #---
 
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-#VERSION=1.4.0pre14
-#TAG=freeside_1_4_0_pre14
-VERSION=1.4.0beta1
-TAG=freeside_1_4_0_beta1
+VERSION=1.5.0pre3
+TAG=freeside_1_5_0pre3
 
 help:
        @echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -56,14 +72,21 @@ help:
 aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
        rm -rf aspdocs
        cp -pr httemplate aspdocs
+       perl -p -i -e "\
+         s/%%%VERSION%%%/${VERSION}/g;\
+       " aspdocs/index.html
        touch aspdocs
 
+
 masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
        rm -rf masondocs
        cp -pr httemplate masondocs
        ( cd masondocs; \
          ../bin/masonize; \
        )
+       perl -p -i -e "\
+         s/%%%VERSION%%%/${VERSION}/g;\
+       " masondocs/index.html
        touch masondocs
 
 alldocs: aspdocs masondocs
@@ -77,6 +100,7 @@ htmlman:
        [ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
        [ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
        [ -e ./httemplate/docs/man/FS/part_export ] || mkdir httemplate/docs/man/FS/part_export
+       chmod a+rx bin/pod2x
        [ -e DONT_REBUILD_DOCS ] || bin/pod2x
 
 forcehtmlman:
@@ -93,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; \
@@ -115,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
@@ -140,6 +169,7 @@ create-config: install-perl-modules
        chown freeside ${FREESIDE_CONF}/secrets
 
        mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
+       rm -rf conf/registries #old dirs just won't go away
        cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
        chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
 
@@ -164,7 +194,7 @@ upload-docs: forcehtmlman
        scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs
 
 release: upload-docs
-       cd /home/ivan/freeside_current
+       cd /home/ivan/freeside
        #cvs tag ${TAG}
        cvs tag -F ${TAG}