Fix a typo in bootstrap.sh; make bootstrap work if ssl keys aren't in place, or if script is re-run

Author: vthunder

README.md

@@ -15,10 +15,22 @@ manually configure a few things:
 
 1. Edit <code>docroot/wp-config-local.php</code> and fill in values as
    needed by WordPress.
-2. Set up SSL keys in /etc/ssl/*
-3. Edit /etc/apache2/sites-available/(hostname) if needed (e.g. to
-   change SSL key locations)
-4. Load DB data from another WordPress install (see below)
+2. Set up SSL keys in /etc/ssl/private. If there isn't a key for the
+   hostname being set-up, then the Apache config will not include an
+   SSL virtual host. Simply re-run the setup script if you add a key.
+3. If desired, load DB data from another WordPress install (see below)
+
+### Editing the Apache config
+
+If you need to edit the Apache config, the files are:
+
+* <code>apache.conf</code>: CC Apache config in macro form.
+* <code>/etc/apache2/httpd.conf</code>: Includes the
+  <code>apache.conf</code> file in this checkout.
+* <code>/etc/apache2/sites-available/<hostname></code>: Virtual host
+  definition which uses a macro defined in <code>apache.conf</code> to
+  pull in a lot of rules and settings. This file gets overwritten by
+  the setup script, so if you edit it, do not run it again.
 
 ### Loading DB data
 

scripts/bootstrap.sh

@@ -3,7 +3,7 @@
 TOPDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 
 function usage {
-    echo "Usage: $0 <hostname>
+    echo "Usage: $0 <hostname>"
     exit 1
 }
 [ -z "$1" ] && usage;

scripts/bootstrap_server_ubuntu.sh

@@ -36,22 +36,27 @@ else
 fi
 
 cat <<EOF > /etc/apache2/sites-available/${HOSTNAME}
-<VirtualHost *:8080>
+<VirtualHost ${HOSTNAME}:8080>
     Use CCVHost ${HOSTNAME} http ${TOPDIR} /var/log/apache2/${HOSTNAME}
 </VirtualHost>
+EOF
 
-<VirtualHost *:443>
+if [ -f /etc/ssl/private/${HOSTNAME}.key ]
+then
+    cat <<EOF >> /etc/apache2/sites-available/${HOSTNAME}
+<VirtualHost ${HOSTNAME}:443>
     Use CCVHost ${HOSTNAME} https ${TOPDIR} /var/log/apache2/${HOSTNAME}
     SSLEngine on
     SSLCertificateFile /etc/ssl/private/${HOSTNAME}.crt
     SSLCertificateKeyFile /etc/ssl/private/${HOSTNAME}.key
     SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA_bundle.pem
 </VirtualHost>
 EOF
+fi
 
 # 2. Create logging directory
 
-mkdir /var/log/apache2/${HOSTNAME}
+mkdir -p /var/log/apache2/${HOSTNAME}
 chown root.adm /var/log/apache2/${HOSTNAME}
 chmod 750 /var/log/apache2/${HOSTNAME}
 
@@ -74,7 +79,6 @@ service apache2 restart
 
 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;
+CREATE DATABASE IF NOT EXISTS ${DBNAME};
+GRANT ALL ON ${DBNAME} TO '${DBUSER}'@'localhost' IDENTIFIED BY '${DBPASS}';
 EOF