#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.1.1cvs
+TAG=freeside_2_1_1
DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
@echo " wikiman"
@echo " perl-modules"
#@echo
- #@echo " upload-docs release update-webdemo"
+ #@echo " upload-docs release"
masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/*
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}
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;\
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}"
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; \
--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
[ -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
clean:
rm -rf masondocs
.PHONY: release
release:
# Update the changelog
- ./CVS2CL
+ ./bin/cvs2cl
cvs commit -m "Updated for ${VERSION}" ChangeLog
# Update the RPM specfile
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}
#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 )'
-