Merge lp:~marcoceppi/charms/oneiric/wordpress/haproxy-patch into lp:charms/oneiric/wordpress

[Marco Ceppi]

[Clint Byrum (clint-fewbar)]

Lets hold off of this until we have a new Wordpress charm.

review: Needs Resubmitting

Unmerged revisions

52. By Marco Ceppi on 2012-03-17

Added internal hostname

=== modified file 'hooks/db-relation-changed'
--- hooks/db-relation-changed	2011-10-14 10:22:29 +0000
+++ hooks/db-relation-changed	2012-03-17 22:58:19 +0000
@@ -5,10 +5,12 @@
 UPLOAD_PATH="/var/www/wp-uploads"
 
 hostname=`unit-get public-address`
+private_hostname=`hostname -f`
 juju-log "Retrieved hostname: $hostname"
 
 # Check we haven't already been setup.
 config_file_path="/etc/wordpress/config-$hostname.php"
+private_config_file_path="/etc/wordpress/config-$private_hostname"
 if [ -f "$config_file_path" ] ; then
     juju-log "Wordpress for site $config_file_path already Configured, exiting"
     echo "Already Configured, Exiting"
@@ -70,10 +72,12 @@
 # Write the apache config
 # XXX a future branch will change this to use augtool
 apache_config_file_path="/etc/apache2/sites-available/$hostname"
+apache_config_file_path="/etc/apache2/sites-available/$hostname"
 juju-log "Writing apache config file $apache_config_file_path"
 cat > $apache_config_file_path <<EOF
 <VirtualHost *:80>
   ServerName $hostname
+  ServerAlias $private_hostname
   DocumentRoot /var/www/$hostname
   Options All
   ErrorLog /var/log/apache2/wp-error.log
@@ -85,6 +89,10 @@
 EOF
 chmod 0644 $apache_config_file_path
 
+if [ ! -e "$private_config_file_path" ]; then
+	ln -s $config_file_path $private_config_file_path
+fi
+
 # Configure apache
 juju-log "Enabling apache modules: rewrite, vhost_alias"
 a2enmod rewrite