optimize CDR rating after timed rate perf regression, RT#15739
[freeside.git] / Makefile
index 76a92c7..79e0fdd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,12 +3,14 @@
 #solaris and perhaps other very weirdass /bin/sh
 #SHELL="/bin/ksh"
 
-DATASOURCE = DBI:Pg:dbname=freeside
-#DATASOURCE=DBI:mysql:freeside
+DB_TYPE = Pg
+#DB_TYPE = mysql
 
 DB_USER = freeside
 DB_PASSWORD=
 
+DATASOURCE = DBI:${DB_TYPE}:dbname=freeside
+
 #changable now (some things which should go to the others still go to CONF)
 FREESIDE_CONF = /usr/local/etc/freeside
 FREESIDE_LOG = /usr/local/etc/freeside
@@ -19,15 +21,10 @@ FREESIDE_EXPORT = /usr/local/etc/freeside
 MASON_HANDLER = ${FREESIDE_CONF}/handler.pl
 MASONDATA = ${FREESIDE_CACHE}/masondata
 
-#mod_perl v1
-APACHE_VERSION = 1
-#mod_perl v2 prereleases up to and including 1.999_21
-#APACHE_VERSON = 1.99
-#mod_perl v2 proper and prereleases 1.999_22 and after
-#APACHE_VERSION = 2
-
-# only mason now
-TEMPLATE = mason
+#where to put the default configuraiton used by freeside-setup to initialize
+#a new database (not used after that).  primarily of interest to distro
+#package maintainers
+DIST_CONF = ${FREESIDE_CONF}/default_conf
 
 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
@@ -48,14 +45,16 @@ 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 21 20
+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)
 #INIT_INSTALL = /usr/bin/true
 
 #deb, suse
-HTTPD_RESTART = /etc/init.d/apache restart
+#HTTPD_RESTART = /etc/init.d/apache restart
+#deb w/apache2
+HTTPD_RESTART = /etc/init.d/apache2 restart
 #redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
@@ -65,9 +64,9 @@ HTTPD_RESTART = /etc/init.d/apache restart
 #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
+#(an include directory, not a file, "Include /etc/apache/conf.d" in httpd.conf)
+#deb (3.1+), apache2
+APACHE_CONF = /etc/apache2/conf.d
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
@@ -82,7 +81,7 @@ QUEUED_USER=fs_queue
 
 SELFSERVICE_USER = fs_selfservice
 #never run on the same machine in production!!!
-SELFSERVICE_MACHINES = localhost
+SELFSERVICE_MACHINES = 
 # SELFSERVICE_MACHINES = www.example.com
 # SELFSERVICE_MACHINES = web1.example.com web2.example.com
 
@@ -102,42 +101,53 @@ 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
 
+# for auto-version updates, so we can "make release" more things automatically
+RPM_SPECFILE = rpm/freeside.spec
+
+#---
 
 #rt/config.layout.in
 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.8.8/
+PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.1/
+
+VERSION=2.3.1cvs
+TAG=freeside_2_3_1
 
-VERSION=1.9.0cvs
-TAG=freeside_1_9_0
+DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
+
+TEXMFHOME := "\$$TEXMFHOME"
 
 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
        @echo "                   install-docs install-perl-modules"
        @echo "                   install-init install-apache"
-       @echo "                   install-rt"
+       @echo "                   install-rt install-texmf"
        @echo "                   install-selfservice update-selfservice"
        @echo
        @echo "                   dev dev-docs dev-perl-modules"
        @echo
        @echo "                   masondocs alldocs docs"
-       @echo "                   htmlman forcehtmlman"
+       @echo "                   wikiman"
        @echo "                   perl-modules"
        #@echo
