X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=2976e74ab0e2e29922735a9c6e0449795f3904ff;hp=a454d08de9fecd19803f69d3c8375ea01c34fb10;hb=88e9a56677d343392416c262f976f069157b06cb;hpb=c58b5c1cef23066263aae5c506824310866ef64b diff --git a/Makefile b/Makefile index a454d08de..2976e74ab 100644 --- a/Makefile +++ b/Makefile @@ -26,8 +26,18 @@ MASONDATA = ${FREESIDE_CACHE}/masondata #package maintainers DIST_CONF = ${FREESIDE_CONF}/default_conf -#deb -FREESIDE_DOCUMENT_ROOT = /var/www/freeside +#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 := $(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') + #redhat, fedora, mandrake #FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside #freebsd @@ -45,7 +55,7 @@ INIT_FILE = /etc/init.d/freeside #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh #deb -INIT_INSTALL = /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) @@ -66,7 +76,12 @@ HTTPD_RESTART = /etc/init.d/apache2 restart #(an include directory, not a file, "Include /etc/apache/conf.d" in httpd.conf) #deb (3.1+), apache2 -APACHE_CONF = /etc/apache2/conf.d +#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 FREESIDE_RESTART = ${INIT_FILE} restart @@ -78,6 +93,7 @@ INSTALLGROUP = root #edit the stuff below to have the daemons start QUEUED_USER=fs_queue +API_USER = fs_api SELFSERVICE_USER = fs_selfservice #never run on the same machine in production!!! @@ -101,10 +117,7 @@ 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 +TORRUS_ENABLED = 1 # for auto-version updates, so we can "make release" more things automatically RPM_SPECFILE = rpm/freeside.spec @@ -116,20 +129,25 @@ 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.10.1/ +PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.22.1/ -VERSION=2.3.0cvs -TAG=freeside_2_3_0 +VERSION := `grep '^$$VERSION' FS/FS.pm | cut -d\' -f2` +TAG := freeside_`grep '^$$VERSION' FS/FS.pm | cut -d\' -f2 | perl -pe 's/\./_/g'` -DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1 +#DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1 TEXMFHOME := "\$$TEXMFHOME" +ver: + @echo "${VERSION}" + +tag: + @echo "${TAG}" + 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 @@ -161,14 +179,23 @@ wikiman: chmod a+rx ./bin/pod2x ./bin/pod2x -install-docs: check-conflicts docs - [ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true - cp -r masondocs ${FREESIDE_DOCUMENT_ROOT} +install-docs: docs + #ancient attempt to avoid overwriting customer modifications directly to production web files that's overlived its usefulness + #[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true + #cp -r masondocs ${FREESIDE_DOCUMENT_ROOT} + [ -h ${FREESIDE_DOCUMENT_ROOT} ] && rm ${FREESIDE_DOCUMENT_ROOT} || true + mkdir -p ${FREESIDE_DOCUMENT_ROOT} + cp -r masondocs/* masondocs/.htaccess ${FREESIDE_DOCUMENT_ROOT} chown -R freeside:freeside ${FREESIDE_DOCUMENT_ROOT} - cp htetc/handler.pl ${MASON_HANDLER} - cp htetc/htpasswd.logout ${FREESIDE_CONF} - [ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true - chown -R freeside ${MASONDATA} + install -D htetc/handler.pl ${MASON_HANDLER} + perl -p -i -e "\ + s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\ + s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \ + " ${MASON_HANDLER} || true + mkdir -p ${FREESIDE_EXPORT}/profile + chown freeside ${FREESIDE_EXPORT}/profile + rm -rf ${MASONDATA}/* + 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 @@ -177,6 +204,8 @@ dev-docs: perl -p -i -e "\ s'###use Module::Refresh;###'use Module::Refresh;'; \ s'###Module::Refresh->refresh;###'Module::Refresh->refresh;'; \ + s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\ + s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \ " ${MASON_HANDLER} || true perl-modules: @@ -184,9 +213,6 @@ perl-modules: [ -e Makefile ] || perl Makefile.PL; \ make; \ perl -p -i -e "\ - s/%%%VERSION%%%/${VERSION}/g;\ - " blib/lib/FS.pm;\ - perl -p -i -e "\ s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\ s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\ s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \ @@ -209,6 +235,9 @@ perl-modules: s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\ " blib/lib/FS/cust_main/*.pm blib/lib/FS/cust_pkg/*.pm;\ perl -p -i -e "\ + s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\ + " blib/lib/FS/Daemon/*.pm;\ + perl -p -i -e "\ s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\ s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\ s|%%%FREESIDE_LOCK%%%|${FREESIDE_LOCK}|g;\ @@ -217,7 +246,7 @@ perl-modules: s|%%%DIST_CONF%%%|${DIST_CONF}|g;\ " blib/script/* -install-perl-modules: check-conflicts perl-modules install-rt-initialdata +install-perl-modules: perl-modules install-rt-initialdata [ -L ${PERL_INC_DEV_KLUDGE}/FS ] \ && rm ${PERL_INC_DEV_KLUDGE}/FS \ && mv ${PERL_INC_DEV_KLUDGE}/FS.old ${PERL_INC_DEV_KLUDGE}/FS \ @@ -239,15 +268,16 @@ 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/fslongtable.sty \ - `kpsewhich -expand-var \\\$$TEXMFLOCAL`/tex/generic/fslongtable.sty - texhash `kpsewhich -expand-var \\\$$TEXMFLOCAL` + install -D -o freeside -m 444 etc/*.sty \ + /usr/local/share/texmf/tex/latex/ + texhash /usr/local/share/texmf 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/%%%API_USER%%%/${API_USER}/g;\ s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\ s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\ " ${INIT_FILE} @@ -256,7 +286,7 @@ install-init: install-apache: [ -e ${APACHE_CONF}/freeside-base.conf ] && rm ${APACHE_CONF}/freeside-base.conf || true [ -d ${APACHE_CONF} ] && \ - ( install -o root -m 755 htetc/freeside-base2.conf ${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 "\ @@ -265,16 +295,20 @@ install-apache: s'%%%MASON_HANDLER%%%'${MASON_HANDLER}'g; \ " ${APACHE_CONF}/freeside-*.conf \ ) || true + [ -d ${APACHE_CONF} ] && [ -x /usr/sbin/a2enconf ] && ( /usr/sbin/a2enconf freeside-base${APACHE_VERSION} ) || true + [ -d ${APACHE_CONF} ] && [ ${APACHE_VERSION} = '2.4' ] && [ -x /usr/sbin/a2disconf ] && ( /usr/sbin/a2disconf freeside-base2 ) || true + [ -d ${APACHE_CONF} ] && [ -x /usr/sbin/a2enconf ] && [ ${RT_ENABLED} -eq 1 ] && ( /usr/sbin/a2enconf freeside-rt ) || true + [ -d ${INSSERV_OVERRIDE} ] && [ -x /sbin/insserv ] && ( install -o root -m 755 init.d/insserv-override-apache2 ${INSSERV_OVERRIDE}/apache2 && insserv -d ) || true 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 600 ~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 @@ -296,12 +330,6 @@ 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: @@ -347,7 +375,7 @@ configure-rt: --with-db-dba=${DB_USER} \ --with-db-database=${RT_DB_DATABASE} \ --with-db-rt-user=${DB_USER} \ - --with-db-rt-pass=${DB_PASSWORD} \ + --with-db-rt-pass="${DB_PASSWORD}" \ --with-web-user=freeside \ --with-web-group=freeside \ --with-rt-group=freeside \ @@ -369,8 +397,9 @@ create-rt: configure-rt --datafile ${RT_PATH}/etc/initialdata \ || true -install-rt: check-conflicts +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;\ @@ -409,42 +438,37 @@ clean: -cd fs_selfservice/FS-SelfService; \ make clean -check-conflicts: - ! grep -r --exclude='*config.log*' '--exclude=*config.status*' --exclude=gnupg_details_on_output_formats '--exclude=*mason_handler*' '^=======$$' . - #these are probably only useful if you're me... #release: upload-docs .PHONY: release release: # Update the changelog - ./bin/cvs2cl - cvs commit -m "Updated for ${VERSION}" ChangeLog + #./bin/cvs2cl + #cvs commit -m "Updated for ${VERSION}" ChangeLog # Update the RPM specfile - cvs edit ${RPM_SPECFILE} - perl -p -i -e "s/\d+[^\}]+/${VERSION}/ if /%define\s+version\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE} - perl -p -i -e "s/\d+[^\}]+/1/ if /%define\s+release\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE} - cvs commit -m "Updated for ${VERSION}" ${RPM_SPECFILE} + #cvs edit ${RPM_SPECFILE} + #perl -p -i -e "s/\d+[^\}]+/${VERSION}/ if /%define\s+version\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE} + #perl -p -i -e "s/\d+[^\}]+/1/ if /%define\s+release\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE} + #cvs commit -m "Updated for ${VERSION}" ${RPM_SPECFILE} # Update the Debian changelog - cvs edit debian/changelog - dch -v ${DEBVERSION} -p "New upstream release" - cvs commit -m "Updated for ${VERSION}" debian/changelog + #cvs edit debian/changelog + #dch -v ${DEBVERSION} -p "New upstream release" + #cvs commit -m "Updated for ${VERSION}" debian/changelog # Make sure other people's changes are pulled in! - cvs update -d -P || true #it exits 1... + git pull # Tag the release - #cvs tag ${TAG} - cvs tag -F ${TAG} + git tag -f ${TAG} #cd /home/ivan - cvs export -r ${TAG} -d freeside-${VERSION} freeside - tar czvf freeside-${VERSION}.tar.gz freeside-${VERSION} + 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/ - mv freeside-${VERSION} freeside-${VERSION}.tar.gz .. + 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"