X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=a37c7e4c9a804344bc990914f0ab080602f7cf5a;hp=42dba360fdcb8d588d159013148ea284dc68debd;hb=e7f710ddb61d308bf6b7d6f5a918924f24f9bf66;hpb=a5d29a11e284cbe0283e5a104b1c87189edc85c0

diff --git a/Makefile b/Makefile
index 42dba360f..a37c7e4c9 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,8 @@ QUEUED_USER=fs_queue
 FREESIDE_PATH = `pwd`
 
 SELFSERVICE_USER = fs_selfservice
-SELFSERVICE_MACHINE = localhost
+SELFSERVICE_MACHINES = localhost
+# SELFSERVICE_MACHINES = web1.example.com web2.example.com
 
 #---
 
@@ -137,7 +138,7 @@ install-init:
 	  s/%%%QUEUED_USER%%%/${QUEUED_USER}/g;\
 	  s'%%%FREESIDE_PATH%%%'${FREESIDE_PATH}'g;\
 	  s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
-	  s/%%%SELFSERVICE_MACHINE%%%/${SELFSERVICE_MACHINE}/g;\
+	  s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\
 	" ${INIT_FILE}
 
 install: install-perl-modules install-docs install-init
@@ -151,8 +152,7 @@ create-database:
 
 create-config: install-perl-modules
 	[ -e ${FREESIDE_CONF} ] && mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S` || true
-	mkdir ${FREESIDE_CONF}
-	chown freeside ${FREESIDE_CONF}
+	install -d -o freeside ${FREESIDE_CONF}
 
 	touch ${FREESIDE_CONF}/secrets
 	chown freeside ${FREESIDE_CONF}/secrets
@@ -164,7 +164,8 @@ create-config: install-perl-modules
 
 	mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
 	rm -rf conf/registries #old dirs just won't go away
-	cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
+	#cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
+	cp `ls -d conf/[a-z]* | grep -v CVS` "${FREESIDE_CONF}/conf.${DATASOURCE}"
 	chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
 
 	mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"