Merge lp:~marcoceppi/charms/precise/wordpress/apache-dog-pile into lp:charms/wordpress

[Marco Ceppi]

This is another pretty big merge, so to you who's reviewing - first thank you! Second, sorry. Third, I'm not really.

The primary purpose of this merge is to add Apache2 as a web engine for organizations/people who don't trust nginx yet. This adds the "engine" configuration option with either a value of "nginx" or "apache2". Scale-out peer relation still works. To best test this deploy wp and mysql, enable debug config option, check /_debug/info.php - make sure nginx is the server software, change engine, wait for about 5 mins, check info.php for apache.

Other changes
- Using charm-helper-bash/vcs now, opens up support for hg and svn wp-content, better git/bzr support
- Removed default wp-content config value, it should have been an example, not the default
- Copyright fixes
- Added support for arbitrarily building the files from loadbalancer relation via loadbalancer-rebuild in hooks
- website relation now pushes port 8080 instead, making this charm compatible with other proxy charms if the user wants to not use the peer lb

I'm still testing support for upgrading from current version to this version via upgrade charm and any negative impacts from this. Preliminary research shows that this won't break existing installs.

[lp:~marcoceppi/charms/precise/wordpress/apache-dog-pile]

67. By Marco Ceppi on 2012-12-11

Don't need to listen on 80

68. By Marco Ceppi on 2012-12-11

Make sure sed expands shell variable

69. By Marco Ceppi on 2012-12-11

Enable multiverse for the apache2 stuff

70. By Marco Ceppi on 2012-12-11

Backwards compat fix

71. By Marco Ceppi on 2012-12-11

Use the restart hook

[Mark Mims (mark-mims)]

multiple units are failing... tried this two ways: add-unit to existing running stack as well as deploy multiple units up front.

units come up in configure-error

I'll attach logs from one of the units.

review: Needs Fixing

[Mark Mims (mark-mims)]

> multiple units are failing... tried this two ways: add-unit to existing
> running stack as well as deploy multiple units up front.
>
> units come up in configure-error
>
> I'll attach logs from one of the units.

ok, maybe not... pasting logs: http://paste.ubuntu.com/1426284/

[lp:~marcoceppi/charms/precise/wordpress/apache-dog-pile]

72. By Marco Ceppi on 2012-12-12

Server lines need a ';' and when loading from cache need to strip() results

[Marco Ceppi (marcoceppi)]

Thanks, not sure how this got overlooked. It's repaired now!

[Mark Mims (mark-mims)]

nother spin now

[Mark Mims (mark-mims)]

bit a show-stopper... just a note
------------------8<-----------------------

little bit of a problem with the way loadbalancer is called...

here's the situation:

bootstrap
deploy mysql
deploy wordpress wp -n7
add-relation wp mysql
...time...
juju set engine=apache2

all the instances reconfigure to apache instead of nginx, but the loadbalancer relations aren't called again, so the instances are all just passthrough.

------------------8<-----------------------

[Mark Mims (mark-mims)]

_not_ a show-stopper... just a note

> ------------------8<-----------------------
>
> little bit of a problem with the way loadbalancer is called...
>
> here's the situation:
>
> bootstrap
> deploy mysql
> deploy wordpress wp -n7
> add-relation wp mysql
> ...time...
> juju set engine=apache2
>
> all the instances reconfigure to apache instead of nginx, but the loadbalancer
> relations aren't called again, so the instances are all just passthrough.
>
>
> ------------------8<-----------------------

[lp:~marcoceppi/charms/precise/wordpress/apache-dog-pile]

73. By Marco Ceppi on 2012-12-12

Fix to loadbalancer conf name for apache2

74. By Marco Ceppi on 2012-12-12

Fix to balancermember lines and conditional for nginx only memcached configuration

75. By Marco Ceppi on 2012-12-12

Enable proxy_balancer

76. By Marco Ceppi on 2012-12-12

Include proxy_http

77. By Marco Ceppi on 2012-12-13

proxy_http

78. By Marco Ceppi on 2012-12-13

Set the request header to make sure assets work properly

[Marco Ceppi (marcoceppi)]

Hi Mark,

Thanks for taking the time to look over this. Setting the engine should work at anytime as there's a loadbalancer-rebuild script which handles configuration changes. I've fixed that script to actually work and several other changes to make Apache2 loadbalanced match what occurs in Nginx. There are still improvements to be made for efficiency of Apache2 but I'll save that for a future MP.

[lp:~marcoceppi/charms/precise/wordpress/apache-dog-pile]

79. By Marco Ceppi on 2012-12-13

Preserve host

80. By Marco Ceppi on 2012-12-13

Make sure apache respects the canonical name for cookies and the like

81. By Marco Ceppi on 2012-12-13

Fix for secrety key and cookies

[Mark Mims (mark-mims)]

beauty man...

passed all my variations of engine switching with flying colors

