better setup script; easier setup instructions

Author: vthunder

README.md

@@ -1,44 +1,49 @@
 # CC WordPress 2013
 
-Sample Apache config file, place in /etc/apache* and tweak the paths
-as needed:
+## Set-up
 
-    Include /var/www/creativecommons.org/apache.conf
-    
-    <VirtualHost *:8080>
-        Use CCVHost creativecommons.org http /var/www/creativecommons.org /var/log/apache2/creativecommons.org
-	UseCanonicalName On
-    </VirtualHost>
-    
-    <VirtualHost *:443>
-        Use CCVHost creativecommons.org https /var/www/creativecommons.org /var/log/apache2/creativecommons.org
-	UseCanonicalName On
-        SSLEngine on
-        SSLCertificateFile /etc/ssl/private/creativecommons.org.crt
-        SSLCertificateKeyFile /etc/ssl/private/creativecommons.org.key
-        SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA_bundle.pem
-    </VirtualHost>
+There are some handy setup scripts in the <code>scripts</code>
+directory. On a fresh Ubuntu 12 server, you should only need to run
+<code>scripts/bootstrap.sh</code>, which calls other scripts to set
+most things up. See below for some details on the other scripts.
+
+You'll still need to 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)
 
-The <code>UseCanonicalName</code> option forces URLs to redirect to
-the canonical host name, you can remove it if you want to use other
-names to access the site (e.g., an Amazon EC2 hostname before you get
-DNS set-up).
+### Loading DB data
 
+If you want to import DB data from another WordPress install, use the
+<code>mysqldump</code> / <code>mysql</code> utilities to create a
+backup and restore it here:
+
+    # on the source machine:
+    mysqldump -u root dbname | gzip > backup.sql.gz
+    
+    # ... copy (eg. with scp) ...
+    
+    # then on this machine:
+    zcat backup.sql.gz | mysql -u root -p dbname
 
+### Bootstrap scripts (details)
 
-You'll need the <code>macro</code> Apache module. On Debian-like systems you can try:
+Note that the <code>scripts/bootstrap.sh</code> script calls these for
+you. But if something goes wrong / you want to know more:
 
-    apt-get install libapache2-mod-macro
-    a2enmod macro
+* <code>scripts/bootstrap_server_ubuntu.sh</code>: Will configure an
+  Ubuntu 12 server (install packages and enable apache modules, etc).
 
-There is a setup script, <code>server_bootstrap.sh</code>, in this
-checkout, it primarily sets up the python environment. It should "just
-work", but if it doesn't then give it a read. It requires some basic
-Python utilities like <code>virtualenv</code> and <code>pip</code>.
+* <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).
 
-To configure WordPress, there is a sample config file at
-<code>docroot/wp-config-local.php.sample</code>, copy it to
-<code>docroot/wp-config-local.php</code> and fill in the information
-as needed by the WP install.
+* <code>scripts/bootstrap_checkout.sh</code>: Sets up this checkout by
+  downloading git submodules, creating a virtual Python environment,
+  etc.
 
 Happy hacking!

apache.conf

@@ -17,6 +17,10 @@
 
     Options +ExecCGI
 
+    # Redirect users to ${host} if they used something else
+    # (e.g. www.${host}, etc).
+    UseCanonicalName On
+
     <Location /licenses>
         DirectoryIndex deed
         DefaultType text/html

scripts/bootstrap.sh

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

server_bootstrap.sh renamed to scripts/bootstrap_checkout.sh

@@ -1,16 +1,16 @@
 #!/bin/bash
 
 CUR=`pwd`
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+TOPDIR="$( cd "$( dirname "${BASH_SOURCE[0]}/.." )" && pwd )"
 
-cd ${DIR}
+cd ${TOPDIR}
 
 git submodule init
 git submodule update
 
 cd python_env
 
-sed -e "s|@env_dir@|${DIR}/python_env|" < bin/ccengine.fcgi.in > bin/ccengine.fcgi
+sed -e "s|@env_dir@|${TOPDIR}/python_env|" < bin/ccengine.fcgi.in > bin/ccengine.fcgi
 chmod 755 bin/ccengine.fcgi
 
 virtualenv .

scripts/bootstrap_mysql.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+function usage() {
+    echo "Usage: $0 <new-database> <new-user>"
+    exit 1
+}
+
+[ -z "$1" ] && usage;
+[ -z "$2" ] && usage;
+
+mysql -u root -p mysql <<EOF
+create database $1
+create user '$2'@'localhost' identified by 'password';
+grant all privileges on *.* to '$2'@'localhost' with grant option;
+EOF

scripts/bootstrap_server_ubuntu.sh

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+HOSTNAME=${1:-creativecommons.org}
+TOPDIR="$( cd "$( dirname "${BASH_SOURCE[0]}/.." )" && pwd )"
+
+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
+
+for i in macro php5 rewrite ssl fcgid
+do
+    a2enmod $i
+done
+
+if grep -q "apache.conf" /etc/apache2/httpd.conf
+then
+    echo "Note: /etc/apache2/httpd.conf seems to be loading an apache.conf file,"
+    echo "leaving it alone. If that's not the CC apache.conf file, then you'll"
+    echo "need to add the Include line manually."
+else
+    echo "Include ${TOPDIR}/apache.conf" >> /etc/apache2/httpd.conf
+fi
+
+cat <<EOF > /etc/apache2/sites-available/${HOSTNAME}
+<VirtualHost *:8080>
+    Use CCVHost ${HOSTNAME} http ${TOPDIR} /var/log/apache2/${HOSTNAME}
+</VirtualHost>
+
+<VirtualHost *: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
+
+mkdir /var/log/apache2/${HOSTNAME}
+chown root.adm /var/log/apache2/${HOSTNAME}
+chmod 750 /var/log/apache2/${HOSTNAME}
+
+a2ensite ${HOSTNAME}
+
+service apache2 restart