X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=478bb2643d04fefe2a0b0bbb9dd73beca079c7f9;hp=59d2498375f22b59f39672ecd5023f0543a89bda;hb=da86d5a8af2f915a340a74f6c97772451a1e23ef;hpb=6724da406d1fdef94396ff0b8b7566ae83695914 diff --git a/Makefile b/Makefile index 59d249837..478bb2643 100644 --- a/Makefile +++ b/Makefile @@ -108,6 +108,8 @@ FREESIDE_URL = "http://localhost/freeside/" #for now, same db as specified in DATASOURCE... eventually, otherwise? RT_DB_DATABASE = freeside +TORRUS_ENABLED = 0 + # for cvs-upgrade-deploy target, the username who checked out the CVS copy. CVS_USER = ivan @@ -121,10 +123,10 @@ 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.10.0/ +PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.1/ -VERSION=1.9.0cvs -TAG=freeside_1_9_0 +VERSION=2.3.0cvs +TAG=freeside_2_3_0 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1 @@ -140,7 +142,7 @@ 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" @@ -149,7 +151,7 @@ help: @echo " wikiman" @echo " perl-modules" #@echo - #@echo " upload-docs release update-webdemo" + #@echo " upload-docs release" masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* @@ -171,6 +173,7 @@ install-docs: docs cp -r masondocs ${FREESIDE_DOCUMENT_ROOT} chown -R freeside:freeside ${FREESIDE_DOCUMENT_ROOT} cp htetc/handler.pl ${MASON_HANDLER} + cp htetc/htpasswd.logout ${FREESIDE_CONF} [ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true chown -R freeside ${MASONDATA} @@ -198,11 +201,18 @@ perl-modules: 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_CONF%%%|${FREESIDE_CONF}|g;\ + 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;\ + " blib/lib/FS/cust_main/*.pm blib/lib/FS/cust_pkg/*.pm;\ perl -p -i -e "\ s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\ s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\ @@ -253,6 +263,7 @@ install-apache: [ -d ${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 ) && \ + ( [ ${TORRUS_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-torrus.conf ${APACHE_CONF} || true ) && \ perl -p -i -e "\ s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \ s'%%%FREESIDE_CONF%%%'${FREESIDE_CONF}'g; \ @@ -279,7 +290,7 @@ update-selfservice: 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-texmf +install: install-perl-modules install-docs install-init install-apache install-rt install-torrus install-texmf deploy: install ${HTTPD_RESTART} @@ -304,16 +315,10 @@ create-config: install-perl-modules chown freeside ${FREESIDE_CONF}/secrets chmod 600 ${FREESIDE_CONF}/secrets - echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets + /bin/echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets 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}" @@ -327,7 +332,8 @@ create-config: install-perl-modules install -d $(DIST_CONF) #install conf/[a-z]* $(DEFAULT_CONF) #CVS is not [a-z] - install `ls -d conf/[a-z]* | grep -v CVS` $(DIST_CONF) + install `ls -d conf/[a-z]* | grep -v CVS | grep -v '^conf/registries'` $(DIST_CONF) + configure-rt: cd rt; \ @@ -344,7 +350,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 @@ -352,20 +359,37 @@ create-rt: configure-rt [ -d /opt/rt3/share ] || mkdir /opt/rt3/share # cd rt; make install rt/sbin/rt-setup-database --dba '${DB_USER}' \ - -dba-password '${DB_PASSWORD}' \ - -action schema \ + --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 \ + rt/sbin/rt-setup-database --dba-password '${DB_PASSWORD}' \ + --action coredata \ + && rt/sbin/rt-setup-database --dba-password '${DB_PASSWORD}' \ + --action insert \ + --datafile ${RT_PATH}/etc/initialdata \ || true install-rt: - perl -p -i -e "\ + if [ ${RT_ENABLED} -eq 1 ]; then ( cd rt; make install ); fi + if [ ${RT_ENABLED} -eq 1 ]; then 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 + " ${RT_PATH}/etc/RT_SiteConfig.pm; fi + +configure-torrus: + cd torrus; \ + torrus_user=freeside var_user=freeside var_group=freeside ./configure + +install-torrus: + if [ ${TORRUS_ENABLED} -eq 1 ]; then ( cd torrus; \ + make; \ + make install; \ + perl -p -i -e "\ + s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\ + " /usr/local/etc/torrus/conf/torrus-siteconfig.pl; \ + torrus clearcache \ + );fi clean: rm -rf masondocs @@ -383,12 +407,13 @@ clean: .PHONY: release release: # Update the changelog - ./CVS2CL + ./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 @@ -396,6 +421,10 @@ release: dch -v ${DEBVERSION} -p "New upstream release" cvs commit -m "Updated for ${VERSION}" debian/changelog + # Make sure other people's changes are pulled in! + cvs update -d -P || true #it exits 1... + + # Tag the release #cvs tag ${TAG} cvs tag -F ${TAG} @@ -419,8 +448,3 @@ release: #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 )' - ssh root@420.am '( cd /home/ivan/freeside; make deploy )' -