summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan>2008-08-07 22:30:27 +0000
committerivan <ivan>2008-08-07 22:30:27 +0000
commitfc0459d378215240457d86bd0184ef9ce49ea393 (patch)
tree9b1bf19867cc05a0d1f7c7d807420f0109d5e53f
parent4b0c92f4651554d81436f09fb67cee3e953c5efc (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 5d68cbca8..2adebb1ad 100644
--- a/Makefile
+++ b/Makefile
@@ -244,7 +244,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" ;\