fix apache starting before postgres or mysql, RT#18983

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index b603b8c..208398a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,7 @@ 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
+INSSERV_OVERRIDE = /etc/insserv/overrides
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
@@ -115,13 +116,19 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.14.2/
 
-VERSION=3.0git
-TAG=freeside_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"
@@ -162,6 +169,12 @@ install-docs: check-conflicts docs
        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_EXPORT%%%|${FREESIDE_EXPORT}|g;\
+         s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
+       " ${MASON_HANDLER} || true
+       mkdir -p ${FREESIDE_EXPORT}/profile
+       chown freeside ${FREESIDE_EXPORT}/profile
        cp htetc/htpasswd.logout ${FREESIDE_CONF}
        [ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
        chown -R freeside ${MASONDATA}
@@ -173,6 +186,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:
@@ -180,9 +195,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; \
@@ -261,6 +273,7 @@ install-apache:
              s'%%%MASON_HANDLER%%%'${MASON_HANDLER}'g; \
            " ${APACHE_CONF}/freeside-*.conf \
          ) || 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
@@ -337,7 +350,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 \