Updating installer to do things in a more logical order.

Author: Josh Gachnang

install-wordpress.sh

@@ -25,40 +25,35 @@ randpass() {
     RET=`cat /dev/urandom | tr -cd "$CHAR" | head -c ${1:-16}`
 }
 
-INSTALL_DIR="/var/www/$1/htdocs"
-mkdir -p $INSTALL_DIR
-cd $INSTALL_DIR
-
 #Generate all required random passwords/salt/hashes
 randpass
 DB_PASS=$RET
 randpass
 USER_PASS=$RET
 
+#Make user and group
+useradd $DOMAIN_NAME
+echo $USER_PASS > tmp
+echo $USER_PASS >> tmp
+passwd $DOMAIN_NAME < tmp
+rm tmp
+
 #Sanitize domain name to take out periods
 DOMAIN_NAME=$(echo $1 | sed "s/\./__/")
 
+INSTALL_DIR="/home/$DOMAIN_NAME/wordpress"
+mkdir -p $INSTALL_DIR
+cd $INSTALL_DIR
+
 #Get latest version, delete old version
 rm latest.*
 wget http://wordpress.org/latest.tar.gz
 
 #Extract to web directory
 tar xf latest*
-mv wordpress/* .
+mv wordpress/* /home/$DOMAIN_NAME/wordpress/
 rm -rf wordpress/
 
-#Make user and group
-useradd $DOMAIN_NAME
-groupadd $DOMAIN_NAME
-echo $USER_PASS > tmp
-echo $USER_PASS >> tmp
-passwd $DOMAIN_NAME < tmp
-usermod -g $DOMAIN_NAME $DOMAIN_NAME
-
-#chown and chgrp entire directory to new user
-chown -R $DOMAIN_NAME *
-chgrp -R $DOMAIN_NAME *
-
 #change permissions (not necessary so far)
 
 #Create Database and Database user
@@ -68,7 +63,6 @@ FLUSH PRIVILEGES;
 EXIT;" > input
 mysql --user=root --password=$2 < input > output.tab
 
-
 #Make config.php file
 echo "<?php
 /**