Improve setup scripts all around

Author: vthunder

README.md

@@ -40,14 +40,11 @@ Note that the <code>scripts/bootstrap.sh</code> script calls these for
 you. But if something goes wrong / you want to know more:
 
 * <code>scripts/bootstrap_server_ubuntu.sh</code>: Will configure an
-  Ubuntu 12 server (install packages and enable apache modules, etc).
-
-* <code>scripts/bootstrap_mysql.sh</code>: Creates a database and user
-  with specified password. Use these values in your
-  <code>wp-config-local.php</code> file (see below).
+  Ubuntu 12 server (install packages, set up apache, set up
+  mysql). Should be run as root.
 
 * <code>scripts/bootstrap_checkout.sh</code>: Sets up this checkout by
   downloading git submodules, creating a virtual Python environment,
-  etc.
+  etc. Should be run as this user (does not touch system files).
 
 Happy hacking!

required_packages.txt

@@ -0,0 +1,16 @@
+apache2
+python-virtualenv
+python-pip
+gcc
+python-dev
+libxml2
+libxml2-dev
+libxslt1.1
+libxslt-dev
+php5
+php5-mysql
+python-librdf
+libapache2-mod-fcgid
+libapache2-mod-macro
+mysql-server
+mysql-client

scripts/bootstrap.sh

@@ -1,18 +1,12 @@
-#!/bin/sh
+#!/bin/bash
+
+TOPDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 
 function usage {
-    echo "Usage: $0 <hostname> <db> <dbuser>"
+    echo "Usage: $0 <hostname>
     exit 1
 }
+[ -z "$1" ] && usage;
 
-[ -z "$3" ] && usage;
-
-HOSTNAME=${1}
-DB=${2}
-DBUSER=${3}
-
-TOPDIR="$( cd "$( dirname "${BASH_SOURCE[0]}/.." )" && pwd )"
-
-sudo ${TOPDIR}/scripts/bootstrap_server_ubuntu.sh
-${TOPDIR}/scripts/bootstrap_mysql.sh "${DB}" "${DBUSER}"
+sudo ${TOPDIR}/scripts/bootstrap_server_ubuntu.sh ${1}
 ${TOPDIR}/scripts/bootstrap_checkout.sh

scripts/bootstrap_checkout.sh

@@ -1,7 +1,10 @@
 #!/bin/bash
 
 CUR=`pwd`
-TOPDIR="$( cd "$( dirname "${BASH_SOURCE[0]}/.." )" && pwd )"
+TOPDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
+
+echo ${TOPDIR}
+exit
 
 cd ${TOPDIR}
 

scripts/bootstrap_mysql.sh

@@ -1,14 +1,30 @@
-#!/bin/sh
+#!/bin/bash
+
+TOPDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 
 HOSTNAME=${1:-creativecommons.org}
-TOPDIR="$( cd "$( dirname "${BASH_SOURCE[0]}/.." )" && pwd )"
+DBNAME=${2:-wordpress}
+DBUSER=${3:-dbuser}
+DBPASS=${4:-}
 
-apt-get -y install apache2 python-virtualenv python-pip gcc python-dev libxml2 libxml2-dev libxslt1.1 libxslt-dev php5 php5-mysql python-librdf libapache2-mod-fcgid libapache-mod-macro mysql-server mysql-client
+#
+# Install base system dependencies
+#
 
-for i in macro php5 rewrite ssl fcgid
-do
-    a2enmod $i
-done
+apt-get update
+if apt-get -y install `cat ${TOPDIR}/required_packages.txt`
+then
+    echo "Required packages installed, proceeding with setup."
+else
+    echo "Could not install required packages, aborting setup."
+    exit 1
+fi
+
+#
+# Configure Apache:
+#
+
+# 1. Copy config files into place
 
 if grep -q "apache.conf" /etc/apache2/httpd.conf
 then
@@ -33,10 +49,32 @@ cat <<EOF > /etc/apache2/sites-available/${HOSTNAME}
 </VirtualHost>
 EOF
 
+# 2. Create logging directory
+
 mkdir /var/log/apache2/${HOSTNAME}
 chown root.adm /var/log/apache2/${HOSTNAME}
 chmod 750 /var/log/apache2/${HOSTNAME}
 
+# 3. Enable mods and site
+
+for i in macro php5 rewrite ssl fcgid
+do
+    a2enmod $i
+done
+
 a2ensite ${HOSTNAME}
 
+# 4. Restart Apache
+
 service apache2 restart
+
+#
+# Create a MySQL DB for WordPress
+#
+
+echo "Enter the MySQL root password:"
+mysql -u root -p mysql <<EOF
+CREATE DATABASE ${DBNAME};
+CREATE USER '${DBUSER}'@'localhost' IDENTIFIED BY '${DBPASS}';
+GRANT ALL PRIVILEGES ON *.* TO '${DBUSER}'@'localhost' WITH GRANT OPTION;
+EOF