improved svc_acct replacement

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index f3fa1e1..677dea9 100644 (file)
--- 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
@@ -43,7 +46,7 @@ docs:
        make ${TEMPLATE}docs
 
 install-docs: docs
-       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`
        cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
 
 perl-modules:
@@ -58,31 +61,36 @@ 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;'
 
 create-config: install-perl-modules
-       [ -d ${FREESIDE_CONF} ] || mkdir ${FREESIDE_CONF}
+       [ -e ${FREESIDE_CONF} ] && mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S`
+       mkdir ${FREESIDE_CONF}
        chown freeside ${FREESIDE_CONF}
 
+       touch ${FREESIDE_CONF}/secrets
+       chown freeside ${FREESIDE_CONF}/secrets
+       chmod 600 ${FREESIDE_CONF}/secrets
+
        echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets
+       chmod 600 ${FREESIDE_CONF}/secrets
+       chown freeside ${FREESIDE_CONF}/secrets
 
-       [ -d "${FREESIDE_CONF}/conf.${DATASOURCE}" ] \
-         || mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
-       chown freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
+       mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
+       cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
+       chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
 
-       [ -d "${FREESIDE_CONF}/counters.${DATASOURCE}" ] \
-         || mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"
+       mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"
        chown freeside "${FREESIDE_CONF}/counters.${DATASOURCE}"
 
-       [ -d "${FREESIDE_CONF}/cache.${DATASOURCE}" ] \
-         || mkdir "${FREESIDE_CONF}/cache.${DATASOURCE}"
+       mkdir "${FREESIDE_CONF}/cache.${DATASOURCE}"
        chown freeside "${FREESIDE_CONF}/cache.${DATASOURCE}"
 
-       [ -d "${FREESIDE_CONF}/export.${DATASOURCE}" ] \
-         || mkdir "${FREESIDE_CONF}/export.${DATASOURCE}"
+       mkdir "${FREESIDE_CONF}/export.${DATASOURCE}"
        chown freeside "${FREESIDE_CONF}/export.${DATASOURCE}"
 
 clean: