X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=478bb2643d04fefe2a0b0bbb9dd73beca079c7f9;hb=ec70b9131ae5df9c58b75e8d6db75e5fddb6362a;hp=265d62754e0c940888385f48454010b6bf8201ad;hpb=8c1ded8f571a5e4b38a5273bfa35fa6aaa57a75f;p=freeside.git diff --git a/Makefile b/Makefile index 265d62754..478bb2643 100644 --- a/Makefile +++ b/Makefile @@ -108,6 +108,8 @@ 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 @@ -261,6 +263,7 @@ install-apache: [ -d ${APACHE_CONF} ] && \ ( install -o root -m 755 htetc/freeside-base${APACHE_VERSION}.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; \ @@ -287,7 +290,7 @@ update-selfservice: 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-texmf +install: install-perl-modules install-docs install-init install-apache install-rt install-torrus install-texmf deploy: install ${HTTPD_RESTART} @@ -374,6 +377,20 @@ install-rt: s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\ " ${RT_PATH}/etc/RT_SiteConfig.pm; 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 rm -rf httemplate/docs/man