X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=41b3e8c90d7b797959c1d1cdfe23a6a780f90e92;hp=da54aa93c7099f3980146cb26c4c75cbf92c98f6;hb=43e42a04ae37ca7a84c05d9ff8b94d9f8cde6dcf;hpb=b0810e3538c41c723ae47b982a2e87944be828e0

diff --git a/Makefile b/Makefile
index da54aa93c..41b3e8c90 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,11 @@ FREESIDE_EXPORT = /usr/local/etc/freeside
 MASON_HANDLER = ${FREESIDE_CONF}/handler.pl
 MASONDATA = ${FREESIDE_CACHE}/masondata
 
+#where to put the default configuraiton used by freeside-setup to initialize
+#a new database (not used after that).  primarily of interest to distro
+#package maintainers
+DIST_CONF = ${FREESIDE_CONF}/default_conf
+
 #mod_perl v1
 #APACHE_VERSION = 1
 #mod_perl v2 prereleases up to and including 1.999_21
@@ -66,8 +71,8 @@ HTTPD_RESTART = /etc/init.d/apache2 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/apachew/conf.d" in httpd.conf)
-#deb (3.1+), 
+#(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
@@ -83,7 +88,7 @@ QUEUED_USER=fs_queue
 
 SELFSERVICE_USER = fs_selfservice
 #never run on the same machine in production!!!
-SELFSERVICE_MACHINES = localhost
+SELFSERVICE_MACHINES = 
 # SELFSERVICE_MACHINES = www.example.com
 # SELFSERVICE_MACHINES = web1.example.com web2.example.com
 
@@ -103,29 +108,39 @@ FREESIDE_URL = "http://localhost/freeside/"
 #for now, same db as specified in DATASOURCE... eventually, otherwise?
 RT_DB_DATABASE = freeside
 
-#---
+# for cvs-upgrade-deploy target, the username who checked out the CVS copy.
+CVS_USER = ivan
 
+# for auto-version updates, so we can "make release" more things automatically
+RPM_SPECFILE = rpm/freeside.spec
+
+#---
 
 #rt/config.layout.in
 RT_PATH = /opt/rt3
 
 #only used for dev kludge now, not a big deal
 FREESIDE_PATH = `pwd`
-PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.8/
+PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.0/
+
+VERSION=2.1.0cvs
+TAG=freeside_2_1_0
 
-VERSION=1.9.0cvs
-TAG=freeside_1_9_0
+DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
+
+TEXMFHOME := "\$$TEXMFHOME"
 
 help:
 	@echo "supported targets:"
 	@echo "                   create-database create-config"
 	@echo "                   install deploy"
+	@echo "                   cvs-upgrade-deploy"
 	@echo "                   configure-rt create-rt"
 	@echo "                   clean help"
 	@echo
 	@echo "                   install-docs install-perl-modules"
 	@echo "                   install-init install-apache"
-	@echo "                   install-rt"
+	@echo "                   install-rt install-texmf"
 	@echo "                   install-selfservice update-selfservice"
 	@echo
 	@echo "                   dev dev-docs dev-perl-modules"
@@ -156,11 +171,7 @@ install-docs: docs
 	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; \
