X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=17a92c5f77a144bcfbb62632e39ef10c7b2858e7;hb=172475d501cf77fa76b35fa2cbb64183b845cd67;hp=017f4a7383be044d3a90e4d9394cafc6eec4105b;hpb=e328ac561e5f8ba6fdb54f9d04c8b237993bdeb3;p=freeside.git

diff --git a/Makefile b/Makefile
index 017f4a738..17a92c5f7 100644
--- a/Makefile
+++ b/Makefile
@@ -3,16 +3,30 @@
 #solaris and perhaps other very weirdass /bin/sh
 #SHELL="/bin/ksh"
 
-DATASOURCE = DBI:Pg:dbname=freeside
-#DATASOURCE=DBI:mysql:freeside
+DB_TYPE = Pg
+#DB_TYPE = mysql
 
 DB_USER = freeside
 DB_PASSWORD=
 
-TEMPLATE = mason
+DATASOURCE = DBI:${DB_TYPE}:dbname=freeside
 
-MASON_HANDLER = /usr/local/etc/freeside/handler.pl
-MASONDATA = /usr/local/etc/freeside/masondata
+#changable now (some things which should go to the others still go to CONF)
+FREESIDE_CONF = /usr/local/etc/freeside
+FREESIDE_LOG = /usr/local/etc/freeside
+FREESIDE_LOCK = /usr/local/etc/freeside
+FREESIDE_CACHE = /usr/local/etc/freeside
+FREESIDE_EXPORT = /usr/local/etc/freeside
+
+MASON_HANDLER = ${FREESIDE_CONF}/handler.pl
+MASONDATA = ${FREESIDE_CACHE}/masondata
+
+#mod_perl v1
+#APACHE_VERSION = 1
+#mod_perl v2 prereleases up to and including 1.999_21
+#APACHE_VERSON = 1.99
+#mod_perl v2 proper and prereleases 1.999_22 and after
+APACHE_VERSION = 2
 
 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
@@ -40,7 +54,9 @@ INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20
 #INIT_INSTALL = /usr/bin/true
 
 #deb, suse
-HTTPD_RESTART = /etc/init.d/apache restart
+#HTTPD_RESTART = /etc/init.d/apache restart
+#deb w/apache2
+HTTPD_RESTART = /etc/init.d/apache2 restart
 #redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
@@ -50,9 +66,9 @@ HTTPD_RESTART = /etc/init.d/apache restart
 #apache
 #HTTPD_RESTART = /usr/local/apache/bin/apachectl stop; sleep 10; /usr/local/apache/bin/apachectl startssl
 
-#(an include directory, not a file - "Include /etc/apache/conf.d" in httpd.conf)
-#deb (3.1+), 
-APACHE_CONF = /etc/apache/conf.d
+#(an include directory, not a file, "Include /etc/apache/conf.d" in httpd.conf)
+#deb (3.1+), apache2
+APACHE_CONF = /etc/apache2/conf.d
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
@@ -89,8 +105,7 @@ RT_DB_DATABASE = freeside
 
 #---
 
-#not changable yet
-FREESIDE_CONF = /usr/local/etc/freeside
+
 #rt/config.layout.in
 RT_PATH = /opt/rt3
 
@@ -98,8 +113,8 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.8/
 
-VERSION=1.7.0
-TAG=freeside_1_7_0
+VERSION=1.9.0cvs
+TAG=freeside_1_9_0
 
 help:
 	@echo "supported targets:"
@@ -116,13 +131,13 @@ help:
 	@echo "                   dev dev-docs dev-perl-modules"
 	@echo
 	@echo "                   masondocs alldocs docs"
-	@echo "                   htmlman forcehtmlman"
+	@echo "                   wikiman"
 	@echo "                   perl-modules"
 	#@echo
 	#@echo "                   upload-docs release update-webdemo"
 
 
-masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
+masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/*
 	rm -rf masondocs
 	cp -pr httemplate masondocs
 	touch masondocs
@@ -130,33 +145,22 @@ masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*
 alldocs: masondocs
 
 docs:
-	make ${TEMPLATE}docs
-
-htmlman:
-	[ -e ./httemplate/docs/man ] || mkdir httemplate/docs/man
-	[ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
-	[ -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:
-	[ -e ./httemplate/docs/man ] || mkdir httemplate/docs/man
-	[ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
-	[ -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
-	bin/pod2x
+	make masondocs
+
+wikiman:
+	chmod a+rx ./bin/pod2x
+	./bin/pod2x
 
 install-docs: docs
 	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
-	cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
+	cp -r masondocs ${FREESIDE_DOCUMENT_ROOT}
+	chown -R freeside:freeside ${FREESIDE_DOCUMENT_ROOT}
 	cp htetc/handler.pl ${MASON_HANDLER}
-	perl -p -i -e "\
-	  s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
-	  s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
-	" ${MASON_HANDLER}
+	  perl -p -i -e "\
+	    s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+	    s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
+	    s'%%%MASONDATA%%%'${MASONDATA}'g;\
+	  " ${MASON_HANDLER}
 	[ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
 	chown -R freeside ${MASONDATA}
 
@@ -167,6 +171,7 @@ dev-docs:
 	perl -p -i -e "\
 	  s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
 	  s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
+	  s'%%%MASONDATA%%%'${MASONDATA}'g;\
 	  s'###use Module::Refresh;###'use Module::Refresh;'; \
 	  s'###Module::Refresh->refresh;###'Module::Refresh->refresh;'; \
 	" ${MASON_HANDLER} || true
@@ -178,7 +183,21 @@ perl-modules:
 	make; \
 	perl -p -i -e "\
 	  s/%%%VERSION%%%/${VERSION}/g;\
-	" blib/lib/FS.pm; \
+	" blib/lib/FS.pm;\
+	perl -p -i -e "\
+	  s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
+	  s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
+	" blib/lib/FS/*.pm;\
+	perl -p -i -e "\
+	  s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
+	" blib/lib/FS/part_export/*.pm;\
+	perl -p -i -e "\
+	  s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
+	  s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
+	  s|%%%FREESIDE_LOCK%%%|${FREESIDE_LOCK}|g;\
+	  s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
+	  s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
+	" blib/script/*
 
 install-perl-modules: perl-modules
 	[ -L ${PERL_INC_DEV_KLUDGE}/FS ] \
@@ -207,23 +226,25 @@ install-init:
 	${INIT_INSTALL}
 
 install-apache:
+	[ -e ${APACHE_CONF}/freeside-base.conf ] && rm ${APACHE_CONF}/freeside-base.conf || true
 	[ -d ${APACHE_CONF} ] && \
-	  ( install -o root -m 755 htetc/freeside-base.conf ${APACHE_CONF} && \
+	  ( install -o root -m 755 htetc/freeside-base${APACHE_VERSION}.conf ${APACHE_CONF} && \
 	    ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \
 	    perl -p -i -e "\
 	      s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+	      s'%%%MASON_HANDLER%%%'${MASON_HANDLER}'g; \
 	    " ${APACHE_CONF}/freeside-*.conf \
 	  ) || true
 
 install-selfservice:
+	[ -e ~freeside ] || cp -pr /etc/skel ~freeside && chown -R freeside ~freeside
 	[ -e ~freeside/.ssh/id_dsa.pub ] || su - freeside -c 'ssh-keygen -t dsa'
 	for MACHINE in ${SELFSERVICE_MACHINES}; do \
 	  scp -r fs_selfservice/FS-SelfService ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
 	  scp ~freeside/.ssh/id_dsa.pub ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\
-	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -d -o freeside -m 600 ~freeside/.ssh/" ;\
-	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\
+	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -d -o freeside -m 600 ~freeside/.ssh/; sudo install -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\
 	   ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo install -o freeside -d /usr/local/freeside" ;\
 	done
 
@@ -263,14 +284,14 @@ create-config: install-perl-modules
 	cp `ls -d conf/[a-z]* | grep -v CVS` "${FREESIDE_CONF}/conf.${DATASOURCE}"
 	chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
 
-	mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"
-	chown freeside "${FREESIDE_CONF}/counters.${DATASOURCE}"
+	mkdir "${FREESIDE_CACHE}/counters.${DATASOURCE}"
+	chown freeside "${FREESIDE_CACHE}/counters.${DATASOURCE}"
 
-	mkdir "${FREESIDE_CONF}/cache.${DATASOURCE}"
-	chown freeside "${FREESIDE_CONF}/cache.${DATASOURCE}"
+	mkdir "${FREESIDE_CACHE}/cache.${DATASOURCE}"
+	chown freeside "${FREESIDE_CACHE}/cache.${DATASOURCE}"
 
-	mkdir "${FREESIDE_CONF}/export.${DATASOURCE}"
-	chown freeside "${FREESIDE_CONF}/export.${DATASOURCE}"
+	mkdir "${FREESIDE_EXPORT}/export.${DATASOURCE}"
+	chown freeside "${FREESIDE_EXPORT}/export.${DATASOURCE}"
 
 configure-rt:
 	cd rt; \
@@ -280,7 +301,7 @@ configure-rt:
 	  s'%%%MASONDATA%%%'${MASONDATA}'g;\
 	" config.layout; \
 	./configure --enable-layout=Freeside\
-	            --with-db-type=Pg \
+	            --with-db-type=${DB_TYPE} \
 	            --with-db-dba=${DB_USER} \
 	            --with-db-database=${RT_DB_DATABASE} \
 	            --with-db-rt-user=${DB_USER} \
@@ -294,23 +315,20 @@ create-rt: configure-rt
 	[ -d /opt/rt3       ] || mkdir /opt/rt3       #
 	[ -d /opt/rt3/share ] || mkdir /opt/rt3/share #
 	cd rt; make install
-	echo -e "${DB_PASSWORD}\n\\d sessions"\
-	 | psql -U ${DB_USER} -W ${RT_DB_DATABASE} 2>&1\
-	 | grep '^Did not find'\
-	 && rt/sbin/rt-setup-database --dba '${DB_USER}' \
-	                             --dba-password '${DB_PASSWORD}' \
-	                             --action schema \
+	rt/sbin/rt-setup-database --dba '${DB_USER}' \
+	                          -dba-password '${DB_PASSWORD}' \
+	                          -action schema \
 	 || true
 	rt/sbin/rt-setup-database --action insert_initial \
 	&& rt/sbin/rt-setup-database --action insert --datafile ${RT_PATH}/etc/initialdata \
 	|| true
+
+install-rt:
 	perl -p -i -e "\
 	  s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\
 	  s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\
 	  s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
 	" ${RT_PATH}/etc/RT_SiteConfig.pm
-
-install-rt:
 	[ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
 
 clean:
@@ -325,10 +343,6 @@ clean:
 
 #these are probably only useful if you're me...
 
-upload-docs: forcehtmlman
-	ssh 420.am rm -rf /var/www/www.sisd.com/freeside/docs
-	scp -pr httemplate/docs 420.am:/var/www/www.sisd.com/freeside/docs
-
 #release: upload-docs
 release:
 	cd /home/ivan/freeside