X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=6f96d8bb4405c2b715f66c4a511a65bf77cfefbf;hb=a0b634afee81961939b35f6b9a965cf05c4fe1fa;hp=10b96e25d49eb7efd57fd28c11bdb0df65fa35b9;hpb=6742745df8ca76edeb4ea2a28c93c58b9a2f975b;p=freeside.git diff --git a/Makefile b/Makefile index 10b96e25d..6f96d8bb4 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ INIT_FILE = /etc/init.d/freeside #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh #deb -INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20 +INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 23 01 #redhat, fedora #INIT_INSTALL = /sbin/chkconfig freeside on #not necessary (freebsd) @@ -121,10 +121,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=2.1.0cvs -TAG=freeside_2_1_0 +VERSION=2.1.3cvs +TAG=freeside_2_1_3 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1 @@ -149,7 +149,7 @@ help: @echo " wikiman" @echo " perl-modules" #@echo - #@echo " upload-docs release update-webdemo" + #@echo " upload-docs release" masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* @@ -166,11 +166,12 @@ wikiman: chmod a+rx ./bin/pod2x ./bin/pod2x -install-docs: docs +install-docs: check-conflicts docs [ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true 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} @@ -195,6 +196,7 @@ perl-modules: s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\ s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \ s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \ + s'%%%RT_PATH%%%'${RT_PATH}'g; \ s'%%%MASONDATA%%%'${MASONDATA}'g;\ " blib/lib/FS/*.pm;\ perl -p -i -e "\ @@ -203,12 +205,13 @@ perl-modules: 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;\ @@ -218,7 +221,7 @@ perl-modules: s|%%%DIST_CONF%%%|${DIST_CONF}|g;\ " blib/script/* -install-perl-modules: perl-modules +install-perl-modules: check-conflicts perl-modules install-rt-initialdata [ -L ${PERL_INC_DEV_KLUDGE}/FS ] \ && rm ${PERL_INC_DEV_KLUDGE}/FS \ && mv ${PERL_INC_DEV_KLUDGE}/FS.old ${PERL_INC_DEV_KLUDGE}/FS \ @@ -310,7 +313,7 @@ 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 @@ -345,7 +348,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 @@ -353,20 +357,31 @@ 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 "\ +install-rt: check-conflicts + 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 + if [ ${RT_ENABLED} -eq 1 ]; then \ + chown -R freeside:freeside ${RT_PATH}/etc; fi + +install-rt-initialdata: + if [ ${RT_ENABLED} -eq 1 ] && [ -d ${RT_PATH} ]; then \ + chown -R freeside:freeside ${RT_PATH}/etc; \ + install -D -o freeside -g freeside -m 0440 rt/etc/initialdata \ + ${RT_PATH}/etc/initialdata; fi clean: rm -rf masondocs @@ -378,6 +393,9 @@ clean: -cd fs_selfservice/FS-SelfService; \ make clean +check-conflicts: + ! grep -r --exclude='*config.log*' '--exclude=*config.status*' --exclude=gnupg_details_on_output_formats '--exclude=*mason_handler*' '^=======$$' . + #these are probably only useful if you're me... #release: upload-docs @@ -398,6 +416,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} @@ -421,8 +443,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 )' -