-	    s'%%%MASONDATA%%%'${MASONDATA}'g;\
-	  " ${MASON_HANDLER}
+	cp htetc/htpasswd.logout ${FREESIDE_CONF}
 	[ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
 	chown -R freeside ${MASONDATA}
 
@@ -169,14 +180,10 @@ dev-docs:
 	ln -s ${FREESIDE_PATH}/httemplate ${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; \
-	  s'%%%MASONDATA%%%'${MASONDATA}'g;\
 	  s'###use Module::Refresh;###'use Module::Refresh;'; \
 	  s'###Module::Refresh->refresh;###'Module::Refresh->refresh;'; \
 	" ${MASON_HANDLER} || true
 
-
 perl-modules:
 	cd FS; \
 	[ -e Makefile ] || perl Makefile.PL; \
@@ -187,16 +194,29 @@ perl-modules:
 	perl -p -i -e "\
 	  s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
 	  s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
+	  s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+	  s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
+	  s'%%%MASONDATA%%%'${MASONDATA}'g;\
 	" blib/lib/FS/*.pm;\
 	perl -p -i -e "\
+	  s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
+	  s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\
 	  s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
+	" blib/lib/FS/Cron/*.pm;\
+	perl -p -i -e "\
+	  s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
+	  s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
 	" blib/lib/FS/part_export/*.pm;\
 	perl -p -i -e "\
+	  s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
+	" blib/lib/FS/cust_main/*.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;\
+	  s|%%%DIST_CONF%%%|${DIST_CONF}|g;\
 	" blib/script/*
 
 install-perl-modules: perl-modules
@@ -206,6 +226,11 @@ install-perl-modules: perl-modules
 	  || true
 	cd FS; \
 	make install UNINST=1
+	#install this for freeside-setup
+	install -d $(DIST_CONF)
+	#install conf/[a-z]* $(DEFAULT_CONF)
+	#CVS is not [a-z]
+	install `ls -d conf/[a-z]* | grep -v CVS | grep -v '^conf/registries'` $(DIST_CONF)
 
 dev-perl-modules: perl-modules
 	[ -d ${PERL_INC_DEV_KLUDGE}/FS -a ! -L ${PERL_INC_DEV_KLUDGE}/FS ] \
@@ -215,6 +240,11 @@ dev-perl-modules: perl-modules
 	rm -rf ${PERL_INC_DEV_KLUDGE}/FS
 	ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS
 
+install-texmf:	
+	install -D -o freeside -m 444 etc/fslongtable.sty \
+          `kpsewhich -expand-var \\\$$TEXMFLOCAL`/tex/generic/fslongtable.sty
+	texhash `kpsewhich -expand-var \\\$$TEXMFLOCAL`
+
 install-init:
 	#[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
 	install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
@@ -232,12 +262,14 @@ install-apache:
 	    ( [ ${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'%%%FREESIDE_CONF%%%'${FREESIDE_CONF}'g; \
 	      s'%%%MASON_HANDLER%%%'${MASON_HANDLER}'g; \
 	    " ${APACHE_CONF}/freeside-*.conf \
 	  ) || true
 
 install-selfservice:
-	[ -e ~freeside/.ssh/id_dsa.pub ] || su - freeside -c 'ssh-keygen -t dsa'
+	[ -e ~freeside ] || cp -pr /etc/skel ~freeside && chown -R freeside ~freeside
+	[ -e ~freeside/.ssh/id_dsa.pub ] || [ -e ~freeside/.ssh/id_rsa.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" ;\
@@ -250,16 +282,22 @@ install-selfservice:
 update-selfservice:
 	for MACHINE in ${SELFSERVICE_MACHINES}; do \
 	  RSYNC_RSH=ssh rsync -rlptz fs_selfservice/FS-SelfService/ ${SELFSERVICE_INSTALL_USER}@$$MACHINE:FS-SelfService ;\
-	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\
+	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; make clean; perl Makefile.PL && make" ;\
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
 	done
 
-install: install-perl-modules install-docs install-init install-apache install-rt
+install: install-perl-modules install-docs install-init install-apache install-rt install-texmf
 
 deploy: install
 	${HTTPD_RESTART}
 	${FREESIDE_RESTART}
 
+cvs-upgrade-deploy:
+	su ${CVS_USER} -c 'cvs update -d -P'
+	make install-perl-modules
+	su freeside -c "freeside-upgrade ${CVS_USER}" #not really the same user
+	make deploy
+
 dev: dev-perl-modules dev-docs
 
 create-database:
@@ -277,12 +315,6 @@ create-config: install-perl-modules
 	chmod 600 ${FREESIDE_CONF}/secrets
 	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}"
-	cp `ls -d conf/[a-z]* | grep -v CVS` "${FREESIDE_CONF}/conf.${DATASOURCE}"
-	chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
-
 	mkdir "${FREESIDE_CACHE}/counters.${DATASOURCE}"
 	chown freeside "${FREESIDE_CACHE}/counters.${DATASOURCE}"
 
@@ -292,6 +324,13 @@ create-config: install-perl-modules
 	mkdir "${FREESIDE_EXPORT}/export.${DATASOURCE}"
 	chown freeside "${FREESIDE_EXPORT}/export.${DATASOURCE}"
 
+	#install this for freeside-setup
+	install -d $(DIST_CONF)
+	#install conf/[a-z]* $(DEFAULT_CONF)
+	#CVS is not [a-z]
+	install `ls -d conf/[a-z]* | grep -v CVS | grep -v '^conf/registries'` $(DIST_CONF)
+
+
 configure-rt:
 	cd rt; \
 	cp config.layout.in config.layout; \
@@ -307,7 +346,8 @@ configure-rt:
 	            --with-db-rt-pass=${DB_PASSWORD} \
 	            --with-web-user=freeside \
 	            --with-web-group=freeside \
-	            --with-rt-group=freeside
+	            --with-rt-group=freeside \
+	            --with-web-handler=modperl2
 
 create-rt: configure-rt
 	[ -d /opt           ] || mkdir /opt           #doh
@@ -323,12 +363,12 @@ create-rt: configure-rt
 	|| true
 
 install-rt:
-	perl -p -i -e "\
+	[ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
+	[ ${RT_ENABLED} -eq 1 ] && 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
-	[ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
 
 clean:
 	rm -rf masondocs
@@ -343,8 +383,23 @@ clean:
 #these are probably only useful if you're me...
 
 #release: upload-docs
+.PHONY: release
 release:
-	cd /home/ivan/freeside
+	# Update the changelog
+	./bin/cvs2cl
+	cvs commit -m "Updated for ${VERSION}" ChangeLog
+
+	# Update the RPM specfile
+	cvs edit ${RPM_SPECFILE}
+	perl -p -i -e "s/\d+[^\}]+/${VERSION}/ if /%define\s+version\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE}
+	perl -p -i -e "s/\d+[^\}]+/1/ if /%define\s+release\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE}
+	cvs commit -m "Updated for ${VERSION}" ${RPM_SPECFILE}
+
+	# Update the Debian changelog
+	cvs edit debian/changelog
+	dch -v ${DEBVERSION} -p "New upstream release"
+	cvs commit -m "Updated for ${VERSION}" debian/changelog
+
 	#cvs tag ${TAG}
 	cvs tag -F ${TAG}
 
@@ -355,6 +410,19 @@ release:
 	scp freeside-${VERSION}.tar.gz ivan@420.am:/var/www/www.sisd.com/freeside/
 	mv freeside-${VERSION} freeside-${VERSION}.tar.gz ..
 
+	#these things failing should not make release target fail, so: "|| true"
+
+	#kick off vmware update
+	#./BUILD_VMWARE_APPLIANCE ${$TAG} || true
+
+	#kick off deb package update
+
+	#kick off rpm package update too?
+
+	#update web demo?
+
+	#update web demo self-service?
+
 update-webdemo:
 	ssh ivan@420.am '( cd freeside; cvs update -d -P )'
 	#ssh root@420.am '( cd /home/ivan/freeside; make clean; make deploy )'