X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=3486b79679227a9a8a4df267618bc529875d0992;hp=b2eb8695cfcc6e3cffac8c408cf7694428ea36a9;hb=929783d1045757abbe5c84ff2439547b0f8eca23;hpb=a8001fede477df80f80951eaf962bdb058d9f605 diff --git a/Makefile b/Makefile index b2eb8695c..3486b7967 100644 --- a/Makefile +++ b/Makefile @@ -29,10 +29,15 @@ DIST_CONF = ${FREESIDE_CONF}/default_conf #mod_perl v2 1.999_22 on Apache 2.0 through 2.3 (Debian ancient through 7.x) #APACHE_VERSION=2 #Apache 2.4 (Debian 8.x) -APACHE_VERSION=2.4 +#APACHE_VERSION=2.4 +APACHE_VERSION := $(shell /usr/sbin/apache2 -v | grep -q '\/2\.4\.' && echo '2.4' || echo '2') + +#deb (-7 and upgrades) +#FREESIDE_DOCUMENT_ROOT = /var/www/freeside +#deb (new installs of 8+) (plus needs more work w/new auth) +#FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside +FREESIDE_DOCUMENT_ROOT := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo '/var/www/html/freeside' || echo '/var/www/freeside') -#deb -FREESIDE_DOCUMENT_ROOT = /var/www/freeside #redhat, fedora, mandrake #FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside #freebsd @@ -50,7 +55,7 @@ INIT_FILE = /etc/init.d/freeside #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh #deb -INIT_INSTALL = PATH=$PATH:/sbin /usr/sbin/update-rc.d freeside defaults 23 01 +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) @@ -70,10 +75,11 @@ HTTPD_RESTART = /etc/init.d/apache2 restart #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) -#debian unstable/8.0+, apache2.4 -APACHE_CONF = /etc/apache2/conf-available #deb (3.1+), apache2 #APACHE_CONF = /etc/apache2/conf.d +#debian unstable/8.0+, apache2.4 +#APACHE_CONF = /etc/apache2/conf-available +APACHE_CONF := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo '/etc/apache2/conf-available' || echo '/etc/apache2/conf.d') INSSERV_OVERRIDE = /etc/insserv/overrides @@ -111,7 +117,7 @@ FREESIDE_URL = "http://localhost/freeside/" #for now, same db as specified in DATASOURCE... eventually, otherwise? RT_DB_DATABASE = freeside -TORRUS_ENABLED = 0 +#TORRUS_ENABLED = 1 # for auto-version updates, so we can "make release" more things automatically RPM_SPECFILE = rpm/freeside.spec @@ -123,7 +129,7 @@ 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.14.2/ +PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.22.1/ VERSION := `grep '^$$VERSION' FS/FS.pm | cut -d\' -f2` TAG := freeside_`grep '^$$VERSION' FS/FS.pm | cut -d\' -f2 | perl -pe 's/\./_/g'` @@ -188,8 +194,10 @@ install-docs: docs " ${MASON_HANDLER} || true mkdir -p ${FREESIDE_EXPORT}/profile chown freeside ${FREESIDE_EXPORT}/profile - [ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true - chown -R freeside ${MASONDATA} + rm -rf ${MASONDATA}/* + mkdir ${MASONDATA}/cache || true + mkdir ${MASONDATA}/obj || true + chown -f -R freeside ${MASONDATA} || true dev-docs: [ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true @@ -209,6 +217,7 @@ perl-modules: perl -p -i -e "\ s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\ s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\ + s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\ s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \ s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \ s'%%%RT_PATH%%%'${RT_PATH}'g; \ @@ -227,7 +236,7 @@ perl-modules: " 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;\ + " blib/lib/FS/cust_main/*.pm blib/lib/FS/cust_pkg/*.pm blib/lib/FS/contact/*.pm;\ perl -p -i -e "\ s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\ " blib/lib/FS/Daemon/*.pm;\ @@ -262,8 +271,8 @@ dev-perl-modules: perl-modules ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS install-texmf: - install -D -o freeside -m 444 etc/longtable.sty \ - /usr/local/share/texmf/tex/latex/longtable.sty + install -D -o freeside -m 444 etc/*.sty \ + /usr/local/share/texmf/tex/latex/ texhash /usr/local/share/texmf install-init: @@ -296,13 +305,13 @@ install-apache: install-selfservice: [ -e ~freeside ] || cp -pr /etc/skel ~freeside && chown -R freeside ~freeside - [ -e ~freeside/.ssh/id_dsa.pub ] || [ -e ~freeside/.ssh/id_rsa.pub ] || su - freeside -c 'ssh-keygen -t dsa' + [ -e ~freeside/.ssh/id_rsa.pub ] || su - freeside -c 'ssh-keygen' 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 755 ~freeside/.ssh/; sudo install -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\ + scp ~freeside/.ssh/id_rsa.pub ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\ + ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -d -o freeside -m 755 ~freeside/.ssh/; sudo install -o freeside -m 600 ./id_rsa.pub ~freeside/.ssh/authorized_keys" ;\ ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo install -o freeside -d /usr/local/freeside" ;\ done @@ -393,6 +402,7 @@ create-rt: configure-rt install-rt: if [ ${RT_ENABLED} -eq 1 ]; then ( cd rt; make install ); fi + if [ ${RT_ENABLED} -eq 1 ]; then cp -r rt/share/static/images ${FREESIDE_DOCUMENT_ROOT}/rt/NoAuth/ ;fi if [ ${RT_ENABLED} -eq 1 ]; then perl -p -i -e "\ s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\ s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\ @@ -460,7 +470,7 @@ release: #cd /home/ivan git archive --prefix=freeside-${VERSION}/ ${TAG} | gzip -9 >freeside-${VERSION}.tar.gz - scp freeside-${VERSION}.tar.gz ivan@420.am:/var/www/www.sisd.com/freeside/ + scp freeside-${VERSION}.tar.gz ivan@freeside.biz:/var/www/www.freeside.biz/freeside/ mv freeside-${VERSION}.tar.gz .. #these things failing should not make release target fail, so: "|| true"