--- alx-src/branches/alx-web-050/generate-and-import-server-key.sh	2010/12/02 21:12:20	1604
+++ alx-src/branches/alx-web-050/generate-and-import-server-key.sh	2010/12/02 21:16:58	1605
@@ -1,19 +1,21 @@
 #!/bin/bash
 
-SQL_DB="alx-web"
-SQL_HOST="localhost"
-SQL_USER="alx_install"
-SQL_PASS="@lx"
+SQL_DB='alx_web'
+SQL_HOST='localhost'
+SQL_USER='alx_install'
+SQL_PASS='@lx'
 
 WEBSERVER_USER="apache"
 WEBSERVER_GROUP="apache"
 WEBSERVER_USER_HOME="/var/lib/${WEBSERVER_USER}"
 
-[[ -e id_dsa ]] && rm id_dsa
-[[ -e id_dsa.pub ]] && rm id_dsa.pub
+for i in id_dsa id_dsa.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
+install -d ${WEBSERVER_USER_HOME}/.ssh
 ssh-keygen -t dsa -q -f ${WEBSERVER_USER_HOME}/.ssh/id_dsa -P ""
 
 public_key="$(< ${WEBSERVER_USER_HOME}/.ssh/id_dsa.pub)"