X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=33bb57bd5aabdc7595e1ddb523f03c2a55511aa1;hp=e1b7056982b719ce96961ca8ecec36bea0094d55;hb=c23d6e1673dbec98fe9d778ee55962d2cbd145d5;hpb=bb1af59b9714ce29a51779ede746aa1a1b2466b9 diff --git a/Makefile b/Makefile index e1b705698..33bb57bd5 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 @@ -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,11 +108,14 @@ 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 @@ -120,10 +128,13 @@ 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 @@ -160,11 +171,6 @@ 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} [ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true chown -R freeside ${MASONDATA} @@ -173,14 +179,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; \ @@ -191,16 +193,23 @@ 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|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|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 @@ -210,6 +219,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` $(DIST_CONF) dev-perl-modules: perl-modules [ -d ${PERL_INC_DEV_KLUDGE}/FS -a ! -L ${PERL_INC_DEV_KLUDGE}/FS ] \ @@ -219,6 +233,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} @@ -243,7 +262,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" ;\ @@ -256,16 +275,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: @@ -298,6 +323,12 @@ 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` $(DIST_CONF) + configure-rt: cd rt; \ cp config.layout.in config.layout; \