[freeside-commits] branch master updated. ff27ffb0342e4d630a9426a998ffe76de9d6ed8c

Ivan ivan at 420.am
Wed Oct 22 23:04:24 PDT 2014


The branch, master has been updated
       via  ff27ffb0342e4d630a9426a998ffe76de9d6ed8c (commit)
      from  f84f4970c03fa01779fc94cdc9dbada9f314b0cc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ff27ffb0342e4d630a9426a998ffe76de9d6ed8c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Oct 22 23:04:23 2014 -0700

    no dsa keys

diff --git a/Makefile b/Makefile
index b2eb869..271a361 100644
--- a/Makefile
+++ b/Makefile
@@ -296,13 +296,13 @@ install-apache:
 
 install-selfservice:
 	[ -e ~freeside ] || cp -pr /etc/skel ~freeside && chown -R freeside ~freeside
-	[ -e ~freeside/.ssh/id_dsa.pub ] || [ -e ~freeside/.ssh/id_rsa.pub ] || su - freeside -c 'ssh-keygen -t dsa'
+	[ -e ~freeside/.ssh/id_rsa.pub ] || su - freeside -c 'ssh-keygen'
 	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" ;\
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
-	  scp ~freeside/.ssh/id_dsa.pub ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\
-	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -d -o freeside -m 755 ~freeside/.ssh/; sudo install -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\
+	  scp ~freeside/.ssh/id_rsa.pub ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\
+	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -d -o freeside -m 755 ~freeside/.ssh/; sudo install -o freeside -m 600 ./id_rsa.pub ~freeside/.ssh/authorized_keys" ;\
 	   ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo install -o freeside -d /usr/local/freeside" ;\
 	done
 

-----------------------------------------------------------------------

Summary of changes:
 Makefile |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)




More information about the freeside-commits mailing list