fix double insert of overpayments, RT#12655

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 2a8d93c..7cf90cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,13 +26,6 @@ MASONDATA = ${FREESIDE_CACHE}/masondata
 #package maintainers
 DIST_CONF = ${FREESIDE_CONF}/default_conf
 
-#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
-
 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 #redhat, fedora, mandrake
@@ -261,7 +254,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-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 "\
@@ -290,7 +283,12 @@ 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-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}
@@ -382,12 +380,14 @@ configure-torrus:
        torrus_user=freeside var_user=freeside var_group=freeside ./configure
 
 install-torrus:
-       cd torrus; \
-       make; \
-       make install
-       perl -p -i -e "\
-         s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
-       " /usr/local/etc/torrus/conf/torrus-siteconfig.pl
+       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