X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=85e9e920a8247be77f0ffb34e47302407517b8bb;hb=011655eed8c44c354efa49979d39e2c32f678454;hp=b23ee93ed77e12e79b04617f53b083db744fcb1c;hpb=f7fd2a3e34da751cbc02bbf215e99c6dc89adc15;p=freeside.git diff --git a/Makefile b/Makefile index b23ee93ed..85e9e920a 100644 --- a/Makefile +++ b/Makefile @@ -9,10 +9,8 @@ DATASOURCE = DBI:Pg:dbname=freeside DB_USER = freeside DB_PASSWORD= -#TEMPLATE = asp TEMPLATE = mason -ASP_GLOBAL = /usr/local/etc/freeside/asp-global MASON_HANDLER = /usr/local/etc/freeside/handler.pl MASONDATA = /usr/local/etc/freeside/masondata @@ -34,17 +32,28 @@ INIT_FILE = /etc/init.d/freeside #freebsd #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh +#deb +INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20 +#redhat, fedora +#INIT_INSTALL = /sbin/chkconfig freeside on +#not necessary (freebsd) +#INIT_INSTALL = /usr/bin/true + #deb, suse HTTPD_RESTART = /etc/init.d/apache restart #redhat, fedora, mandrake #HTTPD_RESTART = /etc/init.d/httpd restart #freebsd -#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 10; /usr/local/etc/rc.d/apache.sh start +#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop || true; sleep 10; /usr/local/etc/rc.d/apache.sh start #openbsd #HTTPD_RESTART = kill -TERM `cat /var/www/logs/httpd.pid`; sleep 10; /usr/sbin/httpd -u -DSSL #apache #HTTPD_RESTART = /usr/local/apache/bin/apachectl stop; sleep 10; /usr/local/apache/bin/apachectl startssl +#(an include directory, not a file - "Include /etc/apache/conf.d" in httpd.conf) +#deb (3.1+), +APACHE_CONF = /etc/apache/conf.d + FREESIDE_RESTART = ${INIT_FILE} restart #deb, redhat, fedora, mandrake, suse, others? @@ -56,9 +65,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 @@ -71,11 +77,12 @@ SELFSERVICE_INSTALL_USER = ivan SELFSERVICE_INSTALL_USERADD = /usr/sbin/useradd #SELFSERVICE_INSTALL_USERADD = "/usr/sbin/pw useradd" -RT_ENABLED = 0 -#RT_ENABLED = 1 +#RT_ENABLED = 0 +RT_ENABLED = 1 RT_DOMAIN = example.com -RT_TIMEZONE = US/Pacific; -#RT_TIMEZONE = US/Eastern; +RT_TIMEZONE = US/Pacific +#RT_TIMEZONE = US/Eastern +FREESIDE_URL = "http://localhost/freeside/" #for now, same db as specified in DATASOURCE... eventually, otherwise? RT_DB_DATABASE = freeside @@ -87,33 +94,41 @@ FREESIDE_CONF = /usr/local/etc/freeside #rt/config.layout.in RT_PATH = /opt/rt3 -VERSION=1.5.0pre6 -TAG=freeside_1_5_0pre6 +#only used for dev kludge now, not a big deal +FREESIDE_PATH = `pwd` +PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.8/ + +VERSION=1.7.1 +TAG=freeside_1_7_1 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" - -aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/* - rm -rf aspdocs - cp -pr httemplate aspdocs - touch aspdocs - - -masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/* + @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 " masondocs alldocs docs" + @echo " htmlman forcehtmlman" + @echo " perl-modules" + #@echo + #@echo " upload-docs release update-webdemo" + + +#masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/* +masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* rm -rf masondocs cp -pr httemplate masondocs - ( cd masondocs; \ - ../bin/masonize; \ - ) touch masondocs -alldocs: aspdocs masondocs +alldocs: masondocs docs: make ${TEMPLATE}docs @@ -138,21 +153,25 @@ forcehtmlman: install-docs: docs [ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT} - [ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL} || true - [ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true - [ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true - [ "${TEMPLATE}" = "asp" ] && \ - perl -p -i -e "\ - s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \ - " ${ASP_GLOBAL}/global.asa || true - [ "${TEMPLATE}" = "mason" ] && cp htetc/handler.pl ${MASON_HANDLER} || true - [ "${TEMPLATE}" = "mason" ] && \ - perl -p -i -e "\ - s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \ - s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \ - " ${MASON_HANDLER} || true - [ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true - [ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true + cp htetc/handler.pl ${MASON_HANDLER} + perl -p -i -e "\ + s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \ + s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \ + " ${MASON_HANDLER} + [ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true + chown -R freeside ${MASONDATA} + +dev-docs: + [ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true + 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'###use Module::Refresh;###'use Module::Refresh;'; \ + s'###Module::Refresh->refresh;###'Module::Refresh->refresh;'; \ + " ${MASON_HANDLER} || true + perl-modules: cd FS; \ @@ -160,30 +179,52 @@ perl-modules: make; \ perl -p -i -e "\ s/%%%VERSION%%%/${VERSION}/g;\ - " blib/lib/FS.pm + " 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: 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/blib/lib/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} + ${INIT_INSTALL} + +install-apache: + [ -d ${APACHE_CONF} ] && \ + ( install -o root -m 755 htetc/freeside-base.conf ${APACHE_CONF} && \ + ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \ + perl -p -i -e "\ + s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \ + " ${APACHE_CONF}/freeside-*.conf \ + ) || true install-selfservice: - [ -e ~freeside/.ssh/id_dsa.pub ] || su -c 'ssh-keygen -t dsa' - freeside + [ -e ~freeside/.ssh/id_dsa.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" ;\ 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 @@ -194,12 +235,14 @@ update-selfservice: ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\ done -install: install-perl-modules install-docs install-init install-rt +install: install-perl-modules install-docs install-init install-apache install-rt 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;' @@ -265,23 +308,30 @@ create-rt: configure-rt 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 install-rt: [ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true clean: - rm -rf aspdocs masondocs - cd FS; \ + rm -rf masondocs + rm -rf httemplate/docs/man + rm -rf pod2htmi.tmp + rm -rf pod2htmd.tmp + -cd FS; \ + make clean + -cd fs_selfservice/FS-SelfService; \ make 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 +#release: upload-docs +release: cd /home/ivan/freeside #cvs tag ${TAG} cvs tag -F ${TAG} @@ -290,11 +340,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 )'