X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=0bd47041253159ee33c2977100081678c54d522e;hb=06dd1a24c0d4ada0daa55da9129278f7ccc935d3;hp=2ad1915aca291965721fe2a5c3928ef62aa3876a;hpb=9a90f2af0663c9b4e9611e044fd25349425d1aec;p=freeside.git

diff --git a/Makefile b/Makefile
index 2ad1915ac..0bd470412 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@
 #solaris and perhaps other very weirdass /bin/sh
 #SHELL="/bin/ksh"
 
-#DB_TYPE = Pg
-DB_TYPE = mysql
+DB_TYPE = Pg
+#DB_TYPE = mysql
 
 DB_USER = freeside
 DB_PASSWORD=
@@ -252,7 +252,7 @@ install-apache:
 
 install-selfservice:
 	[ -e ~freeside ] || cp -pr /etc/skel ~freeside && chown -R freeside ~freeside
-	[ -e ~freeside/.ssh/id_dsa.pub ] || su - freeside -c 'ssh-keygen -t dsa'
+	[ -e ~freeside/.ssh/id_dsa.pub ] || [ -e ~freeside/.ssh/id_rsa.pub ] || su - freeside -c 'ssh-keygen -t dsa'
 	for MACHINE in ${SELFSERVICE_MACHINES}; do \
 	  scp -r fs_selfservice/FS-SelfService ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\
@@ -313,6 +313,12 @@ create-config: install-perl-modules
 	mkdir "${FREESIDE_EXPORT}/export.${DATASOURCE}"
 	chown freeside "${FREESIDE_EXPORT}/export.${DATASOURCE}"
 
+	#install this for freeside-setup
+	install -d $(DIST_CONF)
+	#install conf/[a-z]* $(DEFAULT_CONF)
+	#CVS is not [a-z]
+	install `ls -d conf/[a-z]* | grep -v CVS` $(DIST_CONF)
+
 configure-rt:
 	cd rt; \
 	cp config.layout.in config.layout; \