X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=71fb13e587d80df1e6157f2e7351878a690801a0;hb=81bf444ccd0787b8e1bd09cddcd94fbc9378aa93;hp=312609afd38f9875f99377161546163245829d9f;hpb=a8989c556a7a1951a0b34942c6289f26395859d7;p=freeside.git

diff --git a/Makefile b/Makefile
index 312609afd..71fb13e58 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,9 @@ TEMPLATE = asp
 
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 
+HTTPD_RESTART = /etc/init.d/apache restart
+QUEUED_RESTART = /etc/init.d/freeside restart
+
 #---
 
 #not changable yet
@@ -58,13 +61,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`
 	mkdir ${FREESIDE_CONF}
 	chown freeside ${FREESIDE_CONF}
 
@@ -77,7 +81,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}"