Pg datatype pain

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 312609a..1211232 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,13 @@ TEMPLATE = asp
 #mason's a bit dodgy still
 #TEMPLATE = mason
 
+ASP_GLOBAL = /usr/local/etc/freeside/asp-global
+
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 
+HTTPD_RESTART = /etc/init.d/apache restart
+QUEUED_RESTART = /etc/init.d/freeside restart
+
 #---
 
 #not changable yet
@@ -43,8 +48,11 @@ docs:
        make ${TEMPLATE}docs
 
 install-docs: docs
-       [ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S`
+       [ -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}
+       [ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL} || true
+       [ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
+       [ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
 
 perl-modules:
        cd FS; \
@@ -58,13 +66,14 @@ install-perl-modules: perl-modules
 install: install-perl-modules install-docs
 
 deploy: install
-       /etc/init.d/apache restart
+       ${HTTPD_RESTART}
+       ${QUEUED_RESTART}
 
 create-database:
-       perl -e 'use DBIx::DataSource qw( create_database ); create_database( \'${DATASOURCE}\', \'${DB_USER}\', \'${DB_PASSWORD}\' ) or die $DBIx::DataSource::errstr;'
+       perl -e 'use DBIx::DataSource qw( create_database ); create_database( "${DATASOURCE}", "${DB_USER}", "${DB_PASSWORD}" ) or die $$DBIx::DataSource::errstr;'
 
 create-config: install-perl-modules
-       [ -e ${FREESIDE_CONF} ] || mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S`
+       [ -e ${FREESIDE_CONF} ] && mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S` || true
        mkdir ${FREESIDE_CONF}
        chown freeside ${FREESIDE_CONF}
 
@@ -77,7 +86,7 @@ create-config: install-perl-modules
        chown freeside ${FREESIDE_CONF}/secrets
 
        mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
-       cp conf/* "${FREESIDE_CONF}/conf.${DATASOURCE}"
+       cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
        chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
 
        mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"