From: ivan <ivan>
Date: Thu, 7 Aug 2008 22:30:38 +0000 (+0000)
Subject: don't generate a new key on install-selfservice if there's already an RSA one either
X-Git-Tag: root_of_webpay_support~442
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=b2474be9902af86b59b8e581de4609dee136264b

don't generate a new key on install-selfservice if there's already an RSA one either
---

diff --git a/Makefile b/Makefile
index ae389f949..f29769f86 100644
--- a/Makefile
+++ b/Makefile
@@ -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" ;\