communigate provisioning phase 2: add svc_domain.trailer -> communigate TrailerText...

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 41b3e8c..aca452f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -204,6 +204,7 @@ perl-modules:
          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;\
@@ -355,20 +356,23 @@ create-rt: configure-rt
        [ -d /opt/rt3/share ] || mkdir /opt/rt3/share #
        cd rt; make install
        rt/sbin/rt-setup-database --dba '${DB_USER}' \
-                                 -dba-password '${DB_PASSWORD}' \
-                                 -action schema \
+                                 --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
 
 install-rt:
-       [ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
-       [ ${RT_ENABLED} -eq 1 ] && perl -p -i -e "\
+       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
+       " ${RT_PATH}/etc/RT_SiteConfig.pm; fi
 
 clean:
        rm -rf masondocs