--- alx-src/branches/alx-web-050/generate-and-import-server-key.sh	2010/12/02 21:16:58	1605
+++ alx-src/branches/alx-web-050/generate-and-import-server-key.sh	2010/12/03 00:03:21	1611
@@ -9,16 +9,19 @@
 WEBSERVER_GROUP="apache"
 WEBSERVER_USER_HOME="/var/lib/${WEBSERVER_USER}"
 
-for i in id_dsa id_dsa.pub
+ENCRYPTION="dsa"
+
+for i in id_${ENCRYPTION} id_${ENCRYPTION}.pub
 do
 	[[ -e ${WEBSERVER_USER_HOME}/.ssh/${i} ]] && rm ${WEBSERVER_USER_HOME}/.ssh/${i}
 done
 
-echo "Generating dsa key ..."
-install -d ${WEBSERVER_USER_HOME}/.ssh
-ssh-keygen -t dsa -q -f ${WEBSERVER_USER_HOME}/.ssh/id_dsa -P ""
+echo "Generating ${ENCRYPTION} key ..."
+install -o ${WEBSERVER_USER} -g ${WEBSERVER_GROUP} -d ${WEBSERVER_USER_HOME}/.ssh
+# run ssh keygen as target user
+su - ${WEBSERVER_USER} -c "ssh-keygen -t ${ENCRYPTION} -q -f ${WEBSERVER_USER_HOME}/.ssh/id_${ENCRYPTION} -P ''"
 
-public_key="$(< ${WEBSERVER_USER_HOME}/.ssh/id_dsa.pub)"
+public_key="$(< ${WEBSERVER_USER_HOME}/.ssh/id_${ENCRYPTION}.pub)"
 
 SQL_COMMAND="insert into ssh_auth_server(id,public_key) values('1','${public_key}') on duplicate key update public_key='${public_key}'"