-       #@echo "                   upload-docs release update-webdemo"
+       #@echo "                   upload-docs release"
 
 
-#masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
-masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/*
+masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/*
        rm -rf masondocs
        cp -pr httemplate masondocs
        touch masondocs
@@ -145,35 +155,18 @@ masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*
 alldocs: masondocs
 
 docs:
-       make ${TEMPLATE}docs
-
-htmlman:
-       [ -e ./httemplate/docs/man ] || mkdir httemplate/docs/man
-       [ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
-       [ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
-       [ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
-       [ -e ./httemplate/docs/man/FS/part_export ] || mkdir httemplate/docs/man/FS/part_export
-       chmod a+rx bin/pod2x
-       [ -e DONT_REBUILD_DOCS ] || bin/pod2x
-
-forcehtmlman:
-       [ -e ./httemplate/docs/man ] || mkdir httemplate/docs/man
-       [ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
-       [ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
-       [ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
-       [ -e ./httemplate/docs/man/FS/part_export ] || mkdir httemplate/docs/man/FS/part_export
-       bin/pod2x
-
-install-docs: docs
+       make masondocs
+
+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 ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
+       cp -r masondocs ${FREESIDE_DOCUMENT_ROOT}
        chown -R freeside:freeside ${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'%%%MASONDATA%%%'${MASONDATA}'g;\
-         " ${MASON_HANDLER}
+       cp htetc/htpasswd.logout ${FREESIDE_CONF}
        [ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
        chown -R freeside ${MASONDATA}
 
@@ -182,14 +175,10 @@ dev-docs:
        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'%%%MASONDATA%%%'${MASONDATA}'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; \
@@ -199,25 +188,47 @@ perl-modules:
        " 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; \
+         s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
+         s'%%%RT_PATH%%%'${RT_PATH}'g; \
+         s'%%%MASONDATA%%%'${MASONDATA}'g;\
+         s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
        " blib/lib/FS/*.pm;\
        perl -p -i -e "\
+         s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
+         s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\
+         s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
+       " blib/lib/FS/Cron/*.pm;\
+       perl -p -i -e "\
+         s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
          s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
+         s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
        " 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;\
+       perl -p -i -e "\
          s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
          s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
          s|%%%FREESIDE_LOCK%%%|${FREESIDE_LOCK}|g;\
          s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
          s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
+         s|%%%DIST_CONF%%%|${DIST_CONF}|g;\
        " blib/script/*
 
-install-perl-modules: perl-modules
+install-perl-modules: check-conflicts 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 \
          || true
        cd FS; \
        make install UNINST=1
+       #install this for freeside-setup
+       install -d $(DIST_CONF)
+       #install conf/[a-z]* $(DEFAULT_CONF)
+       #CVS is not [a-z]
+       install `ls -d conf/[a-z]* | grep -v CVS | grep -v '^conf/registries'` $(DIST_CONF)
 
 dev-perl-modules: perl-modules
        [ -d ${PERL_INC_DEV_KLUDGE}/FS -a ! -L ${PERL_INC_DEV_KLUDGE}/FS ] \
@@ -227,6 +238,11 @@ dev-perl-modules: perl-modules
        rm -rf ${PERL_INC_DEV_KLUDGE}/FS
        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-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}
@@ -240,39 +256,52 @@ 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-base${APACHE_VERSION}.conf ${APACHE_CONF} && \
+         ( install -o root -m 755 htetc/freeside-base2.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; \
              s'%%%MASON_HANDLER%%%'${MASON_HANDLER}'g; \
            " ${APACHE_CONF}/freeside-*.conf \
          ) || true
 
 install-selfservice:
-       [ -e ~freeside/.ssh/id_dsa.pub ] || su - freeside -c 'ssh-keygen -t dsa'
+       [ -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'
        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/" ;\
-         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 ${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" ;\
           ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo install -o freeside -d /usr/local/freeside" ;\
        done
 
 update-selfservice:
        for MACHINE in ${SELFSERVICE_MACHINES}; do \
          RSYNC_RSH=ssh rsync -rlptz fs_selfservice/FS-SelfService/ ${SELFSERVICE_INSTALL_USER}@$$MACHINE:FS-SelfService ;\
-         ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\
+         ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; make clean; perl Makefile.PL && make" ;\
          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-chown:
+       chown freeside "${FREESIDE_CACHE}/counters.${DATASOURCE}"
+       chown freeside "${FREESIDE_CACHE}/cache.${DATASOURCE}"
+       chown freeside "${FREESIDE_EXPORT}/export.${DATASOURCE}"
+
+install: install-perl-modules install-docs install-init install-apache install-rt install-torrus install-texmf install-chown
 
 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:
@@ -286,16 +315,10 @@ create-config: install-perl-modules
        chown freeside ${FREESIDE_CONF}/secrets
        chmod 600 ${FREESIDE_CONF}/secrets
 
-       echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets
+       /bin/echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets
        chmod 600 ${FREESIDE_CONF}/secrets
        chown freeside ${FREESIDE_CONF}/secrets
 
-       mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
-       rm -rf conf/registries #old dirs just won't go away
-       #cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
-       cp `ls -d conf/[a-z]* | grep -v CVS` "${FREESIDE_CONF}/conf.${DATASOURCE}"
-       chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
-
        mkdir "${FREESIDE_CACHE}/counters.${DATASOURCE}"
        chown freeside "${FREESIDE_CACHE}/counters.${DATASOURCE}"
 
@@ -305,6 +328,13 @@ create-config: install-perl-modules
        mkdir "${FREESIDE_EXPORT}/export.${DATASOURCE}"
        chown freeside "${FREESIDE_EXPORT}/export.${DATASOURCE}"
 
+       #install this for freeside-setup
+       install -d $(DIST_CONF)
+       #install conf/[a-z]* $(DEFAULT_CONF)
+       #CVS is not [a-z]
+       install `ls -d conf/[a-z]* | grep -v CVS | grep -v '^conf/registries'` $(DIST_CONF)
+
+
 configure-rt:
        cd rt; \
        cp config.layout.in config.layout; \
@@ -313,38 +343,61 @@ configure-rt:
          s'%%%MASONDATA%%%'${MASONDATA}'g;\
        " config.layout; \
        ./configure --enable-layout=Freeside\
-                   --with-db-type=Pg \
+                   --with-db-type=${DB_TYPE} \
                    --with-db-dba=${DB_USER} \
                    --with-db-database=${RT_DB_DATABASE} \
                    --with-db-rt-user=${DB_USER} \
                    --with-db-rt-pass=${DB_PASSWORD} \
                    --with-web-user=freeside \
                    --with-web-group=freeside \
-                   --with-rt-group=freeside
+                   --with-rt-group=freeside \
+                   --with-web-handler=modperl2
 
 create-rt: configure-rt
        [ -d /opt           ] || mkdir /opt           #doh
        [ -d /opt/rt3       ] || mkdir /opt/rt3       #
        [ -d /opt/rt3/share ] || mkdir /opt/rt3/share #
        cd rt; make install
-       echo -e "${DB_PASSWORD}\n\\d sessions"\
-        | psql -U ${DB_USER} -W ${RT_DB_DATABASE} 2>&1\
-        | grep '^Did not find'\
-        && rt/sbin/rt-setup-database --dba '${DB_USER}' \
-                                    --dba-password '${DB_PASSWORD}' \
-                                    --action schema \
+       rt/sbin/rt-setup-database --dba '${DB_USER}' \
+                                 --dba-password '${DB_PASSWORD}' \
+                                 --action schema \
         || true
-       rt/sbin/rt-setup-database --action insert_initial \
-       && rt/sbin/rt-setup-database --action insert --datafile ${RT_PATH}/etc/initialdata \
+       rt/sbin/rt-setup-database --dba-password '${DB_PASSWORD}' \
+                                 --action coredata \
+       && rt/sbin/rt-setup-database --dba-password '${DB_PASSWORD}' \
+                                    --action insert \
+                                    --datafile ${RT_PATH}/etc/initialdata \
        || true
-       perl -p -i -e "\
+
+install-rt: check-conflicts
+       if [ ${RT_ENABLED} -eq 1 ]; then ( cd rt; make install ); fi
+       if [ ${RT_ENABLED} -eq 1 ]; then 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
+       " ${RT_PATH}/etc/RT_SiteConfig.pm; fi
+       if [ ${RT_ENABLED} -eq 1 ]; then \
+         chown -R freeside:freeside ${RT_PATH}/etc; fi
+
+install-rt-initialdata:
+       if [ ${RT_ENABLED} -eq 1 ] && [ -d ${RT_PATH} ]; then \
+         chown -R freeside:freeside ${RT_PATH}/etc; \
+         install -D -o freeside -g freeside -m 0440 rt/etc/initialdata \
+         ${RT_PATH}/etc/initialdata; 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
@@ -356,15 +409,33 @@ clean:
        -cd fs_selfservice/FS-SelfService; \
        make clean
 
-#these are probably only useful if you're me...
+check-conflicts:
+       ! grep -r --exclude='*config.log*' '--exclude=*config.status*' --exclude=gnupg_details_on_output_formats '--exclude=*mason_handler*' '^=======$$' .
 
-upload-docs: forcehtmlman
-       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
+#these are probably only useful if you're me...
 
 #release: upload-docs
+.PHONY: release
 release:
-       cd /home/ivan/freeside
+       # Update the 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}
+
+       # Update the 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...
+
+       # Tag the release
        #cvs tag ${TAG}
        cvs tag -F ${TAG}
 
@@ -375,8 +446,16 @@ release:
        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@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 )'
+       #these things failing should not make release target fail, so: "|| true"
+
+       #kick off vmware update
+       #./BUILD_VMWARE_APPLIANCE ${$TAG} || true
+
+       #kick off deb package update
+
+       #kick off rpm package update too?
+
+       #update web demo?
+
+       #update web demo self-service?