X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=0c06edb5fa357edc2ba0dfeea6c560e082ac7f77;hb=cf8f8aafc5595b31f24a7b0d06289c830d123cb8;hp=796bca81f03867378f8af2961098e64e85f6e569;hpb=1c8f3834d38fb9fbda77eb204d9cd162f20f95ea;p=freeside.git diff --git a/Makefile b/Makefile index 796bca81f..0c06edb5f 100644 --- a/Makefile +++ b/Makefile @@ -41,8 +41,10 @@ INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20 #not necessary (freebsd) #INIT_INSTALL = /usr/bin/true -#deb, suse -HTTPD_RESTART = /etc/init.d/apache restart +#deb +HTTPD_RESTART = /etc/init.d/apache reload +#suse +#HTTPD_RESTART = /etc/init.d/apache restart #redhat, fedora, mandrake #HTTPD_RESTART = /etc/init.d/httpd restart #freebsd @@ -67,9 +69,6 @@ INSTALLGROUP = root QUEUED_USER=fs_queue -#eventually this shouldn't be needed -FREESIDE_PATH = `pwd` - SELFSERVICE_USER = fs_selfservice #never run on the same machine in production!!! SELFSERVICE_MACHINES = localhost @@ -99,17 +98,32 @@ FREESIDE_CONF = /usr/local/etc/freeside #rt/config.layout.in RT_PATH = /opt/rt3 -VERSION=1.5.7 -TAG=freeside_1_5_7 +#only used for dev kludge now, not a big deal +FREESIDE_PATH = `pwd` +PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.7/ + +VERSION=1.5.8cvs +TAG=freeside_1_5_8 help: - @echo "supported targets: aspdocs masondocs alldocs docs install-docs" - @echo " htmlman" - @echo " perl-modules install-perl-modules" + @echo "supported targets:" + @echo " create-database create-config" @echo " install deploy" - @echo " create-database" @echo " configure-rt create-rt" - @echo " clean" + @echo " clean help" + @echo + @echo " install-docs install-perl-modules" + @echo " install-init install-apache" + @echo " install-rt" + @echo " install-selfservice update-selfservice" + @echo + @echo " dev dev-docs dev-perl-modules" + @echo + @echo " aspdocs masondocs alldocs docs" + @echo " htmlman forcehtmlman" + @echo " perl-modules" + #@echo + #@echo " upload-docs release update-webdemo" aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/* rm -rf aspdocs @@ -166,6 +180,18 @@ install-docs: docs [ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true [ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true +dev-docs: docs + [ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true + ln -s ${FREESIDE_PATH}/masondocs ${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'###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; \ @@ -175,15 +201,26 @@ perl-modules: " blib/lib/FS.pm install-perl-modules: perl-modules + [ -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 +dev-perl-modules: + [ -d ${PERL_INC_DEV_KLUDGE}/FS -a ! -L ${PERL_INC_DEV_KLUDGE}/FS ] \ + && mv ${PERL_INC_DEV_KLUDGE}/FS ${PERL_INC_DEV_KLUDGE}/FS.old \ + || true + + rm -rf ${PERL_INC_DEV_KLUDGE}/FS + ln -sf ${FREESIDE_PATH}/FS/FS ${PERL_INC_DEV_KLUDGE}/FS + 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} perl -p -i -e "\ s/%%%QUEUED_USER%%%/${QUEUED_USER}/g;\ - s'%%%FREESIDE_PATH%%%'${FREESIDE_PATH}'g;\ s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\ s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\ " ${INIT_FILE} @@ -205,7 +242,8 @@ install-selfservice: ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\ ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\ scp ~freeside/.ssh/id_dsa.pub ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\ - ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -D -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\ + ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -d -o freeside -m 600 ~freeside/.ssh/" ;\ + ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\ ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo install -o freeside -d /usr/local/freeside" ;\ done @@ -222,6 +260,8 @@ deploy: install ${HTTPD_RESTART} ${FREESIDE_RESTART} +dev: dev-perl-modules dev-docs + create-database: perl -e 'use DBIx::DataSource qw( create_database ); create_database( "${DATASOURCE}", "${DB_USER}", "${DB_PASSWORD}" ) or die $$DBIx::DataSource::errstr;' @@ -301,8 +341,8 @@ clean: #these are probably only useful if you're me... upload-docs: forcehtmlman - ssh pouncequick.420.am rm -rf /var/www/www.sisd.com/freeside/docs - scp -pr httemplate/docs pouncequick.420.am:/var/www/www.sisd.com/freeside/docs + ssh 420.am rm -rf /var/www/www.sisd.com/freeside/docs + scp -pr httemplate/docs 420.am:/var/www/www.sisd.com/freeside/docs release: upload-docs cd /home/ivan/freeside @@ -313,11 +353,11 @@ release: upload-docs cvs export -r ${TAG} -d freeside-${VERSION} freeside tar czvf freeside-${VERSION}.tar.gz freeside-${VERSION} - scp freeside-${VERSION}.tar.gz ivan@pouncequick.420.am:/var/www/sisd.420.am/freeside/ + 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@pouncequick.420.am '( cd freeside; cvs update -d -P )' - #ssh root@pouncequick.420.am '( cd /home/ivan/freeside; make clean; make deploy )' - ssh root@pouncequick.420.am '( cd /home/ivan/freeside; make deploy )' + 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 )'