X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=79e0fdd95a87a2e8fb5601c0d5666910b38b206e;hp=3a8c7359f8c92ce0d28a737276b53fd9cd868bee;hb=75e11f1d1a5ced24496b5732e290f7762403feb8;hpb=4ddcaeadf6f2a313b37e276275a6d44a4c0d5f7d diff --git a/Makefile b/Makefile index 3a8c7359f..79e0fdd95 100644 --- a/Makefile +++ b/Makefile @@ -21,12 +21,10 @@ 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 +#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 #deb FREESIDE_DOCUMENT_ROOT = /var/www/freeside @@ -47,7 +45,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 = PATH=$PATH:/sbin /usr/sbin/update-rc.d freeside defaults 23 01 #redhat, fedora #INIT_INSTALL = /sbin/chkconfig freeside on #not necessary (freebsd) @@ -83,7 +81,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,31 +101,41 @@ 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 + +# 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.1/ -VERSION=1.9.0cvs -TAG=freeside_1_9_0 +VERSION=2.3.1cvs +TAG=freeside_2_3_1 + +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" @@ -136,7 +144,7 @@ help: @echo " wikiman" @echo " perl-modules" #@echo - #@echo " upload-docs release update-webdemo" + #@echo " upload-docs release" masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* @@ -153,16 +161,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} - 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} @@ -171,14 +175,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; \ @@ -189,25 +189,46 @@ 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'%%%RT_PATH%%%'${RT_PATH}'g; \ + s'%%%MASONDATA%%%'${MASONDATA}'g;\ + s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/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_pkg/*.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 +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 \ || 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 ] \ @@ -217,6 +238,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} @@ -230,8 +256,9 @@ install-init: 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${APACHE_VERSION}.conf ${APACHE_CONF} && \ + ( install -o root -m 755 htetc/freeside-base2.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; \ @@ -241,7 +268,7 @@ install-apache: 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' + [ -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" ;\ @@ -254,16 +281,27 @@ 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-chown: + chown freeside "${FREESIDE_CACHE}/counters.${DATASOURCE}" + chown freeside "${FREESIDE_CACHE}/cache.${DATASOURCE}" + chown freeside "${FREESIDE_EXPORT}/export.${DATASOURCE}" + +install: install-perl-modules install-docs install-init install-apache install-rt install-torrus install-texmf install-chown 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,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}" @@ -296,6 +328,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; \ @@ -311,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 @@ -319,20 +359,45 @@ 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 + +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 @@ -344,16 +409,33 @@ 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 +.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 + + # 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} @@ -364,8 +446,16 @@ release: scp freeside-${VERSION}.tar.gz ivan@420.am:/var/www/www.sisd.com/freeside/ mv freeside-${VERSION} freeside-${VERSION}.tar.gz .. -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 )' + #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?