thanks for taking the time to work through all this!

[Marco Ceppi (marcoceppi)]

Thank you so much for taking the time to walk through this big merge. New Years resolution: more managable merge proposals!

=== modified file 'README.md'
--- README.md	2012-08-31 15:56:54 +0000
+++ README.md	2012-12-13 18:15:24 +0000
@@ -113,6 +113,21 @@
 
 The debugging is disabled by default.
 
+## Engine
+
+By default the WordPress charm will install nginx and php5-fpm to serve pages. In the event you do not wish to use nginx - for whatever reason - you can switch to Apache2.
+This will provide a near identical workflow as if you were using nginx with one key difference: memcached. In nginx, the cached pages are served from memcached prior to
+hitting the php contents, this isn't possible with apache2. As such memcached support still works, since it falls back to the WordPress caching engine, but it's not as robust.
+Otherwise, Apache2 will still perform balancing and everything else mentioned above. You can switch between engines at will with the following:
+
+    juju set wordpress engine=apache2
+
+Then back to nginx:
+
+    juju set wordpress engine=nginx
+
+Any other value will result in the default (nginx) being used.
+
 # Caveats
 
 ## HP Cloud
@@ -146,7 +161,7 @@
 
     juju add-unit -n3 wordpress
 
-## I want more caching, I want MEMCACHING!
+## I want more caching, I want MEMCACH(ED)ING!
 
 Why not? We could ALL use more caching. Deploy a memcached server and relate it to your WordPress service to add memcache caching. This will 
 automagically install [WP-FFPC](http://wordpress.org/extend/plugins/wp-ffpc/) (regardless of your tuning settings) and configure it to cache 
@@ -159,6 +174,9 @@
     
 This setup will also synchronize the flushing of cache across all WordPress nodes, making it ideal to avoid stale caches.
 
+A small note, when using the Apache2 engine and memcache, all request will still be sent to WordPress via Apache where typical caching 
+procedures will take place and wp-ffpc will render the memcached page.
+
 ## I don't want to run three different machines for one WP install
 
 There is a "hack" that will allow you to deploy multiple full services to the same machine as the bootstrap node, this has nothing to do with

=== modified file 'config.yaml'
--- config.yaml	2012-08-15 20:58:31 +0000
+++ config.yaml	2012-12-13 18:15:24 +0000
@@ -3,24 +3,18 @@
     type: string
     default: "single"
     description: | 
-      This is the tuning level for the WordPress setup. There are three options: "bare", "single", and "optimized". 
-      "bare" will give you a nearly un-altered WordPress setup, as if you'd downloaded and set it up yourself. 
-      "single" will provide you with everything you need to run a singlular unit of WordPress. This doesn't take in to 
-        consideration that you'll be scaling at all. However, it will allow you to use WordPress free of any troubles and pesky 
-        limitations that typically happen during "optimized". While you _can_ scale out with this setting I encourage you read the README 
-      "optimized" will give you a hardened WordPress setup. Some of the features in the Admin panel will be locked down and theme edits/plugins 
-        can only be updated through he charm. This is the recommended setup for those who are in serious need of constant scaling. 
+      This is the tuning level for the WordPress setup. There are three options: "bare", "single", and "optimized". "bare" will give you a nearly un-altered WordPress setup, as if you'd downloaded and set it up yourself. "single" will provide you with everything you need to run a singlular unit of WordPress. This doesn't take in to consideration that you'll be scaling at all. However, it will allow you to use WordPress free of any troubles and pesky limitations that typically happen during "optimized". While you _can_ scale out with this setting I encourage you read the README "optimized" will give you a hardened WordPress setup. Some of the features in the Admin panel will be locked down and theme edits/plugins can only be updated through he charm. This is the recommended setup for those who are in serious need of constant scaling. 
   wp-content:
     type: string
-    default: "https://github.com/jujutools/wordpress-site.git"
+    default: ""
     description: | 
-      This is a full repository path to where the WordPress wp-contents can be found. At this time both Git and Bzr are
-      supported. An example of what a wp-content repository should look like can be found at http://github.com/jujutools/wordpress-site.
+      This is a full repository path to where the WordPress wp-contents can be found. At this time Git, BZR, SVN, and HG are supported. An example of what a wp-content repository should look like can be found at http://github.com/jujutools/wordpress-site.
   debug:
     type: string
     default: "no"
     description: |
-      Setting this option to "yes" will expose /_debug on all instances over HTTP. In the _debug folder are two scripts, info.php and apc.php. 
-      info.php will display the phpinfo information for that server while the apc.php will provide APC cache stats (as well as additional administrative 
-      options for APC).
-      
+      Setting this option to "yes" will expose /_debug on all instances over HTTP. In the _debug folder are two scripts, info.php and apc.php. info.php will display the phpinfo information for that server while the apc.php will provide APC cache stats (as well as additional administrative options for APC).
+  engine:
+    type: string
+    default: nginx
+    description: "Currently two web server engines are supported: nginx and apache. For the majority of deployments nginx will be the prefered choice. See the Readme for more details"

=== added directory 'files/charm/apache'
=== added file 'files/charm/apache/etc_apache2_conf-d_php5-fpm.conf'
--- files/charm/apache/etc_apache2_conf-d_php5-fpm.conf	1970-01-01 00:00:00 +0000
+++ files/charm/apache/etc_apache2_conf-d_php5-fpm.conf	2012-12-13 18:15:24 +0000
@@ -0,0 +1,6 @@
+<IfModule mod_fastcgi.c>
+	AddHandler php5-fcgi .php
+	Action php5-fcgi /php5-fcgi
+	Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
+	FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -socket /var/run/php5-fpm.sock -pass-header Authorization
+</IfModule>

=== added file 'files/charm/apache/etc_apache2_sites-enabled_loadbalancer'
--- files/charm/apache/etc_apache2_sites-enabled_loadbalancer	1970-01-01 00:00:00 +0000
+++ files/charm/apache/etc_apache2_sites-enabled_loadbalancer	2012-12-13 18:15:24 +0000
@@ -0,0 +1,21 @@
+## This is the standard apache configuration file, only serving over 80.
+## This will be re-written when loadbalancer-relation is run, creating
+## the proxy balancer setups, etc. Untill then there's not need to proxypass
+## to another apache virtual host 
+
+<VirtualHost *:80>
+  ServerName localhost
+  ServerAlias *
+  ServerAdmin webmaster@localhost
+
+  DocumentRoot /var/www
+  <Directory /var/www>
+    Options Indexes FollowSymLinks MultiViews
+    AllowOverride All
+  </Directory>
+
+  ErrorLog ${APACHE_LOG_DIR}/wordpress-error.log
+
+  LogLevel warn
+  CustomLog ${APACHE_LOG_DIR}/wordpress-access.log combined
+</VirtualHost>

=== added file 'files/charm/apache/etc_apache2_sites-enabled_wordpress'
--- files/charm/apache/etc_apache2_sites-enabled_wordpress	1970-01-01 00:00:00 +0000
+++ files/charm/apache/etc_apache2_sites-enabled_wordpress	2012-12-13 18:15:24 +0000
@@ -0,0 +1,20 @@
+Listen *:8080
+
+<VirtualHost *:8080>
+  ServerName localhost
+  ServerAlias *
+  ServerAdmin webmaster@localhost
+  
+  UseCanonicalName Off
+
+  DocumentRoot /var/www
+  <Directory /var/www>
+    Options Indexes FollowSymLinks MultiViews
+    AllowOverride All
+  </Directory>
+
+  ErrorLog ${APACHE_LOG_DIR}/wordpress-error.log
+
+  LogLevel warn
+  CustomLog ${APACHE_LOG_DIR}/wordpress-access.log combined
+</VirtualHost>

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2012-08-24 20:59:04 +0000
+++ hooks/config-changed	2012-12-13 18:15:24 +0000
@@ -4,13 +4,117 @@
 
 source inc/common
 
+## 
+# This is where things can get a bit hectic. So this long blog is just to
+# help preface what's going on here. When this hook fires it will always
+# try to re-configure the entire unit. It's like a GOD hook, triggering
+# or using data from every other hook with the exception of the install
+# and upgrade-charm hooks.
+#
+# First, get a bunch of configuration values. The idea being this is should 
+# be the only place that config-get is run as it's "unreliable" anywhere else
+# Data should then either be passed to functions or written down - you know
+# "YOU SHOULD ALWAYS LEAVE A NOTE!"
+#
+# From here, the web engine will either be updated or left alone. We always 
+# assume it's going to be nginx unless you specify apache. So if you put
+# "lighttpd" or "i love apache" you're going to get nginx, so don't do that.
+# Configuration files are re-written every time. This is to make sure that 
+# any changes to long running units overtime are included. It may seem 
+# expensive to keep re-writing the same files but in the end having all 
+# the units in a sane and identical state is worth it.
+#
+# Next, we do some small file moving around. Just for debug stuff.
+#
+# After that tuning levels are decided and executed. This is a bit more 
+# involved than just running a function, check inc/common for that craziness
+#
+# After that, it's time to get any user-defined content! do_vcs does that 
+# and a little more
+#
+# Caching stuff, basically "DO WE HAVE MEMCACHED, GOOD LETS DO CONFIG"
+#
+# Then we stop and start everything again and wait for the next round.
+##
+
 tuning_level=`config-get tuning`
+wp_content_repo=`config-get wp-content`
+expose_info=`config-get debug`
+engine=`config-get engine`
+unit_address=`unit-get private-address`
+
 # Make it lower case
 tuning_level=${tuning_level,,}
-
-wp_content_repo=`config-get wp-content`
-expose_info=`config-get debug`
 expose_info=${expose_info,,}
+engine=${engine,,}
+
+
+if [ "$engine" == "apache" ] || [ "$engine" == "apache2" ]; then
+	if [ -f .web-engine ]; then
+		web_engine=`cat .web-engine`
+		service $web_engine stop
+	fi
+	sed -i -e "s/# deb \(.*\) multiverse/deb \1 multiverse/g" /etc/apt/sources.list #for libapache2-mod-fastcgi
+	apt-get update
+	apt-get -y purge nginx
+	apt-get install -y apache2-mpm-worker libapache2-mod-fastcgi
+	service apache2 stop
+
+	rm -f /var/www/index.html
+
+	rm -f /etc/apache2/sites-enabled/*
+	a2enmod actions fastcgi alias proxy_balancer proxy_http headers
+
+	install -o root -g root -m 0644 files/charm/apache/etc_apache2_conf-d_php5-fpm.conf /etc/apache2/conf.d/php5-fpm.conf
+	
+	juju-log "Installing Apache loadbal config..."
+	install -o root -g root -m 0644 files/charm/apache/etc_apache2_sites-enabled_loadbalancer /etc/apache2/sites-available/loadbalancer
+	sed -i -e "s/^  ServerName .*/  ServerName ${unit_address}/" /etc/apache2/sites-available/loadbalancer
+	a2ensite loadbalancer
+	
+	juju-log "Installing Apache wordpress config..."
+	install -o root -g root -m 0644 files/charm/apache/etc_apache2_sites-enabled_wordpress /etc/apache2/sites-available/wordpress
+	a2ensite wordpress
+	
+	echo "apache2" > .web-engine
+else
+	if [ -f .web-engine ]; then
+		web_engine=`cat .web-engine`
+		service $web_engine stop
+	fi
+	apt-get -y purge apache2* libapache2*
+	apt-get install -y nginx
+	service nginx stop
+
+	juju-log "Cleaning any old or default nginx site configs ..."
+	rm -f /etc/nginx/sites-enabled/*
+	rm -f /etc/nginx/conf.d/*
+
+	juju-log "Installing nginx common config ..."
+	rm -f /etc/nginx/nginx.conf
+	install -o root -g root -m 0644 files/charm/nginx/etc_nginx_nginx.conf /etc/nginx/nginx.conf
+
+	juju-log "Installing nginx actual site config ..."
+	#rm -f /etc/nginx/sites-available/
+	install -o root -g root -m 0644 files/charm/nginx/etc_nginx_sites-enabled_wordpress /etc/nginx/sites-available/wordpress
+	ln -sf ../sites-available/wordpress /etc/nginx/sites-enabled/wordpress
+
+	juju-log "Installing nginx loadbal config ..."
+	rm -f /etc/nginx/sites-available/loadbalancer
+	install -o root -g root -m 0644 files/charm/nginx/etc_nginx_sites-enabled_loadbalancer /etc/nginx/sites-available/loadbalancer
+	ln -sf ../sites-available/loadbalancer /etc/nginx/sites-enabled/loadbalancer
+
+	juju-log "Moving nginx var dirs to /mnt storage ..."
+	rsync -az /var/lib/nginx /mnt/ && rm -rf /var/lib/nginx && ln -s /mnt/nginx /var/lib/
+
+	echo "nginx" > .web-engine
+fi
+
+# http://i.imgur.com/TUF91.gif
+hooks/loadbalancer-rebuild
+
+juju-log "Restarting Services ..."
+source hooks/restart
 
 if [ ! -f $config_file_path ]; then
 	juju-log "Nothing to configure, since nothing is installed"

=== modified file 'hooks/db-relation-changed'
--- hooks/db-relation-changed	2012-09-25 13:58:24 +0000
+++ hooks/db-relation-changed	2012-12-13 18:15:24 +0000
@@ -18,29 +18,20 @@
 host=`relation-get private-address`
 
 if [ -z "$database" ] ; then
-    exit 0
+	exit 0
 fi
 
-secret_key=`cat .wp-secret`
-
 source "/usr/share/charm-helper/sh/net.sh"
 
-##
-# OH COME ON WORDPRESS.ORG NO VALID SSL CERTIFICATE?
-# Psh, whatever, plain-text for now. #blamenacin
-# https://twitter.com/#!/marcoceppi/status/181570187655520260
-# I was wrong, we need to use something other than WGET, like cURL
-LATEST_WORDPRESS="https://wordpress.org/latest.tar.gz"
-DOWNLOAD=`ch_get_file "$LATEST_WORDPRESS" "https://wordpress.org/latest.tar.gz.sha1"`
-##
+payload=`ch_get_file "https://wordpress.org/latest.tar.gz" "https://wordpress.org/latest.tar.gz.sha1"`
 
-if [ ! -f "$DOWNLOAD" ] || [ -z "$DOWNLOAD" ]; then
-	juju-log "Failed to retrieve $LATEST_WORDPRESS"
+if [ ! -f "$payload" ] || [ -z "$payload" ]; then
+	juju-log "Failed to retrieve latest.tar.gz"
 	exit 1
 fi
 
-juju-log "Extract ALL THE FILES"
-tar -xzf $DOWNLOAD
+juju-log "Extract ALL THE FILES!"
+tar -xzf $payload
 
 mkdir -p $wp_install_path
 
@@ -50,6 +41,8 @@
 juju-log "Clean up"
 rm -rf wordpress
 
+secret_key=`cat .wp-secret`
+
 juju-log "Writing wordpress config file $config_file_path"
 # Write the wordpress config
 cat > $config_info_path <<EOF
@@ -101,10 +94,7 @@
 chown -R www-data.www-data $wp_install_path
 
 . hooks/config-changed
-
-# Restart nginx
-juju-log "Restarting nginx service"
-service nginx restart
+. hooks/restart
 
 # Make it publicly visible, once the wordpress service is exposed
 open-port 80/tcp

=== modified file 'hooks/install'
--- hooks/install	2012-09-26 23:30:54 +0000
+++ hooks/install	2012-12-13 18:15:24 +0000
@@ -3,15 +3,12 @@
 add-apt-repository ppa:charmers/charm-helpers
 apt-get update && apt-get -y upgrade
 
-apt-get -y install php5-memcache mysql-client pwgen nginx php5 php5-fpm \
+apt-get -y install php5-memcache mysql-client pwgen php5 php5-fpm \
 	php-apc mailutils php-mail sysstat php5-mysql php5-mcrypt php5-memcache \
-	charm-helper-sh php5-curl rsync nfs-common bzr git-core mktemp
+	charm-helper-sh php5-curl rsync nfs-common git-core mktemp
 
 modprobe nfs
 
-juju-log "Removing PHP Default Cron ..."
-rm -f /etc/cron.d/php5
-
 juju-log "Making /mnt/tmp dir ..."
 mkdir -p /mnt/tmp
 chmod 1777 /mnt/tmp
@@ -27,37 +24,15 @@
 mkdir -p /mnt/ramdisk/phpfpm-cache
 chmod -R 1777 /mnt/ramdisk
 
-juju-log "Cleaning any old or default nginx site configs ..."
-rm -f /etc/nginx/sites-enabled/*
-rm -f /etc/nginx/conf.d/*
-
-juju-log "Installing Nginx common config ..."
-rm -f /etc/nginx/nginx.conf
-install -o root -g root -m 0644 files/charm/nginx/etc_nginx_nginx.conf /etc/nginx/nginx.conf
-
-juju-log "Installing Nginx actual site config ..."
-#rm -f /etc/nginx/sites-available/
-install -o root -g root -m 0644 files/charm/nginx/etc_nginx_sites-enabled_wordpress /etc/nginx/sites-available/wordpress
-ln -sf ../sites-available/wordpress /etc/nginx/sites-enabled/wordpress
-
-juju-log "Installing Nginx loadbal config ..."
-rm -f /etc/nginx/sites-available/loadbalancer
-install -o root -g root -m 0644 files/charm/nginx/etc_nginx_sites-enabled_loadbalancer /etc/nginx/sites-available/loadbalancer
-ln -sf ../sites-available/loadbalancer /etc/nginx/sites-enabled/loadbalancer
-
 juju-log "Installing PHP-FPM pool configs ..."
 rm -f /etc/php5/fpm/pool.d/*
 install -o root -g root -m 0644 files/charm/php/php5-fpm_pool.d_www.conf /etc/php5/fpm/pool.d/www.conf
-
-juju-log "Moving PHP and Nginx var dirs to /mnt storage ..."
-rsync -az /var/lib/nginx /mnt/ && rm -rf /var/lib/nginx && ln -s /mnt/nginx /var/lib/
 rsync -az /var/lib/php5 /mnt/ && rm -rf /var/lib/php5 && ln -s /mnt/php5 /var/lib/
 
-juju-log "Restarting Services ..."
-source hooks/restart
-
 juju-log "Creating random secret key ..."
-pwgen -s 10 1 > .wp-secret
+if [ ! -f .wp-secret ]; then
+	pwgen -s 10 1 > .wp-secret
+fi
 
 juju-log "Installing wp-cli to make this charm's life a little easier ..."
 save_pwd=`pwd`

=== added symlink 'hooks/loadbalancer-rebuild'
=== target is u'loadbalancer-relation-joined'
=== modified file 'hooks/loadbalancer-relation-changed'
--- hooks/loadbalancer-relation-changed	2012-08-29 20:57:32 +0000
+++ hooks/loadbalancer-relation-changed	2012-12-13 18:15:24 +0000
@@ -1,4 +1,23 @@
 #!/bin/bash
+#
+#    loadbalancer-relation-changed - hook for when loadbalancer peer relation changes
+#
+#    Copyright (C) 2012  Marco Ceppi
+#    Author: Marco Ceppi <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 source inc/common
 
@@ -14,5 +33,5 @@
 
 if [ -f "$config_info_path" ]; then
 	secret_key=`cat .wp-secret`
-	sed -i -e "s/define\('SECRET_KEY',.*\);/define\('SECRET_KEY', '$secret_key'\)\;/" $config_info_path
+	sed -i -e "s/define('SECRET_KEY',.*/define('SECRET_KEY', '$secret_key')\;/" $config_info_path
 fi

=== modified file 'hooks/loadbalancer-relation-joined'
--- hooks/loadbalancer-relation-joined	2012-08-29 20:57:32 +0000
+++ hooks/loadbalancer-relation-joined	2012-12-13 18:15:24 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-#    reverseproxy-relation-changed - hook for when reverse proxy relation changes
+#    reverseproxy-relation-changed - hook for when proxy relation changes
 #
 #    Copyright (C) 2011  Canonical Ltd.
 #    Author: Clint Byrum <[e-mail]>
@@ -22,21 +22,64 @@
 import sys
 import os
 import subprocess
-import json
 import tempfile
-import glob
-
-from socket import getaddrinfo
-
-remote_unit = os.environ.get("JUJU_REMOTE_UNIT")
-
-service_name, _ = remote_unit.split("/")
-
-t1 = """# Generated by juju
+
+rebuild = os.path.basename(sys.argv[0]) == 'loadbalancer-rebuild'
+
+pa = subprocess.Popen(["unit-get", "private-address"], stdout=subprocess.PIPE, 
+    close_fds=True)
+unit_address = pa.stdout.read().strip()
+
+try:
+    with open('.web-engine','r') as f:
+        engine = f.readline().strip()
+except IOError:
+    engine = 'nginx'
+
+if engine == 'apache2':
+    conf_name = "loadbalancer"
+    servers = """
+<Proxy balancer://backend>
+  BalancerMember http://127.0.0.1:8080/
+"""
+    server_line = "  BalancerMember http://%s:8080/\n"
+    server_end = """
+  ProxySet lbmethod=bybusyness
+</Proxy>
+"""
+    t1 = '# Generated by juju'
+    template = """
+<VirtualHost *:80>
+
+"""
+    template += "  ServerName %s\n" % unit_address
+    template += """
+  ServerAlias *
+  LogLevel warn
+  ErrorLog ${APACHE_LOG_DIR}/wordpress-balancer-error.log
+  ProxyPreserveHost On
+  <Location />
+    Order allow,deny
+    Allow from all
+    ProxyPass balancer://backend/
+    ProxyPassReverse balancer://backend/
+  </Location>
+</VirtualHost>
+"""
+else:
+    conf_name = "loadbalancer"
+    servers = """
+upstream backend {
+  server 127.0.0.1:8080;
+"""
+    server_line = "  server %s:8080;\n"
+    server_end = '}'
+
+    t1 = """# Generated by juju
 proxy_cache_path /mnt/ramdisk/proxy-cache levels=1:2 keys_zone=proxycache:5m max_size=1000m;
 """
-# servers will go here
-template = """
+    # servers will go here
+    template = """
 server {
   listen 80 default;
   server_name _;
@@ -77,44 +120,54 @@
 }
 """
 
-units = []
-p = subprocess.Popen("relation-list", stdout=subprocess.PIPE)
-for unit in p.stdout:
-    units.append(unit.strip())
-
-print units
-
-servers = """
-upstream backend {
-  server 127.0.0.1:8080;
-"""
-for unit in units:
-    p = subprocess.Popen(["relation-get", "private-address", unit],
-                         stdout=subprocess.PIPE, close_fds=True)
-    paddress = p.stdout.read().strip()
-    p.wait()
-    # Add all configured units:
-    servers += ("  server %s:8080;\n" % (paddress))
-servers += '}'
+if rebuild:
+    try:
+        with open('.loadbalancer-units') as units:
+            for paddress in units:
+                servers += (server_line % (paddress.strip()))
+    except IOError:
+        pass
+else:
+    units = []
+    p = subprocess.Popen("relation-list", stdout=subprocess.PIPE)
+    for unit in p.stdout:
+        units.append(unit.strip())
+
+    print units
+
+    lb_file = open('.loadbalancer-units', 'w')
+    for unit in units:
+        p = subprocess.Popen(["relation-get", "private-address", unit],
+                             stdout=subprocess.PIPE, close_fds=True)
+        paddress = p.stdout.read().strip()
+        p.wait()
+        lb_file.write("%s\n" % paddress)
+        # Add all configured units:
+        servers += (server_line % (paddress))
+
+    lb_file.close()
+servers += server_end
 
 print servers
 
-with tempfile.NamedTemporaryFile(dir="/etc/nginx/sites-available/",prefix="loadbalancer", delete=False) as conf:
+with tempfile.NamedTemporaryFile(dir="/etc/%s/sites-available/" % engine, 
+        prefix='lb', delete=False) as conf:
     conf.write(t1 + servers + template)
     try:
-        os.unlink("/etc/nginx/sites-available/loadbalancer.old")
-    except:
-        pass
-    try:
-        os.rename("/etc/nginx/sites-available/loadbalancer","/etc/nginx/sites-available/loadbalancer.old")
-    except:
-        pass
-    try:
-      os.rename(conf.name, "/etc/nginx/sites-available/loadbalancer")
+        os.unlink("/etc/%s/sites-available/%s.old" % (engine, conf_name))
+    except:
+        pass
+    try:
+        os.rename("/etc/%s/sites-available/%s" % (engine, conf_name), 
+            "/etc/%s/sites-available/%s.old" % (engine, conf_name))
+    except:
+        pass
+    try:
+        os.rename(conf.name, "/etc/%s/sites-available/%s" % (engine, conf_name))
     except:
         os.unlink(conf.name)
 
-subprocess.call(["service", "nginx", "start"])
-subprocess.check_call(["service", "nginx", "reload"])
+subprocess.call(["service", engine, "start"])
+subprocess.check_call(["service", engine, "reload"])
 
 subprocess.check_call(["open-port", "80"])

=== modified file 'hooks/start'
--- hooks/start	2012-04-10 22:26:11 +0000
+++ hooks/start	2012-12-13 18:15:24 +0000
@@ -1,4 +1,5 @@
 #!/bin/bash
 
+engine=`cat .web-engine`
 service php5-fpm restart
-service nginx restart
+service $engine restart

=== modified file 'hooks/stop'
--- hooks/stop	2012-08-15 20:09:06 +0000
+++ hooks/stop	2012-12-13 18:15:24 +0000
@@ -1,6 +1,5 @@
 #!/bin/bash
 
+engine=`cat .web-engine`
 service php5-fpm stop
-service nginx stop
-
-
+service $engine stop

=== modified file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	2012-08-29 20:57:32 +0000
+++ hooks/upgrade-charm	2012-12-13 18:15:24 +0000
@@ -12,6 +12,12 @@
 
 	juju-log "Upgrading WordPress core..."
 	wp core update --path=$wp_install_path
+
+	# Patch to fix old installations that didn't cookie properly
+	if [ -f "$wp_install_path/wp-info.php" ] && [ -f .wp-secret ]; then
+		secret_key=`cat .wp-secret`
+		sed -i -e "s/define('SECRET_KEY',.*/define('SECRET_KEY', '$secret_key')\;/" $wp_install_path/wp-info.php
+	fi
 fi
 
 hooks/restart

=== modified file 'hooks/website-relation-joined'
--- hooks/website-relation-joined	2012-08-24 01:14:11 +0000
+++ hooks/website-relation-joined	2012-12-13 18:15:24 +0000
@@ -1,2 +1,4 @@
 #!/bin/sh
-relation-set port=80 hostname=`unit-get private-address`
+
+# Bypass the loadbalancer for $engine and instead just hit the unit
+relation-set port=8080 hostname=`unit-get private-address`

=== modified file 'inc/common'
--- inc/common	2012-08-29 20:57:32 +0000
+++ inc/common	2012-12-13 18:15:24 +0000
@@ -1,5 +1,23 @@
 #!/bin/bash
-
+#
+#    common - Common functions
+#
+#    Copyright (C) 2012  Marco Ceppi
+#    Author: Marco Ceppi <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 hostname=`unit-get public-address`
 private_name=`hostname -f`
@@ -12,9 +30,14 @@
 ####
 ## The only hook who should ever remove the NFS mount is the nfs-relation-(departed|broken) hook
 ## Everyone else should just assume it's there or try to mount it. We don't want to loose people's
-## data, they get mad when that happens
+## data, they get mad when that happens :(
 ####
 
+engine()
+{
+	echo `cat .web-engine`
+}
+
 make_bare()
 {
 	# Un-do APC
@@ -37,8 +60,13 @@
 	juju-log "Installing PHP apc.ini ..."
 	rm -f /etc/php5/conf.d/apc.ini
 	install -o root -g root -m 0644 files/charm/php/php5_conf.d_apc.ini /etc/php5/conf.d/apc.ini
+
+	## We do NFS here, because Configuration changes cascade. So to get to Optimzied you *must* first 
+	## make "single" (and by association, "bare"). Since nfs is both a single and optimized thing we do it now.
+
 	do_nfs
-	juju-log "We are now single"
+
+	juju-log "We are now single, ALL THE SINGLE UNITS ALL THE SINGLE UNITS"
 }
 
 make_optimized()
@@ -48,7 +76,7 @@
 <?php
 define('DISALLOW_FILE_MODS', TRUE);
 EOF
-	juju-log "We are now optimized"
+	juju-log "We are now optimized prime"
 }
 
 do_nfs()
@@ -80,7 +108,9 @@
 
 do_vcs()
 {
-	local NEW_REPO_URL="$1"
+	source "/usr/share/charm-helper/bash/vcs.bash"
+
+	local NEW_REPO_URL=${1:-""}
 
 	if [ -z "$NEW_REPO_URL" ]; then
 		rm -f .wp-repo
@@ -95,47 +125,42 @@
 
 	if [ "$NEW_REPO_URL" != "$REPO_URL" ]; then
 		# We need to determine what kind of URL this is
-		if [ $(echo "$NEW_REPO_URL" | egrep -Ec "^(lp:\~|bzr:\/\/|bzr+ssh:\/\/)") -eq 1 ]; then
-			local repo_type="bzr"
-			local cmd="branch"
-		elif [ $(echo "$NEW_REPO_URL" | egrep -Ec "(^git@|^git:\/\/|\.git$)") -gt 0 ]; then
-			local repo_type="git"
-			local cmd="clone"
-		else
+
+		repo_path=`ch_fetch_repo $NEW_REPO_URL`
+		if [ $? -ne 0 ]; then
+			juju-log "Failed to fetch repo, charm-helper/bash/vcs.bash exited with $?"
 			return 1
 		fi
 
-		repo_path=$(mktemp -d)
-		$repo_type $cmd $NEW_REPO_URL $repo_path
 		# Write all our new data to disk
 		cat > .wp-repo <<EOF
 #!/bin/bash
-REPO_TYPE=$repo_type
 REPO_URL=$NEW_REPO_URL
 REPO_PATH=$repo_path
-REPO_CMD=$cmd
-
 EOF
 		source .wp-repo # Just so the rest of this can run all willy nilly
-	fi
-
-	if [ ! -d "$REPO_PATH" ]; then
-		mkdir -p "$REPO_PATH"
-		$REPO_TYPE $REPO_CMD $REPO_URL $REPO_PATH
-	fi
-
-	local cwd=`pwd`
-	cd $REPO_PATH
-	$REPO_TYPE pull
-	cd $cwd
-
-	# This will clean up anything deleted from wp-content specifically
-	rsync -az --delete $REPO_PATH/wp-content/ $wp_install_path/wp-content/
-	# This is just incase people have modifications outside of the wp-content directory
-	rsync -az $REPO_PATH/ $wp_install_path/
-
-	# This should be an --exclude flag in the RSYNC command, but I'm not quite sure how to make that work properly.
-	rm -rf $wp_install_path/.$REPO_TYPE
+	else
+		# Lets just try and do a fetch
+		ch_update_repo "$REPO_PATH"
+		if [ $? -ne 0 ]; then
+			juju-log "Failed to update repository, charm-helper/bash/vcs.bash exited with $?"
+			return 2
+		fi
+	fi
+
+	repo_type=`ch_detect_vcs $REPO_PATH`
+
+	if [ ! -d "$REPO_PATH/wp-content" ]; then
+		# This is just someone who has their source control at the root level of the repo.
+		wp_content_path="$REPO_PATH/wp-content"
+		rsync -az --delete --exclude ".$repo_type/*" $REPO_PATH/ $wp_install_path/wp-content/
+	else
+		# This is a repo with a wp-content folder. So we'll move that then everything else they have in that repo
+		# to the web root. OMG requirement.
+		rsync -az --delete --exclude ".$repo_type/*" $REPO_PATH/wp-content/ $wp_install_path/wp-content/
+		# This is just incase people have modifications outside of the wp-content directory
+		rsync -az --exclude ".$repo_type/*" $REPO_PATH/ $wp_install_path/
+	fi
 }
 
 do_cache()
@@ -159,5 +184,9 @@
 	sed -i -e "s/\$wp_ffpc_config\['host'\]=.*/\$wp_ffpc_config\['host'\]='$CACHE_HOST';/" \
 		-e "s/\$wp_ffpc_config\['port'\]=.*/\$wp_ffpc_config\['host'\]='$CACHE_PORT';/" \
 		$wp_install_path/wp-content/advanced-cache.php
-	sed -i -e "s/memcached_pass .*/memcached_pass $CACHE_HOST\:$CACHE_PORT;/" /etc/nginx/sites-enabled/wordpress
+
+	engine=`cat .web-engine`
+	if [ "$engine" == "nginx" ]; then
+		sed -i -e "s/memcached_pass .*/memcached_pass $CACHE_HOST\:$CACHE_PORT;/" /etc/nginx/sites-enabled/wordpress
+	fi
 }

=== modified file 'revision'
--- revision	2012-08-29 20:57:32 +0000
+++ revision	2012-12-13 18:15:24 +0000
@@ -1,1 +1,1 @@
-83
+93