summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan>2008-08-07 22:30:38 +0000
committerivan <ivan>2008-08-07 22:30:38 +0000
commitb2474be9902af86b59b8e581de4609dee136264b (patch)
treefc0db3aeb0b8d21d6e7a4e589f716ffd6f9245da
parent76a3cde225266fb8646f8cd9281fae1658933bc9 (diff)
don't generate a new key on install-selfservice if there's already an RSA one either
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
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" ;\