[freeside-commits] freeside Makefile,1.145.2.16,1.145.2.17

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside
In directory wavetail.420.am:/tmp/cvs-serv16569

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	Makefile 
Log Message:
don't generate a new key on install-selfservice if there's already an RSA one either

Index: Makefile
===================================================================
RCS file: /home/cvs/cvsroot/freeside/Makefile,v
retrieving revision 1.145.2.16
retrieving revision 1.145.2.17
diff -u -d -r1.145.2.16 -r1.145.2.17
--- Makefile	20 Jun 2008 03:13:14 -0000	1.145.2.16
+++ Makefile	7 Aug 2008 22:30:27 -0000	1.145.2.17
@@ -244,7 +244,7 @@
 
 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" ;\