Merge lp:~marcoceppi/charms/precise/wordpress/trunk into lp:charms/wordpress

[Marco Ceppi]

There are a great many changes made to this charm, I will try to sum them up:

DO ALL THE THINGS THE OMGUBUNTU SITE DOES
Remove all the OMG! Ubuntu specific items
Allow for the use of NFS mounts to share data for lazy bloggers who are popular
Provide three configuration options for users: bare, single, optimized

[Benjamin Kerensa (bkerensa)]

Looks sane to me.

review: Approve

[Mark Mims (mark-mims)]

Ok, here's a static review: This is an _example_ charm we'll use in charmschools and demos, so I'll have more stuff to say than when reviewing a normal charm :)

# things to change

- love the config and especially the config-changed hook... it's very simple, organized, and demoable! Please put explicit values into config.yaml... please don't make me guess if I should put `Optimized` or `optimized`

- so `charm proof` gives `I: relation shared-fs has no hooks`. I understand the desire to add a more general relation than nfs, but please remove this metadata until it's implemented to keep it clean and simple for people to read (demo charm)

- instead of `files/wordpress/wp-content`, please pull themes and plugins from external repos as needed... it's just extra cruft in the charm and it seems like it could grow _considerably_ and change at a faster/different rate than the charm itself. We want this to be best-practice for charms (demo charm). Perhaps we should discuss this one in channel with the gang or on the list to get a consensus on this, but I'd certainly prefer configurable external repos.

- the `stop` hook references omgbackup... that's great but make it generic please

- I'd love to see some of your `files/charm` contents be actual templates where more stuff is externalized via config. e.g., ports and stuff. Well, ok... after looking some more, some of this stuff will *need* to be parametrized... i.e., there're urls littering the static config files. Those need to be in `config.yaml`

# discussion/recommendations

- it's unclear what `deets` is and why that's not coming from upstream repos

- `upgrade-charm` hook should maybe provide a way to change nginx config too?

Thanks man... totally excited about getting this pimped-out version in the main charm! we need more like this.

review: Needs Fixing

[Marco Ceppi (marcoceppi)]

* Explicit values added (and config-changed updated to convert incoming values to lower case)
* Shared-fs relation removed, that will be added once Gluster charm is ready
* External repo added, currently defaults to github:jujutools/wordpress-site will be moved to an LP branch at a later date
* All references to OMGUbuntu removed
  * A backup charm would be a great idea, for now it's just not in the charm
* deets has been moved to _debug and is now a config option
* upgrade-charm now re-runs the hooks/config-changed to make sure everything gets re-set up

[Mark Mims (mark-mims)]

awesome man... thanks!

debug is brilliant... we should perhaps add that as a "best practice" for charming... enable debug configs for the service itself if it supports it.

review: Approve

[Mark Mims (mark-mims)]

marco, merge away.

Please watch out for the conflicts.

[lp:~marcoceppi/charms/precise/wordpress/trunk]

55. By Marco Ceppi on 2012-08-24

* Nginx as a webserver
* Allow for scale-out with nginx
* Track Themes, Plugins, and other custom files in remote repo
* Cache levels are user-definable
* Share files between nodes with NFS
* Lots of performance enhancements

# Todo
* Add memcache support
* Wider support for remote files

=== added file 'README.md'
--- README.md	1970-01-01 00:00:00 +0000
+++ README.md	2012-08-21 13:22:29 +0000
@@ -0,0 +1,152 @@
+# Overview
+
+WordPress is a powerful blogging platform written in PHP. This charm aims to deploy WordPress in a fashion that will allow anyone to scale and grow out
+a single installation.
+
+# Installation
+
+This charm is available in the Juju Charm Store, to deploy you'll need at a minimum: a cloud environment, a working Juju installation,
+and a successful bootstrap. Please refer to the [Juju Getting Started](https://juju.ubuntu.com/docs/getting-started.html) documentation before continuing.
+
+Once bootstrapped, deploy the MySQL charm then this WordPress charm:
+
+    juju deploy mysql
+    juju deploy wordpress
+
+Add a relation between the two of them
+
+    juju add-relation wordpress mysql
+
+Expose the WordPress installation
+
+    juju expose wordpress
+
+# Configuration
+
+This WordPress charm comes with several tuning levels designed to encompass the different styles in which this charm will be used.
+
+## Tuning
+
+A use case for each tuning style is outlined below:
+
+### Bare
+
+The Bare configuration option is meant for those who wish to run the stock WordPress setup with no caching, no manipulation of data, 
+and no additional scale out features enabled. This is ideal if you intend to install additional plugins to deal with coordinating
+WordPress units or simply wish to test drive WordPress as it is out of the box. This will still create a load-balancer when an additional
+unit is created, though everything else will be turned off (WordPress caching, APC OpCode caching, and NFS file sharing).
+
+To run this WordPress charm under a bare tuning level execute the following:
+
+    juju set wordpress tuning=bare
+
+### Single
+
+When running in Single mode, this charm will make every attempt to provide a solid base for your WordPress install. By running in single
+the following will be enabled: Nginx microcache, APC OpCode caching, WordPress caching module, and the ability to sync files via NFS.
+While Single mode is designed to allow for scaling out, it's meant to only scale out for temporary relief; say in the event of a large
+traffic in-flux. It's recommended for long running scaled out versions that optimized is used. The removal of the file share speeds up
+the site and servers ensuring that the most efficient set up is provided. 
+
+To run this WordPress charm under a single tuning level execute the following:
+
+    juju set wordpress tuning=single
+
+### Optimized
+
+If you need to run WordPress on more than one instance constantly, or require scaling out and in on a regular basis, then Optimized is the
+recommended configuration. When you run WordPress under an Optimized tuning level, the ability to install, edit, and upgrade themes and plugins
+is disabled. By doing this the charm can drop the need for an NFS mount which is inefficient and serve everything from it's local disk.
+Everything else provided in Single level is available. In order to install or modify plugins with this setup you'll need to edit and commit
+them to a forked version of the charm in the files/wordpress/ directory.
+
+To run this WordPress charm under an optimized tuning level execute the following:
+
+    juju set wordpress tuning=optimized
+
+## wp-content
+
+In order to allow for custom WordPress content within the Juju charm a separate configuration option exists for pointing to any Git or Bzr 
+repository. An example of a valid formed wp-content repository can be found on the [Juju Tools Github page](https://github.com/jujutools/wordpress-site). 
+To set the wp-content directive to a git repository, use one of the following formats making sure to replace items like `host`, `path`, and `repo` with their 
+respective names:
+
+    juju set wordpress wp-content=git@host:path/repo.git
+
+or
+
+    juju set wordpress wp-content=http://host/path/repo.git
+    
+or
+
+    juju set wordpress wp-content=git://host/path/repo.git
+    
+If you wish to use a bzr repository, then apply one of the following schemes replacing items like `host`, `username`, `path`, and `repo` with their respective values:
+
+For LaunchPad hosted repostiories:
+
+    juju set wordpress wp-content=lp:~username/path/repo
+    
+For other Bzr repositories:
+
+    juju set wordpress wp-content=bzr://host/path/repo
+
+or
+
+    juju set wordpress wp-content=bzr+ssh://host/path/repo
+    
+Setting the wp-content option to an empty string ("") will result in no further updates being pulled from that repository; however, the last pull will remain 
+on the system and will not be removed.
+
+## debug
+
+This option will create a directory `_debug` at the root of each unit (`http://unit-address/_debug`). In this directory are two scripts: info.php and apc.php. info.php 
+is a simple phpinfo script that will outline exactly how the environment is configured. apc.php is the APC admin portal which provides APC caching details in addition 
+to several administrative functions like clearing the APC cache. This should never be set to "yes" in production as it exposes detailed information about the environments 
+and may provide a way for an intruder to DDoS the machine.
+
+    juju set wordpress debug=yes
+
+to disable
+
+    juju set wordpress debug=no
+
+The default is to have debugging disabled.
+
+# Caveats
+
+## Single mode and the scale-out
+
+If you're in Single mode and you want to/need to scale out, but you've been upgrading, modifying, and installing plugins + themes like
+a normal WordPress user on a normal install; you can still scale out but you'll need to deploy a shared-fs charm first. At the time of
+this writing only the NFS charm will work, but as more shared-fs charms come out (gluster, ceph, etc) that provide a shared-fs/mount 
+interface those should all work as well. In this example we'll use NFS:
+
+    juju deploy nfs
+    juju add-relation nfs wordpress:nfs
+
+By doing so, everything in the wp-contents directory is moved to this NFS mount and then shared to all future WordPress units. It's strongly
+recommended that you first deploy the nfs mount, _then_ scale WordPress out. Failure to do so may result in data loss. Once nfs is deployed, 
+running, and related you can scale out the WordPress unit using the following command:
+
+    juju add-unit wordpress
+    
+In the event you want more than one unit at a time (and do not wish to run the add-unit command multiple times) you can supply a `-n` number
+of units to add, so to add three more units:
+
+    juju add-unit -n3 wordpress
+    
+## 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
+the charm, but it's something that comes up more than once. Use this, of course, at your own risk. At any time the Juju developers may smart
+up and decide to remove this configuration option from the `environments.yaml` file. Prior to your first deployment you'll need to add the
+following line to your Juju Environments file:
+
+    placement: local
+
+This will say "Everything that you deploy, will go on the bootstrap node". Make sure you plan to have a big enough bootstrap node to house
+both your database and WordPress install. After you've bootstrap'd the environment, deploy the MySQL and WordPress charms like you normally
+would. Instead of seeing three nodes you'll only see one, but both of your services will have been deployed. *FROM THIS POINT* you should
+either remove or comment out the `placement` line in the environments file. This will prevent issues from occurring when you try to deploy
+additional services or try to scale out existing services.

=== added file 'config.yaml'
--- config.yaml	1970-01-01 00:00:00 +0000
+++ config.yaml	2012-08-21 13:22:29 +0000
@@ -0,0 +1,26 @@
+options:
+  tuning:
+    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. 
+  wp-content:
+    type: string
+    default: "https://github.com/jujutools/wordpress-site.git"
+    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.
+  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).
+      

=== modified file 'copyright'
--- copyright	2011-06-10 11:20:27 +0000
+++ copyright	2012-08-21 13:22:29 +0000
@@ -1,7 +1,7 @@
 Format: http://dep.debian.net/deps/dep5/
 
 Files: *
-Copyright: Copyright 2011, Canonical Ltd., All Rights Reserved.
+Copyright: Copyright 2012, Marco Ceppi, All Rights Reserved.
 License: GPL-3
  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

=== added directory 'files'
=== added directory 'files/_debug'
=== added file 'files/_debug/apc.php'
--- files/_debug/apc.php	1970-01-01 00:00:00 +0000
+++ files/_debug/apc.php	2012-08-21 13:22:29 +0000
@@ -0,0 +1,1364 @@
+<?php
+/*
+  +----------------------------------------------------------------------+
+  | APC                                                                  |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 2006-2011 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | This source file is subject to version 3.01 of the PHP license,      |
+  | that is bundled with this package in the file LICENSE, and is        |
+  | available through the world-wide-web at the following url:           |
+  | http://www.php.net/license/3_01.txt                                  |
+  | If you did not receive a copy of the PHP license and are unable to   |
+  | obtain it through the world-wide-web, please send a note to          |
+  | [e-mail] so we can mail you a copy immediately.               |
+  +----------------------------------------------------------------------+
+  | Authors: Ralf Becker <[e-mail]>                               |
+  |          Rasmus Lerdorf <[e-mail]>                             |
+  |          Ilia Alshanetsky <[e-mail]>                         |
+  +----------------------------------------------------------------------+
+
+  All other licensing and usage conditions are those of the PHP Group.
+
+*/
+
+$VERSION='$Id$';
+
+////////// READ OPTIONAL CONFIGURATION FILE ////////////
+if (file_exists("apc.conf.php")) include("apc.conf.php");
+////////////////////////////////////////////////////////
+
+////////// BEGIN OF DEFAULT CONFIG AREA ///////////////////////////////////////////////////////////
+
+defaults('USE_AUTHENTICATION',0);			// Use (internal) authentication - best choice if
+                      // no other authentication is available
+                      // If set to 0:
+                      //  There will be no further authentication. You
+                      //  will have to handle this by yourself!
+                      // If set to 1:
+                      //  You need to change ADMIN_PASSWORD to make
+                      //  this work!
+defaults('ADMIN_USERNAME',''); 			// Admin Username
+defaults('ADMIN_PASSWORD','');  	// Admin Password - CHANGE THIS TO ENABLE!!!
+
+// (beckerr) I'm using a clear text password here, because I've no good idea how to let
+//           users generate a md5 or crypt password in a easy way to fill it in above
+
+//defaults('DATE_FORMAT', "d.m.Y H:i:s");	// German
+defaults('DATE_FORMAT', ' m/d/Y h:i:s A'); 	// US
+
+defaults('GRAPH_SIZE',150);					// Image size
+
+//defaults('PROXY', 'tcp://127.0.0.1:8080');
+
+////////// END OF DEFAULT CONFIG AREA /////////////////////////////////////////////////////////////
+
+
+// "define if not defined"
+function defaults($d,$v) {
+  if (!defined($d)) define($d,$v); // or just @define(...)
+}
+
+// rewrite $PHP_SELF to block XSS attacks
+//
+$PHP_SELF= isset($_SERVER['PHP_SELF']) ? htmlentities(strip_tags($_SERVER['PHP_SELF'],''), ENT_QUOTES, 'UTF-8') : '';
+$time = time();
+$host = php_uname('n');
+if($host) { $host = '('.$host.')'; }
+if (isset($_SERVER['SERVER_ADDR'])) {
+  $host .= ' ('.$_SERVER['SERVER_ADDR'].')';
+}
+
+// operation constants
+define('OB_HOST_STATS',1);
+define('OB_SYS_CACHE',2);
+define('OB_USER_CACHE',3);
+define('OB_SYS_CACHE_DIR',4);
+define('OB_VERSION_CHECK',9);
+
+// check validity of input variables
+$vardom=array(
+  'OB'	=> '/^\d+$/',			// operational mode switch
+  'CC'	=> '/^[01]$/',			// clear cache requested
+  'DU'	=> '/^.*$/',			// Delete User Key
+  'SH'	=> '/^[a-z0-9]+$/',		// shared object description
+
+  'IMG'	=> '/^[123]$/',			// image to generate
+  'LO'	=> '/^1$/',				// login requested
+
+  'COUNT'	=> '/^\d+$/',			// number of line displayed in list
+  'SCOPE'	=> '/^[AD]$/',			// list view scope
+  'SORT1'	=> '/^[AHSMCDTZ]$/',	// first sort key
+  'SORT2'	=> '/^[DA]$/',			// second sort key
+  'AGGR'	=> '/^\d+$/',			// aggregation by dir level
+  'SEARCH'	=> '~^[a-zA-Z0-1/_.-]*$~'			// aggregation by dir level
+);
+
+// default cache mode
+$cache_mode='opcode';
+
+// cache scope
+$scope_list=array(
+  'A' => 'cache_list',
+  'D' => 'deleted_list'
+);
+
+// handle POST and GET requests
+if (empty($_REQUEST)) {
+  if (!empty($_GET) && !empty($_POST)) {
+    $_REQUEST = array_merge($_GET, $_POST);
+  } else if (!empty($_GET)) {
+    $_REQUEST = $_GET;
+  } else if (!empty($_POST)) {
+    $_REQUEST = $_POST;
+  } else {
+    $_REQUEST = array();
+  }
+}
+
+// check parameter syntax
+foreach($vardom as $var => $dom) {
+  if (!isset($_REQUEST[$var])) {
+    $MYREQUEST[$var]=NULL;
+  } else if (!is_array($_REQUEST[$var]) && preg_match($dom.'D',$_REQUEST[$var])) {
+    $MYREQUEST[$var]=$_REQUEST[$var];
+  } else {
+    $MYREQUEST[$var]=$_REQUEST[$var]=NULL;
+  }
+}
+
+// check parameter sematics
+if (empty($MYREQUEST['SCOPE'])) $MYREQUEST['SCOPE']="A";
+if (empty($MYREQUEST['SORT1'])) $MYREQUEST['SORT1']="H";
+if (empty($MYREQUEST['SORT2'])) $MYREQUEST['SORT2']="D";
+if (empty($MYREQUEST['OB']))	$MYREQUEST['OB']=OB_HOST_STATS;
+if (!isset($MYREQUEST['COUNT'])) $MYREQUEST['COUNT']=20;
+if (!isset($scope_list[$MYREQUEST['SCOPE']])) $MYREQUEST['SCOPE']='A';
+
+$MY_SELF=
+  "$PHP_SELF".
+  "?SCOPE=".$MYREQUEST['SCOPE'].
+  "&SORT1=".$MYREQUEST['SORT1'].
+  "&SORT2=".$MYREQUEST['SORT2'].
+  "&COUNT=".$MYREQUEST['COUNT'];
+$MY_SELF_WO_SORT=
+  "$PHP_SELF".
+  "?SCOPE=".$MYREQUEST['SCOPE'].
+  "&COUNT=".$MYREQUEST['COUNT'];
+
+// authentication needed?
+//
+if (!USE_AUTHENTICATION) {
+  $AUTHENTICATED=1;
+} else {
+  $AUTHENTICATED=0;
+  if (ADMIN_PASSWORD!='password' && ($MYREQUEST['LO'] == 1 || isset($_SERVER['PHP_AUTH_USER']))) {
+
+    if (!isset($_SERVER['PHP_AUTH_USER']) ||
+      !isset($_SERVER['PHP_AUTH_PW']) ||
+      $_SERVER['PHP_AUTH_USER'] != ADMIN_USERNAME ||
+      $_SERVER['PHP_AUTH_PW'] != ADMIN_PASSWORD) {
+      Header("WWW-Authenticate: Basic realm=\"APC Login\"");
+      Header("HTTP/1.0 401 Unauthorized");
+
+      echo <<<EOB
+        <html><body>
+        <h1>Rejected!</h1>
+        <big>Wrong Username or Password!</big><br/>&nbsp;<br/>&nbsp;
+        <big><a href='$PHP_SELF?OB={$MYREQUEST['OB']}'>Continue...</a></big>
+        </body></html>
+EOB;
+      exit;
+      
+    } else {
+      $AUTHENTICATED=1;
+    }
+  }
+}
+  
+// select cache mode
+if ($AUTHENTICATED && $MYREQUEST['OB'] == OB_USER_CACHE) {
+  $cache_mode='user';
+}
+// clear cache
+if ($AUTHENTICATED && isset($MYREQUEST['CC']) && $MYREQUEST['CC']) {
+  apc_clear_cache($cache_mode);
+}
+
+if ($AUTHENTICATED && !empty($MYREQUEST['DU'])) {
+  apc_delete($MYREQUEST['DU']);
+}
+
+if(!function_exists('apc_cache_info') || !($cache=@apc_cache_info($cache_mode))) {
+  echo "No cache info available.  APC does not appear to be running.";
+  exit;
+}
+
+$cache_user = apc_cache_info('user', 1);
+$mem=apc_sma_info();
+if(!$cache['num_hits']) { $cache['num_hits']=1; $time++; }  // Avoid division by 0 errors on a cache clear
+
+// don't cache this page
+//
+header("Cache-Control: no-store, no-cache, must-revalidate");  // HTTP/1.1
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");                                    // HTTP/1.0
+
+function duration($ts) {
+    global $time;
+    $years = (int)((($time - $ts)/(7*86400))/52.177457);
+    $rem = (int)(($time-$ts)-($years * 52.177457 * 7 * 86400));
+    $weeks = (int)(($rem)/(7*86400));
+    $days = (int)(($rem)/86400) - $weeks*7;
+    $hours = (int)(($rem)/3600) - $days*24 - $weeks*7*24;
+    $mins = (int)(($rem)/60) - $hours*60 - $days*24*60 - $weeks*7*24*60;
+    $str = '';
+    if($years==1) $str .= "$years year, ";
+    if($years>1) $str .= "$years years, ";
+    if($weeks==1) $str .= "$weeks week, ";
+    if($weeks>1) $str .= "$weeks weeks, ";
+    if($days==1) $str .= "$days day,";
+    if($days>1) $str .= "$days days,";
+    if($hours == 1) $str .= " $hours hour and";
+    if($hours>1) $str .= " $hours hours and";
+    if($mins == 1) $str .= " 1 minute";
+    else $str .= " $mins minutes";
+    return $str;
+}
+
+// create graphics
+//
+function graphics_avail() {
+  return extension_loaded('gd');
+}
+if (isset($MYREQUEST['IMG']))
+{
+  if (!graphics_avail()) {
+    exit(0);
+  }
+
+  function fill_arc($im, $centerX, $centerY, $diameter, $start, $end, $color1,$color2,$text='',$placeindex=0) {
+    $r=$diameter/2;
+    $w=deg2rad((360+$start+($end-$start)/2)%360);
+
+    
+    if (function_exists("imagefilledarc")) {
+      // exists only if GD 2.0.1 is avaliable
+      imagefilledarc($im, $centerX+1, $centerY+1, $diameter, $diameter, $start, $end, $color1, IMG_ARC_PIE);
+      imagefilledarc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color2, IMG_ARC_PIE);
+      imagefilledarc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color1, IMG_ARC_NOFILL|IMG_ARC_EDGED);
+    } else {
+      imagearc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color2);
+      imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($start)) * $r, $centerY + sin(deg2rad($start)) * $r, $color2);
+      imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($start+1)) * $r, $centerY + sin(deg2rad($start)) * $r, $color2);
+      imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($end-1))   * $r, $centerY + sin(deg2rad($end))   * $r, $color2);
+      imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($end))   * $r, $centerY + sin(deg2rad($end))   * $r, $color2);
+      imagefill($im,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2, $color2);
+    }
+    if ($text) {
+      if ($placeindex>0) {
+        imageline($im,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$diameter, $placeindex*12,$color1);
+        imagestring($im,4,$diameter, $placeindex*12,$text,$color1);
+        
+      } else {
+        imagestring($im,4,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$text,$color1);
+      }
+    }
+  }
+
+  function text_arc($im, $centerX, $centerY, $diameter, $start, $end, $color1,$text,$placeindex=0) {
+    $r=$diameter/2;
+    $w=deg2rad((360+$start+($end-$start)/2)%360);
+
+    if ($placeindex>0) {
+      imageline($im,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$diameter, $placeindex*12,$color1);
+      imagestring($im,4,$diameter, $placeindex*12,$text,$color1);
+        
+    } else {
+      imagestring($im,4,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$text,$color1);
+    }
+  }
+  
+  function fill_box($im, $x, $y, $w, $h, $color1, $color2,$text='',$placeindex='') {
+    global $col_black;
+    $x1=$x+$w-1;
+    $y1=$y+$h-1;
+
+    imagerectangle($im, $x, $y1, $x1+1, $y+1, $col_black);
+    if($y1>$y) imagefilledrectangle($im, $x, $y, $x1, $y1, $color2);
+    else imagefilledrectangle($im, $x, $y1, $x1, $y, $color2);
+    imagerectangle($im, $x, $y1, $x1, $y, $color1);
+    if ($text) {
+      if ($placeindex>0) {
+      
+        if ($placeindex<16)
+        {
+          $px=5;
+          $py=$placeindex*12+6;
+          imagefilledrectangle($im, $px+90, $py+3, $px+90-4, $py-3, $color2);
+          imageline($im,$x,$y+$h/2,$px+90,$py,$color2);
+          imagestring($im,2,$px,$py-6,$text,$color1);
+          
+        } else {
+          if ($placeindex<31) {
+            $px=$x+40*2;
+            $py=($placeindex-15)*12+6;
+          } else {
+            $px=$x+40*2+100*intval(($placeindex-15)/15);
+            $py=($placeindex%15)*12+6;
+          }
+          imagefilledrectangle($im, $px, $py+3, $px-4, $py-3, $color2);
+          imageline($im,$x+$w,$y+$h/2,$px,$py,$color2);
+          imagestring($im,2,$px+2,$py-6,$text,$color1);
+        }
+      } else {
+        imagestring($im,4,$x+5,$y1-16,$text,$color1);
+      }
+    }
+  }
+
+
+  $size = GRAPH_SIZE; // image size
+  if ($MYREQUEST['IMG']==3)
+    $image = imagecreate(2*$size+150, $size+10);
+  else
+    $image = imagecreate($size+50, $size+10);
+
+  $col_white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
+  $col_red   = imagecolorallocate($image, 0xD0, 0x60,  0x30);
+  $col_green = imagecolorallocate($image, 0x60, 0xF0, 0x60);
+  $col_black = imagecolorallocate($image,   0,   0,   0);
+  imagecolortransparent($image,$col_white);
+
+  switch ($MYREQUEST['IMG']) {
+  
+  case 1:
+    $s=$mem['num_seg']*$mem['seg_size'];
+    $a=$mem['avail_mem'];
+    $x=$y=$size/2;
+    $fuzz = 0.000001;
+
+    // This block of code creates the pie chart.  It is a lot more complex than you
+    // would expect because we try to visualize any memory fragmentation as well.
+    $angle_from = 0;
+    $string_placement=array();
+    for($i=0; $i<$mem['num_seg']; $i++) {
+      $ptr = 0;
+      $free = $mem['block_lists'][$i];
+      uasort($free, 'block_sort');
+      foreach($free as $block) {
+        if($block['offset']!=$ptr) {       // Used block
+          $angle_to = $angle_from+($block['offset']-$ptr)/$s;
+          if(($angle_to+$fuzz)>1) $angle_to = 1;
+          if( ($angle_to*360) - ($angle_from*360) >= 1) {
+            fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_red);
+            if (($angle_to-$angle_from)>0.05) {
+              array_push($string_placement, array($angle_from,$angle_to));
+            }
+          }
+          $angle_from = $angle_to;
+        }
+        $angle_to = $angle_from+($block['size'])/$s;
+        if(($angle_to+$fuzz)>1) $angle_to = 1;
+        if( ($angle_to*360) - ($angle_from*360) >= 1) {
+          fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_green);
+          if (($angle_to-$angle_from)>0.05) {
+            array_push($string_placement, array($angle_from,$angle_to));
+          }
+        }
+        $angle_from = $angle_to;
+        $ptr = $block['offset']+$block['size'];
+      }
+      if ($ptr < $mem['seg_size']) { // memory at the end
+        $angle_to = $angle_from + ($mem['seg_size'] - $ptr)/$s;
+        if(($angle_to+$fuzz)>1) $angle_to = 1;
+        fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_red);
+        if (($angle_to-$angle_from)>0.05) {
+          array_push($string_placement, array($angle_from,$angle_to));
+        }
+      }
+    }
+    foreach ($string_placement as $angle) {
+      text_arc($image,$x,$y,$size,$angle[0]*360,$angle[1]*360,$col_black,bsize($s*($angle[1]-$angle[0])));
+    }
+    break;
+    
+  case 2:
+    $s=$cache['num_hits']+$cache['num_misses'];
+    $a=$cache['num_hits'];
+    
+    fill_box($image, 30,$size,50,-$a*($size-21)/$s,$col_black,$col_green,sprintf("%.1f%%",$cache['num_hits']*100/$s));
+    fill_box($image,130,$size,50,-max(4,($s-$a)*($size-21)/$s),$col_black,$col_red,sprintf("%.1f%%",$cache['num_misses']*100/$s));
+    break;
+    
+  case 3:
+    $s=$mem['num_seg']*$mem['seg_size'];
+    $a=$mem['avail_mem'];
+    $x=130;
+    $y=1;
+    $j=1;
+
+    // This block of code creates the bar chart.  It is a lot more complex than you
+    // would expect because we try to visualize any memory fragmentation as well.
+    for($i=0; $i<$mem['num_seg']; $i++) {
+      $ptr = 0;
+      $free = $mem['block_lists'][$i];
+      uasort($free, 'block_sort');
+      foreach($free as $block) {
+        if($block['offset']!=$ptr) {       // Used block
+          $h=(GRAPH_SIZE-5)*($block['offset']-$ptr)/$s;
+          if ($h>0) {
+                                                $j++;
+            if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($block['offset']-$ptr),$j);
+                                                else fill_box($image,$x,$y,50,$h,$col_black,$col_red);
+                                        }
+          $y+=$h;
+        }
+        $h=(GRAPH_SIZE-5)*($block['size'])/$s;
+        if ($h>0) {
+                                        $j++;
+          if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_green,bsize($block['size']),$j);
+          else fill_box($image,$x,$y,50,$h,$col_black,$col_green);
+                                }
+        $y+=$h;
+        $ptr = $block['offset']+$block['size'];
+      }
+      if ($ptr < $mem['seg_size']) { // memory at the end
+        $h = (GRAPH_SIZE-5) * ($mem['seg_size'] - $ptr) / $s;
+        if ($h > 0) {
+          fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($mem['seg_size']-$ptr),$j++);
+        }
+      }
+    }
+    break;
+  case 4:
+    $s=$cache['num_hits']+$cache['num_misses'];
+    $a=$cache['num_hits'];
+            
+    fill_box($image, 30,$size,50,-$a*($size-21)/$s,$col_black,$col_green,sprintf("%.1f%%",$cache['num_hits']*100/$s));
+    fill_box($image,130,$size,50,-max(4,($s-$a)*($size-21)/$s),$col_black,$col_red,sprintf("%.1f%%",$cache['num_misses']*100/$s));
+    break;
+  
+  }
+  header("Content-type: image/png");
+  imagepng($image);
+  exit;
+}
+
+// pretty printer for byte values
+//
+function bsize($s) {
+  foreach (array('','K','M','G') as $i => $k) {
+    if ($s < 1024) break;
+    $s/=1024;
+  }
+  return sprintf("%5.1f %sBytes",$s,$k);
+}
+
+// sortable table header in "scripts for this host" view
+function sortheader($key,$name,$extra='') {
+  global $MYREQUEST, $MY_SELF_WO_SORT;
+  
+  if ($MYREQUEST['SORT1']==$key) {
+    $MYREQUEST['SORT2'] = $MYREQUEST['SORT2']=='A' ? 'D' : 'A';
+  }
+  return "<a class=sortable href=\"$MY_SELF_WO_SORT$extra&SORT1=$key&SORT2=".$MYREQUEST['SORT2']."\">$name</a>";
+
+}
+
+// create menu entry
+function menu_entry($ob,$title) {
+  global $MYREQUEST,$MY_SELF;
+  if ($MYREQUEST['OB']!=$ob) {
+    return "<li><a href=\"$MY_SELF&OB=$ob\">$title</a></li>";
+  } else if (empty($MYREQUEST['SH'])) {
+    return "<li><span class=active>$title</span></li>";
+  } else {
+    return "<li><a class=\"child_active\" href=\"$MY_SELF&OB=$ob\">$title</a></li>";
+  }
+}
+
+function put_login_link($s="Login")
+{
+  global $MY_SELF,$MYREQUEST,$AUTHENTICATED;
+  // needs ADMIN_PASSWORD to be changed!
+  //
+  if (!USE_AUTHENTICATION) {
+    return;
+  } else if (ADMIN_PASSWORD=='password')
+  {
+    print <<<EOB
+      <a href="#" onClick="javascript:alert('You need to set a password at the top of apc.php before this will work!');return false";>$s</a>
+EOB;
+  } else if ($AUTHENTICATED) {
+    print <<<EOB
+      '{$_SERVER['PHP_AUTH_USER']}'&nbsp;logged&nbsp;in!
+EOB;
+  } else{
+    print <<<EOB
+      <a href="$MY_SELF&LO=1&OB={$MYREQUEST['OB']}">$s</a>
+EOB;
+  }
+}
+
+function block_sort($array1, $array2)
+{
+  if ($array1['offset'] > $array2['offset']) {
+    return 1;
+  } else {
+    return -1;
+  }
+}
+
+
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head><title>APC INFO <?php echo $host ?></title>
+<style><!--
+body { background:white; font-size:100.01%; margin:0; padding:0; }
+body,p,td,th,input,submit { font-size:0.8em;font-family:arial,helvetica,sans-serif; }
+* html body   {font-size:0.8em}
+* html p      {font-size:0.8em}
+* html td     {font-size:0.8em}
+* html th     {font-size:0.8em}
+* html input  {font-size:0.8em}
+* html submit {font-size:0.8em}
+td { vertical-align:top }
+a { color:black; font-weight:none; text-decoration:none; }
+a:hover { text-decoration:underline; }
+div.content { padding:1em 1em 1em 1em; position:absolute; width:97%; z-index:100; }
+
+
+div.head div.login {
+  position:absolute;
+  right: 1em;
+  top: 1.2em;
+  color:white;
+  width:6em;
+  }
+div.head div.login a {
+  position:absolute;
+  right: 0em;
+  background:rgb(119,123,180);
+  border:solid rgb(102,102,153) 2px;
+  color:white;
+  font-weight:bold;
+  padding:0.1em 0.5em 0.1em 0.5em;
+  text-decoration:none;
+  }
+div.head div.login a:hover {
+  background:rgb(193,193,244);
+  }
+
+h1.apc { background:rgb(153,153,204); margin:0; padding:0.5em 1em 0.5em 1em; }
+* html h1.apc { margin-bottom:-7px; }
+h1.apc a:hover { text-decoration:none; color:rgb(90,90,90); }
+h1.apc div.logo span.logo {
+  background:rgb(119,123,180);
+  color:black;
+  border-right: solid black 1px;
+  border-bottom: solid black 1px;
+  font-style:italic;
+  font-size:1em;
+  padding-left:1.2em;
+  padding-right:1.2em;
+  text-align:right;
+  }
+h1.apc div.logo span.name { color:white; font-size:0.7em; padding:0 0.8em 0 2em; }
+h1.apc div.nameinfo { color:white; display:inline; font-size:0.4em; margin-left: 3em; }
+h1.apc div.copy { color:black; font-size:0.4em; position:absolute; right:1em; }
+hr.apc {
+  background:white;
+  border-bottom:solid rgb(102,102,153) 1px;
+  border-style:none;
+  border-top:solid rgb(102,102,153) 10px;
+  height:12px;
+  margin:0;
+  margin-top:1px;
+  padding:0;
+}
+
+ol,menu { margin:1em 0 0 0; padding:0.2em; margin-left:1em;}
+ol.menu li { display:inline; margin-right:0.7em; list-style:none; font-size:85%}
+ol.menu a {
+  background:rgb(153,153,204);
+  border:solid rgb(102,102,153) 2px;
+  color:white;
+  font-weight:bold;
+  margin-right:0em;
+  padding:0.1em 0.5em 0.1em 0.5em;
+  text-decoration:none;
+  margin-left: 5px;
+  }
+ol.menu a.child_active {
+  background:rgb(153,153,204);
+  border:solid rgb(102,102,153) 2px;
+  color:white;
+  font-weight:bold;
+  margin-right:0em;
+  padding:0.1em 0.5em 0.1em 0.5em;
+  text-decoration:none;
+  border-left: solid black 5px;
+  margin-left: 0px;
+  }
+ol.menu span.active {
+  background:rgb(153,153,204);
+  border:solid rgb(102,102,153) 2px;
+  color:black;
+  font-weight:bold;
+  margin-right:0em;
+  padding:0.1em 0.5em 0.1em 0.5em;
+  text-decoration:none;
+  border-left: solid black 5px;
+  }
+ol.menu span.inactive {
+  background:rgb(193,193,244);
+  border:solid rgb(182,182,233) 2px;
+  color:white;
+  font-weight:bold;
+  margin-right:0em;
+  padding:0.1em 0.5em 0.1em 0.5em;
+  text-decoration:none;
+  margin-left: 5px;
+  }
+ol.menu a:hover {
+  background:rgb(193,193,244);
+  text-decoration:none;
+  }
+  
+  
+div.info {
+  background:rgb(204,204,204);
+  border:solid rgb(204,204,204) 1px;
+  margin-bottom:1em;
+  }
+div.info h2 {
+  background:rgb(204,204,204);
+  color:black;
+  font-size:1em;
+  margin:0;
+  padding:0.1em 1em 0.1em 1em;
+  }
+div.info table {
+  border:solid rgb(204,204,204) 1px;
+  border-spacing:0;
+  width:100%;
+  }
+div.info table th {
+  background:rgb(204,204,204);
+  color:white;
+  margin:0;
+  padding:0.1em 1em 0.1em 1em;
+  }
+div.info table th a.sortable { color:black; }
+div.info table tr.tr-0 { background:rgb(238,238,238); }
+div.info table tr.tr-1 { background:rgb(221,221,221); }
+div.info table td { padding:0.3em 1em 0.3em 1em; }
+div.info table td.td-0 { border-right:solid rgb(102,102,153) 1px; white-space:nowrap; }
+div.info table td.td-n { border-right:solid rgb(102,102,153) 1px; }
+div.info table td h3 {
+  color:black;
+  font-size:1.1em;
+  margin-left:-0.3em;
+  }
+
+div.graph { margin-bottom:1em }
+div.graph h2 { background:rgb(204,204,204);; color:black; font-size:1em; margin:0; padding:0.1em 1em 0.1em 1em; }
+div.graph table { border:solid rgb(204,204,204) 1px; color:black; font-weight:normal; width:100%; }
+div.graph table td.td-0 { background:rgb(238,238,238); }
+div.graph table td.td-1 { background:rgb(221,221,221); }
+div.graph table td { padding:0.2em 1em 0.4em 1em; }
+
+div.div1,div.div2 { margin-bottom:1em; width:35em; }
+div.div3 { position:absolute; left:40em; top:1em; width:580px; }
+//div.div3 { position:absolute; left:37em; top:1em; right:1em; }
+
+div.sorting { margin:1.5em 0em 1.5em 2em }
+.center { text-align:center }
+.aright { position:absolute;right:1em }
+.right { text-align:right }
+.ok { color:rgb(0,200,0); font-weight:bold}
+.failed { color:rgb(200,0,0); font-weight:bold}
+
+span.box {
+  border: black solid 1px;
+  border-right:solid black 2px;
+  border-bottom:solid black 2px;
+  padding:0 0.5em 0 0.5em;
+  margin-right:1em;
+}
+span.green { background:#60F060; padding:0 0.5em 0 0.5em}
+span.red { background:#D06030; padding:0 0.5em 0 0.5em }
+
+div.authneeded {
+  background:rgb(238,238,238);
+  border:solid rgb(204,204,204) 1px;
+  color:rgb(200,0,0);
+  font-size:1.2em;
+  font-weight:bold;
+  padding:2em;
+  text-align:center;
+  }
+  
+input {
+  background:rgb(153,153,204);
+  border:solid rgb(102,102,153) 2px;
+  color:white;
+  font-weight:bold;
+  margin-right:1em;
+  padding:0.1em 0.5em 0.1em 0.5em;
+  }
+//-->
+</style>
+</head>
+<body>
+<div class="head">
+  <h1 class="apc">
+    <div class="logo"><span class="logo"><a href="http://pecl.php.net/package/APC">APC</a></span></div>
+    <div class="nameinfo">Opcode Cache</div>
+  </h1>
+  <div class="login">
+  <?php put_login_link(); ?>
+  </div>
+  <hr class="apc">
+</div>
+<?php
+
+
+// Display main Menu
+echo <<<EOB
+  <ol class=menu>
+  <li><a href="$MY_SELF&OB={$MYREQUEST['OB']}&SH={$MYREQUEST['SH']}">Refresh Data</a></li>
+EOB;
+echo
+  menu_entry(1,'View Host Stats'),
+  menu_entry(2,'System Cache Entries');
+if ($AUTHENTICATED) {
+  echo menu_entry(4,'Per-Directory Entries');
+}
+echo
+  menu_entry(3,'User Cache Entries'),
+  menu_entry(9,'Version Check');
+  
+if ($AUTHENTICATED) {
+  echo <<<EOB
+    <li><a class="aright" href="$MY_SELF&CC=1&OB={$MYREQUEST['OB']}" onClick="javascript:return confirm('Are you sure?');">Clear $cache_mode Cache</a></li>
+EOB;
+}
+echo <<<EOB
+  </ol>
+EOB;
+
+
+// CONTENT
+echo <<<EOB
+  <div class=content>
+EOB;
+
+// MAIN SWITCH STATEMENT
+
+switch ($MYREQUEST['OB']) {
+
+
+
+
+
+// -----------------------------------------------
+// Host Stats
+// -----------------------------------------------
+case OB_HOST_STATS:
+  $mem_size = $mem['num_seg']*$mem['seg_size'];
+  $mem_avail= $mem['avail_mem'];
+  $mem_used = $mem_size-$mem_avail;
+  $seg_size = bsize($mem['seg_size']);
+  $req_rate = sprintf("%.2f",($cache['num_hits']+$cache['num_misses'])/($time-$cache['start_time']));
+  $hit_rate = sprintf("%.2f",($cache['num_hits'])/($time-$cache['start_time']));
+  $miss_rate = sprintf("%.2f",($cache['num_misses'])/($time-$cache['start_time']));
+  $insert_rate = sprintf("%.2f",($cache['num_inserts'])/($time-$cache['start_time']));
+  $req_rate_user = sprintf("%.2f",($cache_user['num_hits']+$cache_user['num_misses'])/($time-$cache_user['start_time']));
+  $hit_rate_user = sprintf("%.2f",($cache_user['num_hits'])/($time-$cache_user['start_time']));
+  $miss_rate_user = sprintf("%.2f",($cache_user['num_misses'])/($time-$cache_user['start_time']));
+  $insert_rate_user = sprintf("%.2f",($cache_user['num_inserts'])/($time-$cache_user['start_time']));
+  $apcversion = phpversion('apc');
+  $phpversion = phpversion();
+  $number_files = $cache['num_entries'];
+    $size_files = bsize($cache['mem_size']);
+  $number_vars = $cache_user['num_entries'];
+    $size_vars = bsize($cache_user['mem_size']);
+  $i=0;
+  echo <<< EOB
+    <div class="info div1"><h2>General Cache Information</h2>
+    <table cellspacing=0><tbody>
+    <tr class=tr-0><td class=td-0>APC Version</td><td>$apcversion</td></tr>
+    <tr class=tr-1><td class=td-0>PHP Version</td><td>$phpversion</td></tr>
+EOB;
+
+  if(!empty($_SERVER['SERVER_NAME']))
+    echo "<tr class=tr-0><td class=td-0>APC Host</td><td>{$_SERVER['SERVER_NAME']} $host</td></tr>\n";
+  if(!empty($_SERVER['SERVER_SOFTWARE']))
+    echo "<tr class=tr-1><td class=td-0>Server Software</td><td>{$_SERVER['SERVER_SOFTWARE']}</td></tr>\n";
+
+  echo <<<EOB
+    <tr class=tr-0><td class=td-0>Shared Memory</td><td>{$mem['num_seg']} Segment(s) with $seg_size
+    <br/> ({$cache['memory_type']} memory, {$cache['locking_type']} locking)
+    </td></tr>
+EOB;
+  echo   '<tr class=tr-1><td class=td-0>Start Time</td><td>',date(DATE_FORMAT,$cache['start_time']),'</td></tr>';
+  echo   '<tr class=tr-0><td class=td-0>Uptime</td><td>',duration($cache['start_time']),'</td></tr>';
+  echo   '<tr class=tr-1><td class=td-0>File Upload Support</td><td>',$cache['file_upload_progress'],'</td></tr>';
+  echo <<<EOB
+    </tbody></table>
+    </div>
+
+    <div class="info div1"><h2>File Cache Information</h2>
+    <table cellspacing=0><tbody>
+    <tr class=tr-0><td class=td-0>Cached Files</td><td>$number_files ($size_files)</td></tr>
+    <tr class=tr-1><td class=td-0>Hits</td><td>{$cache['num_hits']}</td></tr>
+    <tr class=tr-0><td class=td-0>Misses</td><td>{$cache['num_misses']}</td></tr>
+    <tr class=tr-1><td class=td-0>Request Rate (hits, misses)</td><td>$req_rate cache requests/second</td></tr>
+    <tr class=tr-0><td class=td-0>Hit Rate</td><td>$hit_rate cache requests/second</td></tr>
+    <tr class=tr-1><td class=td-0>Miss Rate</td><td>$miss_rate cache requests/second</td></tr>
+    <tr class=tr-0><td class=td-0>Insert Rate</td><td>$insert_rate cache requests/second</td></tr>
+    <tr class=tr-1><td class=td-0>Cache full count</td><td>{$cache['expunges']}</td></tr>
+    </tbody></table>
+    </div>
+
+    <div class="info div1"><h2>User Cache Information</h2>
+    <table cellspacing=0><tbody>
+    <tr class=tr-0><td class=td-0>Cached Variables</td><td>$number_vars ($size_vars)</td></tr>
+    <tr class=tr-1><td class=td-0>Hits</td><td>{$cache_user['num_hits']}</td></tr>
+    <tr class=tr-0><td class=td-0>Misses</td><td>{$cache_user['num_misses']}</td></tr>
+    <tr class=tr-1><td class=td-0>Request Rate (hits, misses)</td><td>$req_rate_user cache requests/second</td></tr>
+    <tr class=tr-0><td class=td-0>Hit Rate</td><td>$hit_rate_user cache requests/second</td></tr>
+    <tr class=tr-1><td class=td-0>Miss Rate</td><td>$miss_rate_user cache requests/second</td></tr>
+    <tr class=tr-0><td class=td-0>Insert Rate</td><td>$insert_rate_user cache requests/second</td></tr>
+    <tr class=tr-1><td class=td-0>Cache full count</td><td>{$cache_user['expunges']}</td></tr>
+
+    </tbody></table>
+    </div>
+
+    <div class="info div2"><h2>Runtime Settings</h2><table cellspacing=0><tbody>
+EOB;
+
+  $j = 0;
+  foreach (ini_get_all('apc') as $k => $v) {
+    echo "<tr class=tr-$j><td class=td-0>",$k,"</td><td>",str_replace(',',',<br />',$v['local_value']),"</td></tr>\n";
+    $j = 1 - $j;
+  }
+
+  if($mem['num_seg']>1 || $mem['num_seg']==1 && count($mem['block_lists'][0])>1)
+    $mem_note = "Memory Usage<br /><font size=-2>(multiple slices indicate fragments)</font>";
+  else
+    $mem_note = "Memory Usage";
+
+  echo <<< EOB
+    </tbody></table>
+    </div>
+
+    <div class="graph div3"><h2>Host Status Diagrams</h2>
+    <table cellspacing=0><tbody>
+EOB;
+  $size='width='.(GRAPH_SIZE+50).' height='.(GRAPH_SIZE+10);
+  echo <<<EOB
+    <tr>
+    <td class=td-0>$mem_note</td>
+    <td class=td-1>Hits &amp; Misses</td>
+    </tr>
+EOB;
+
+  echo
+    graphics_avail() ?
+        '<tr>'.
+        "<td class=td-0><img alt=\"\" $size src=\"$PHP_SELF?IMG=1&$time\"></td>".
+        "<td class=td-1><img alt=\"\" $size src=\"$PHP_SELF?IMG=2&$time\"></td></tr>\n"
+      : "",
+    '<tr>',
+    '<td class=td-0><span class="green box">&nbsp;</span>Free: ',bsize($mem_avail).sprintf(" (%.1f%%)",$mem_avail*100/$mem_size),"</td>\n",
+    '<td class=td-1><span class="green box">&nbsp;</span>Hits: ',$cache['num_hits'].sprintf(" (%.1f%%)",$cache['num_hits']*100/($cache['num_hits']+$cache['num_misses'])),"</td>\n",
+    '</tr>',
+    '<tr>',
+    '<td class=td-0><span class="red box">&nbsp;</span>Used: ',bsize($mem_used ).sprintf(" (%.1f%%)",$mem_used *100/$mem_size),"</td>\n",
+    '<td class=td-1><span class="red box">&nbsp;</span>Misses: ',$cache['num_misses'].sprintf(" (%.1f%%)",$cache['num_misses']*100/($cache['num_hits']+$cache['num_misses'])),"</td>\n";
+  echo <<< EOB
+    </tr>
+    </tbody></table>
+
+    <br/>
+    <h2>Detailed Memory Usage and Fragmentation</h2>
+    <table cellspacing=0><tbody>
+    <tr>
+    <td class=td-0 colspan=2><br/>
+EOB;
+
+  // Fragementation: (freeseg - 1) / total_seg
+  $nseg = $freeseg = $fragsize = $freetotal = 0;
+  for($i=0; $i<$mem['num_seg']; $i++) {
+    $ptr = 0;
+    foreach($mem['block_lists'][$i] as $block) {
+      if ($block['offset'] != $ptr) {
+        ++$nseg;
+      }
+      $ptr = $block['offset'] + $block['size'];
+                        /* Only consider blocks <5M for the fragmentation % */
+                        if($block['size']<(5*1024*1024)) $fragsize+=$block['size'];
+                        $freetotal+=$block['size'];
+    }
+    $freeseg += count($mem['block_lists'][$i]);
+  }
+  
+  if ($freeseg > 1) {
+    $frag = sprintf("%.2f%% (%s out of %s in %d fragments)", ($fragsize/$freetotal)*100,bsize($fragsize),bsize($freetotal),$freeseg);
+  } else {
+    $frag = "0%";
+  }
+
+  if (graphics_avail()) {
+    $size='width='.(2*GRAPH_SIZE+150).' height='.(GRAPH_SIZE+10);
+    echo <<<EOB
+      <img alt="" $size src="$PHP_SELF?IMG=3&$time">
+EOB;
+  }
+  echo <<<EOB
+    </br>Fragmentation: $frag
+    </td>
+    </tr>
+EOB;
+        if(isset($mem['adist'])) {
+          foreach($mem['adist'] as $i=>$v) {
+            $cur = pow(2,$i); $nxt = pow(2,$i+1)-1;
+            if($i==0) $range = "1";
+            else $range = "$cur - $nxt";
+            echo "<tr><th align=right>$range</th><td align=right>$v</td></tr>\n";
+          }
+        }
+        echo <<<EOB
+    </tbody></table>
+    </div>
+EOB;
+    
+  break;
+
+
+// -----------------------------------------------
+// User Cache Entries
+// -----------------------------------------------
+case OB_USER_CACHE:
+  if (!$AUTHENTICATED) {
+    echo '<div class="error">You need to login to see the user values here!<br/>&nbsp;<br/>';
+    put_login_link("Login now!");
+    echo '</div>';
+    break;
+  }
+  $fieldname='info';
+  $fieldheading='User Entry Label';
+  $fieldkey='info';
+
+// -----------------------------------------------
+// System Cache Entries
+// -----------------------------------------------
+case OB_SYS_CACHE:
+  if (!isset($fieldname))
+  {
+    $fieldname='filename';
+    $fieldheading='Script Filename';
+    if(ini_get("apc.stat")) $fieldkey='inode';
+    else $fieldkey='filename';
+  }
+  if (!empty($MYREQUEST['SH']))
+  {
+    echo <<< EOB
+      <div class="info"><table cellspacing=0><tbody>
+      <tr><th>Attribute</th><th>Value</th></tr>
+EOB;
+
+    $m=0;
+    foreach($scope_list as $j => $list) {
+      foreach($cache[$list] as $i => $entry) {
+        if (md5($entry[$fieldkey])!=$MYREQUEST['SH']) continue;
+        foreach($entry as $k => $value) {
+          if (!$AUTHENTICATED) {
+            // hide all path entries if not logged in
+            $value=preg_replace('/^.*(\\/|\\\\)/','<i>&lt;hidden&gt;</i>/',$value);
+          }
+
+          if ($k == "num_hits") {
+            $value=sprintf("%s (%.2f%%)",$value,$value*100/$cache['num_hits']);
+          }
+          if ($k == 'deletion_time') {
+            if(!$entry['deletion_time']) $value = "None";
+          }
+          echo
+            "<tr class=tr-$m>",
+            "<td class=td-0>",ucwords(preg_replace("/_/"," ",$k)),"</td>",
+            "<td class=td-last>",(preg_match("/time/",$k) && $value!='None') ? date(DATE_FORMAT,$value) : htmlspecialchars($value, ENT_QUOTES, 'UTF-8'),"</td>",
+            "</tr>";
+          $m=1-$m;
+        }
+        if($fieldkey=='info') {
+          echo "<tr class=tr-$m><td class=td-0>Stored Value</td><td class=td-last><pre>";
+          $output = var_export(apc_fetch($entry[$fieldkey]),true);
+          echo htmlspecialchars($output, ENT_QUOTES, 'UTF-8');
+          echo "</pre></td></tr>\n";
+        }
+        break;
+      }
+    }
+
+    echo <<<EOB
+      </tbody></table>
+      </div>
+EOB;
+    break;
+  }
+
+  $cols=6;
+  echo <<<EOB
+    <div class=sorting><form>Scope:
+    <input type=hidden name=OB value={$MYREQUEST['OB']}>
+    <select name=SCOPE>
+EOB;
+  echo
+    "<option value=A",$MYREQUEST['SCOPE']=='A' ? " selected":"",">Active</option>",
+    "<option value=D",$MYREQUEST['SCOPE']=='D' ? " selected":"",">Deleted</option>",
+    "</select>",
+    ", Sorting:<select name=SORT1>",
+    "<option value=H",$MYREQUEST['SORT1']=='H' ? " selected":"",">Hits</option>",
+    "<option value=Z",$MYREQUEST['SORT1']=='Z' ? " selected":"",">Size</option>",
+    "<option value=S",$MYREQUEST['SORT1']=='S' ? " selected":"",">$fieldheading</option>",
+    "<option value=A",$MYREQUEST['SORT1']=='A' ? " selected":"",">Last accessed</option>",
+    "<option value=M",$MYREQUEST['SORT1']=='M' ? " selected":"",">Last modified</option>",
+    "<option value=C",$MYREQUEST['SORT1']=='C' ? " selected":"",">Created at</option>",
+    "<option value=D",$MYREQUEST['SORT1']=='D' ? " selected":"",">Deleted at</option>";
+  if($fieldname=='info') echo
+    "<option value=D",$MYREQUEST['SORT1']=='T' ? " selected":"",">Timeout</option>";
+  echo
+    '</select>',
+    '<select name=SORT2>',
+    '<option value=D',$MYREQUEST['SORT2']=='D' ? ' selected':'','>DESC</option>',
+    '<option value=A',$MYREQUEST['SORT2']=='A' ? ' selected':'','>ASC</option>',
+    '</select>',
+    '<select name=COUNT onChange="form.submit()">',
+    '<option value=10 ',$MYREQUEST['COUNT']=='10' ? ' selected':'','>Top 10</option>',
+    '<option value=20 ',$MYREQUEST['COUNT']=='20' ? ' selected':'','>Top 20</option>',
+    '<option value=50 ',$MYREQUEST['COUNT']=='50' ? ' selected':'','>Top 50</option>',
+    '<option value=100',$MYREQUEST['COUNT']=='100'? ' selected':'','>Top 100</option>',
+    '<option value=150',$MYREQUEST['COUNT']=='150'? ' selected':'','>Top 150</option>',
+    '<option value=200',$MYREQUEST['COUNT']=='200'? ' selected':'','>Top 200</option>',
+    '<option value=500',$MYREQUEST['COUNT']=='500'? ' selected':'','>Top 500</option>',
+    '<option value=0  ',$MYREQUEST['COUNT']=='0'  ? ' selected':'','>All</option>',
+    '</select>',
+    '&nbsp; Search: <input name=SEARCH value="',$MYREQUEST['SEARCH'],'" type=text size=25/>',
+    '&nbsp;<input type=submit value="GO!">',
+    '</form></div>';
+
+  if (isset($MYREQUEST['SEARCH'])) {
+  // Don't use preg_quote because we want the user to be able to specify a
+  // regular expression subpattern.
+  $MYREQUEST['SEARCH'] = '/'.str_replace('/', '\\/', $MYREQUEST['SEARCH']).'/i';
+  if (preg_match($MYREQUEST['SEARCH'], 'test') === false) {
+    echo '<div class="error">Error: enter a valid regular expression as a search query.</div>';
+    break;
+  }
+  }
+
+  echo
+    '<div class="info"><table cellspacing=0><tbody>',
+    '<tr>',
+    '<th>',sortheader('S',$fieldheading,  "&OB=".$MYREQUEST['OB']),'</th>',
+    '<th>',sortheader('H','Hits',         "&OB=".$MYREQUEST['OB']),'</th>',
+    '<th>',sortheader('Z','Size',         "&OB=".$MYREQUEST['OB']),'</th>',
+    '<th>',sortheader('A','Last accessed',"&OB=".$MYREQUEST['OB']),'</th>',
+    '<th>',sortheader('M','Last modified',"&OB=".$MYREQUEST['OB']),'</th>',
+    '<th>',sortheader('C','Created at',   "&OB=".$MYREQUEST['OB']),'</th>';
+
+  if($fieldname=='info') {
+    $cols+=2;
+    echo '<th>',sortheader('T','Timeout',"&OB=".$MYREQUEST['OB']),'</th>';
+  }
+  echo '<th>',sortheader('D','Deleted at',"&OB=".$MYREQUEST['OB']),'</th></tr>';
+
+  // builds list with alpha numeric sortable keys
+  //
+  $list = array();
+  foreach($cache[$scope_list[$MYREQUEST['SCOPE']]] as $i => $entry) {
+    switch($MYREQUEST['SORT1']) {
+      case 'A': $k=sprintf('%015d-',$entry['access_time']); 	break;
+      case 'H': $k=sprintf('%015d-',$entry['num_hits']); 		break;
+      case 'Z': $k=sprintf('%015d-',$entry['mem_size']); 		break;
+      case 'M': $k=sprintf('%015d-',$entry['mtime']);			break;
+      case 'C': $k=sprintf('%015d-',$entry['creation_time']);	break;
+      case 'T': $k=sprintf('%015d-',$entry['ttl']);			break;
+      case 'D': $k=sprintf('%015d-',$entry['deletion_time']);	break;
+      case 'S': $k='';										break;
+    }
+    if (!$AUTHENTICATED) {
+      // hide all path entries if not logged in
+      $list[$k.$entry[$fieldname]]=preg_replace('/^.*(\\/|\\\\)/','*hidden*/',$entry);
+    } else {
+      $list[$k.$entry[$fieldname]]=$entry;
+    }
+  }
+
+  if ($list) {
+    
+    // sort list
+    //
+    switch ($MYREQUEST['SORT2']) {
+      case "A":	krsort($list);	break;
+      case "D":	ksort($list);	break;
+    }
+    
+    // output list
+    $i=0;
+    foreach($list as $k => $entry) {
+      if(!$MYREQUEST['SEARCH'] || preg_match($MYREQUEST['SEARCH'], $entry[$fieldname]) != 0) {
+        $field_value = htmlentities(strip_tags($entry[$fieldname],''), ENT_QUOTES, 'UTF-8');
+        echo
+          '<tr class=tr-',$i%2,'>',
+          "<td class=td-0><a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&SH=",md5($entry[$fieldkey]),"\">",$field_value,'</a></td>',
+          '<td class="td-n center">',$entry['num_hits'],'</td>',
+          '<td class="td-n right">',$entry['mem_size'],'</td>',
+          '<td class="td-n center">',date(DATE_FORMAT,$entry['access_time']),'</td>',
+          '<td class="td-n center">',date(DATE_FORMAT,$entry['mtime']),'</td>',
+          '<td class="td-n center">',date(DATE_FORMAT,$entry['creation_time']),'</td>';
+
+        if($fieldname=='info') {
+          if($entry['ttl'])
+            echo '<td class="td-n center">'.$entry['ttl'].' seconds</td>';
+          else
+            echo '<td class="td-n center">None</td>';
+        }
+        if ($entry['deletion_time']) {
+
+          echo '<td class="td-last center">', date(DATE_FORMAT,$entry['deletion_time']), '</td>';
+        } else if ($MYREQUEST['OB'] == OB_USER_CACHE) {
+
+          echo '<td class="td-last center">';
+          echo '[<a href="', $MY_SELF, '&OB=', $MYREQUEST['OB'], '&DU=', urlencode($entry[$fieldkey]), '">Delete Now</a>]';
+          echo '</td>';
+        } else {
+          echo '<td class="td-last center"> &nbsp; </td>';
+        }
+        echo '</tr>';
+        $i++;
+        if ($i == $MYREQUEST['COUNT'])
+          break;
+      }
+    }
+    
+  } else {
+    echo '<tr class=tr-0><td class="center" colspan=',$cols,'><i>No data</i></td></tr>';
+  }
+  echo <<< EOB
+    </tbody></table>
+EOB;
+
+  if ($list && $i < count($list)) {
+    echo "<a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&COUNT=0\"><i>",count($list)-$i,' more available...</i></a>';
+  }
+
+  echo <<< EOB
+    </div>
+EOB;
+  break;
+
+
+// -----------------------------------------------
+// Per-Directory System Cache Entries
+// -----------------------------------------------
+case OB_SYS_CACHE_DIR:
+  if (!$AUTHENTICATED) {
+    break;
+  }
+
+  echo <<<EOB
+    <div class=sorting><form>Scope:
+    <input type=hidden name=OB value={$MYREQUEST['OB']}>
+    <select name=SCOPE>
+EOB;
+  echo
+    "<option value=A",$MYREQUEST['SCOPE']=='A' ? " selected":"",">Active</option>",
+    "<option value=D",$MYREQUEST['SCOPE']=='D' ? " selected":"",">Deleted</option>",
+    "</select>",
+    ", Sorting:<select name=SORT1>",
+    "<option value=H",$MYREQUEST['SORT1']=='H' ? " selected":"",">Total Hits</option>",
+    "<option value=Z",$MYREQUEST['SORT1']=='Z' ? " selected":"",">Total Size</option>",
+    "<option value=T",$MYREQUEST['SORT1']=='T' ? " selected":"",">Number of Files</option>",
+    "<option value=S",$MYREQUEST['SORT1']=='S' ? " selected":"",">Directory Name</option>",
+    "<option value=A",$MYREQUEST['SORT1']=='A' ? " selected":"",">Avg. Size</option>",
+    "<option value=C",$MYREQUEST['SORT1']=='C' ? " selected":"",">Avg. Hits</option>",
+    '</select>',
+    '<select name=SORT2>',
+    '<option value=D',$MYREQUEST['SORT2']=='D' ? ' selected':'','>DESC</option>',
+    '<option value=A',$MYREQUEST['SORT2']=='A' ? ' selected':'','>ASC</option>',
+    '</select>',
+    '<select name=COUNT onChange="form.submit()">',
+    '<option value=10 ',$MYREQUEST['COUNT']=='10' ? ' selected':'','>Top 10</option>',
+    '<option value=20 ',$MYREQUEST['COUNT']=='20' ? ' selected':'','>Top 20</option>',
+    '<option value=50 ',$MYREQUEST['COUNT']=='50' ? ' selected':'','>Top 50</option>',
+    '<option value=100',$MYREQUEST['COUNT']=='100'? ' selected':'','>Top 100</option>',
+    '<option value=150',$MYREQUEST['COUNT']=='150'? ' selected':'','>Top 150</option>',
+    '<option value=200',$MYREQUEST['COUNT']=='200'? ' selected':'','>Top 200</option>',
+    '<option value=500',$MYREQUEST['COUNT']=='500'? ' selected':'','>Top 500</option>',
+    '<option value=0  ',$MYREQUEST['COUNT']=='0'  ? ' selected':'','>All</option>',
+    '</select>',
+    ", Group By Dir Level:<select name=AGGR>",
+    "<option value='' selected>None</option>";
+    for ($i = 1; $i < 10; $i++)
+      echo "<option value=$i",$MYREQUEST['AGGR']==$i ? " selected":"",">$i</option>";
+    echo '</select>',
+    '&nbsp;<input type=submit value="GO!">',
+    '</form></div>',
+
+    '<div class="info"><table cellspacing=0><tbody>',
+    '<tr>',
+    '<th>',sortheader('S','Directory Name',	"&OB=".$MYREQUEST['OB']),'</th>',
+    '<th>',sortheader('T','Number of Files',"&OB=".$MYREQUEST['OB']),'</th>',
+    '<th>',sortheader('H','Total Hits',	"&OB=".$MYREQUEST['OB']),'</th>',
+    '<th>',sortheader('Z','Total Size',	"&OB=".$MYREQUEST['OB']),'</th>',
+    '<th>',sortheader('C','Avg. Hits',	"&OB=".$MYREQUEST['OB']),'</th>',
+    '<th>',sortheader('A','Avg. Size',	"&OB=".$MYREQUEST['OB']),'</th>',
+    '</tr>';
+
+  // builds list with alpha numeric sortable keys
+  //
+  $tmp = $list = array();
+  foreach($cache[$scope_list[$MYREQUEST['SCOPE']]] as $entry) {
+    $n = dirname($entry['filename']);
+    if ($MYREQUEST['AGGR'] > 0) {
+      $n = preg_replace("!^(/?(?:[^/\\\\]+[/\\\\]){".($MYREQUEST['AGGR']-1)."}[^/\\\\]*).*!", "$1", $n);
+    }
+    if (!isset($tmp[$n])) {
+      $tmp[$n] = array('hits'=>0,'size'=>0,'ents'=>0);
+    }
+    $tmp[$n]['hits'] += $entry['num_hits'];
+    $tmp[$n]['size'] += $entry['mem_size'];
+    ++$tmp[$n]['ents'];
+  }
+
+  foreach ($tmp as $k => $v) {
+    switch($MYREQUEST['SORT1']) {
+      case 'A': $kn=sprintf('%015d-',$v['size'] / $v['ents']);break;
+      case 'T': $kn=sprintf('%015d-',$v['ents']);		break;
+      case 'H': $kn=sprintf('%015d-',$v['hits']);		break;
+      case 'Z': $kn=sprintf('%015d-',$v['size']);		break;
+      case 'C': $kn=sprintf('%015d-',$v['hits'] / $v['ents']);break;
+      case 'S': $kn = $k;					break;
+    }
+    $list[$kn.$k] = array($k, $v['ents'], $v['hits'], $v['size']);
+  }
+
+  if ($list) {
+    
+    // sort list
+    //
+    switch ($MYREQUEST['SORT2']) {
+      case "A":	krsort($list);	break;
+      case "D":	ksort($list);	break;
+    }
+    
+    // output list
+    $i = 0;
+    foreach($list as $entry) {
+      echo
+        '<tr class=tr-',$i%2,'>',
+        "<td class=td-0>",$entry[0],'</a></td>',
+        '<td class="td-n center">',$entry[1],'</td>',
+        '<td class="td-n center">',$entry[2],'</td>',
+        '<td class="td-n center">',$entry[3],'</td>',
+        '<td class="td-n center">',round($entry[2] / $entry[1]),'</td>',
+        '<td class="td-n center">',round($entry[3] / $entry[1]),'</td>',
+        '</tr>';
+
+      if (++$i == $MYREQUEST['COUNT']) break;
+    }
+    
+  } else {
+    echo '<tr class=tr-0><td class="center" colspan=6><i>No data</i></td></tr>';
+  }
+  echo <<< EOB
+    </tbody></table>
+EOB;
+
+  if ($list && $i < count($list)) {
+    echo "<a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&COUNT=0\"><i>",count($list)-$i,' more available...</i></a>';
+  }
+
+  echo <<< EOB
+    </div>
+EOB;
+  break;
+
+// -----------------------------------------------
+// Version check
+// -----------------------------------------------
+case OB_VERSION_CHECK:
+  echo <<<EOB
+    <div class="info"><h2>APC Version Information</h2>
+    <table cellspacing=0><tbody>
+    <tr>
+    <th></th>
+    </tr>
+EOB;
+  if (defined('PROXY')) {
+    $ctxt = stream_context_create( array( 'http' => array( 'proxy' => PROXY, 'request_fulluri' => True ) ) );
+    $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apc.rss", False, $ctxt);
+  } else {
+    $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apc.rss");
+  }
+  if (!$rss) {
+    echo '<tr class="td-last center"><td>Unable to fetch version information.</td></tr>';
+  } else {
+    $apcversion = phpversion('apc');
+
+    preg_match('!<title>APC ([0-9.]+)</title>!', $rss, $match);
+    echo '<tr class="tr-0 center"><td>';
+    if (version_compare($apcversion, $match[1], '>=')) {
+      echo '<div class="ok">You are running the latest version of APC ('.$apcversion.')</div>';
+      $i = 3;
+    } else {
+      echo '<div class="failed">You are running an older version of APC ('.$apcversion.'),
+        newer version '.$match[1].' is available at <a href="http://pecl.php.net/package/APC/'.$match[1].'">
+        http://pecl.php.net/package/APC/'.$match[1].'</a>
+        </div>';
+      $i = -1;
+    }
+    echo '</td></tr>';
+    echo '<tr class="tr-0"><td><h3>Change Log:</h3><br/>';
+
+    preg_match_all('!<(title|description)>([^<]+)</\\1>!', $rss, $match);
+    next($match[2]); next($match[2]);
+
+    while (list(,$v) = each($match[2])) {
+      list(,$ver) = explode(' ', $v, 2);
+      if ($i < 0 && version_compare($apcversion, $ver, '>=')) {
+        break;
+      } else if (!$i--) {
+        break;
+      }
+      echo "<b><a href=\"http://pecl.php.net/package/APC/$ver\">".htmlspecialchars($v, ENT_QUOTES, 'UTF-8')."</a></b><br><blockquote>";
+      echo nl2br(htmlspecialchars(current($match[2]), ENT_QUOTES, 'UTF-8'))."</blockquote>";
+      next($match[2]);
+    }
+    echo '</td></tr>';
+  }
+  echo <<< EOB
+    </tbody></table>
+    </div>
+EOB;
+  break;
+
+}
+
+echo <<< EOB
+  </div>
+EOB;
+
+?>
+
+<!-- <?php echo "\nBased on APCGUI By R.Becker\n$VERSION\n"?> -->
+</body>
+</html>
+
+

=== added file 'files/_debug/info.php'
--- files/_debug/info.php	1970-01-01 00:00:00 +0000
+++ files/_debug/info.php	2012-08-21 13:22:29 +0000
@@ -0,0 +1,3 @@
+<?php
+
+phpinfo();

=== added directory 'files/charm'
=== added directory 'files/charm/nginx'
=== added file 'files/charm/nginx/etc_nginx_nginx.conf'
--- files/charm/nginx/etc_nginx_nginx.conf	1970-01-01 00:00:00 +0000
+++ files/charm/nginx/etc_nginx_nginx.conf	2012-08-21 13:22:29 +0000
@@ -0,0 +1,58 @@
+user www-data;
+worker_processes 4;
+pid /var/run/nginx.pid;
+
+events {
+  worker_connections 8192;
+  multi_accept on;
+  use epoll;
+}
+
+http {
+  ##
+  # Reverse
+  ##
+  set_real_ip_from 0.0.0.0/0;
+  real_ip_header X-Forwarded-For;
+  add_header X-UA-Compatible "IE=Edge,chrome=1";
+
+  ##
+  # Rockin Defaults
+  ##
+  sendfile on;
+  tcp_nopush on;
+  tcp_nodelay on;
+  keepalive_timeout 5;
+  types_hash_max_size 2048;
+  server_names_hash_bucket_size 64;
+  server_name_in_redirect off;
+  client_max_body_size 512k;
+  include /etc/nginx/mime.types;
+  default_type application/octet-stream;
+  index index.php index.html
+
+  ##
+  # Logging Settings
+  ##
+  access_log /var/log/nginx/access.log;
+  error_log /var/log/nginx/error.log;
+
+  ##
+  # Gzip Settings
+  ##
+  gzip on;
+  gzip_disable "msie6";
+  gzip_vary on;
+  gzip_static on;
+  gzip_proxied any;
+  gzip_comp_level 4;
+  gzip_buffers 16 8k;
+  gzip_http_version 1.1;
+  gzip_types text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+
+  ##
+  # Virtual Host Configs
+  ##
+  include /etc/nginx/conf.d/*.conf;
+  include /etc/nginx/sites-enabled/*;
+}

=== added file 'files/charm/nginx/etc_nginx_sites-enabled_loadbalancer'
--- files/charm/nginx/etc_nginx_sites-enabled_loadbalancer	1970-01-01 00:00:00 +0000
+++ files/charm/nginx/etc_nginx_sites-enabled_loadbalancer	2012-08-21 13:22:29 +0000
@@ -0,0 +1,51 @@
+# Default before peer relation is handled
+proxy_cache_path /mnt/ramdisk/proxy-cache levels=1:2 keys_zone=proxycache:5m max_size=1000m;
+
+upstream backend {
+  server 127.0.0.1:8080;
+}
+
+server {
+  listen 80 default;
+  server_name _;
+  location / {
+    set $no_cache "";
+
+    if ($request_method !~ ^(GET|HEAD)$) {
+      set $no_cache "1";
+    }
+
+    if ($no_cache = "1") {
+      add_header Set-Cookie "_mcnc=1; Max-Age=2; Path=/";
+      add_header X-Microcachable "0";
+    }
+
+    if ($http_cookie ~* "_mcnc") {
+      set $no_cache "1";
+    }
+
+    proxy_no_cache $no_cache;
+    proxy_cache_bypass $no_cache;
+
+    proxy_redirect   http://backend  /;
+    proxy_pass  http://backend;
+    proxy_cache proxycache;
+    proxy_cache_key $scheme$host$request_method$request_uri;
+    proxy_cache_valid 200 60s;
+    proxy_cache_use_stale updating;
+
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+    proxy_max_temp_file_size 1M;
+
+    # Custom logging
+    log_format custom '$remote_addr - $remote_user [$time_local]  '
+             '"$request" $status $body_bytes_sent '
+             '"$http_referer" "$http_user_agent" nocache:$no_cache';
+    access_log  /mnt/logs/microcache.log custom;
+
+  }
+}
+

=== added file 'files/charm/nginx/etc_nginx_sites-enabled_wordpress'
--- files/charm/nginx/etc_nginx_sites-enabled_wordpress	1970-01-01 00:00:00 +0000
+++ files/charm/nginx/etc_nginx_sites-enabled_wordpress	2012-08-21 13:22:29 +0000
@@ -0,0 +1,72 @@
+fastcgi_cache_path /mnt/ramdisk/phpfpm-cache levels=1:2 keys_zone=microcache:5M max_size=1G inactive=2h;
+
+server {
+  listen 8080 default;
+  server_name _;
+  access_log /mnt/access.log;
+  error_log /mnt/error.log;
+  root   /var/www/;
+  index index.php index.html;
+  client_max_body_size    10m;
+  client_body_buffer_size 128k;
+  client_header_buffer_size 64k;
+
+  location = /favicon.ico {
+    allow all;
+    log_not_found off;
+    access_log off;
+  }
+
+  location = /robots.txt {
+    allow all;
+    log_not_found off;
+    access_log off;
+  }
+
+  location ~* \.(js|css|png|jpg|jpeg|gif|ico|zip|gz|tar)$ {
+    log_not_found off;
+    access_log off;
+    expires max;
+  }
+
+  location / {
+    # try_files "${document_root}/wp-content/cache/supercache/${host}/${uri}index.html" "${uri}/" "${uri}/index.html" $uri @rewrite;
+    try_files $uri $uri/ /index.php?q=$uri&$args;
+  }
+
+  location ~ /\. {
+    access_log off;
+    log_not_found off;
+    deny all;
+  }
+
+  location ~* /(fpm.www.status|fpm.www.ping)$ {
+    include /etc/nginx/fastcgi_params;
+    fastcgi_pass unix:/var/run/php5-fpm.sock;
+    fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    fastcgi_param SCRIPT_NAME     $fastcgi_script_name;
+    fastcgi_param QUERY_STRING    $args;
+  }
+
+  location ~ \.php$ {
+    try_files $uri @rewrite;
+    include /etc/nginx/fastcgi_params;
+    fastcgi_pass unix:/var/run/php5-fpm.sock;
+    fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    fastcgi_param SCRIPT_NAME     $fastcgi_script_name;
+    fastcgi_param QUERY_STRING    $args;
+  }
+
+  location @rewrite {
+    index index.php;
+    include /etc/nginx/fastcgi_params;
+    fastcgi_pass unix:/var/run/php5-fpm.sock;
+    fastcgi_buffers 256 4k;
+    fastcgi_intercept_errors on;
+    fastcgi_hide_header 'X-Generator';
+    fastcgi_read_timeout 14400;
+    fastcgi_param SCRIPT_FILENAME $document_root/index.php;
+    fastcgi_param SCRIPT_NAME     /index.php;
+    fastcgi_param QUERY_STRING    $args;
+  }
+}

=== added directory 'files/charm/php'
=== added file 'files/charm/php/php5-fpm_pool.d_www.conf'
--- files/charm/php/php5-fpm_pool.d_www.conf	1970-01-01 00:00:00 +0000
+++ files/charm/php/php5-fpm_pool.d_www.conf	2012-08-21 13:22:29 +0000
@@ -0,0 +1,41 @@
+; -------------------------------------------------------------------- ;
+; first pool
+; -------------------------------------------------------------------- ;
+
+[www]
+user = www-data
+group = www-data
+
+listen = /var/run/php5-fpm.sock
+
+request_slowlog_timeout = 10s
+slowlog = /mnt/logs/php-fpm/$pool.slowlog.log
+
+pm = dynamic
+pm.max_children = 100
+pm.start_servers = 15
+pm.min_spare_servers = 4
+pm.max_spare_servers = 15
+pm.max_requests = 5000
+listen.backlog = -1
+
+; http://url/status
+; http://url/status?json
+; http://url/status?html
+pm.status_path = /fpm.$pool.status
+ping.path = /fpm.$pool.ping
+ping.response = "pong. $pool OK"
+
+request_terminate_timeout = 120s
+rlimit_files = 131072
+rlimit_core = unlimited
+catch_workers_output = no
+
+; this is untested will do this on a later update
+
+env[HOSTNAME] = $HOSTNAME
+env[PATH] = $PATH
+env[TMP] = /mnt/tmp
+env[TMPDIR] = /mnt/tmp
+env[TEMP] = /mnt/tmp
+env[OHSO_POOL] = $pool

=== added file 'files/charm/php/php5_conf.d_apc.ini'
--- files/charm/php/php5_conf.d_apc.ini	1970-01-01 00:00:00 +0000
+++ files/charm/php/php5_conf.d_apc.ini	2012-08-21 13:22:29 +0000
@@ -0,0 +1,13 @@
+extension=apc.so
+apc.enable=1
+apc.shm_size = 1024M
+apc.stat_ctime = 0
+apc.stat = 0
+apc.max_file_size = 2M
+apc.write_lock = true
+apc.mmap = /mnt/tmp/apc.XXXXXX
+apc.ttl = 0
+apc.user_ttl = 7200
+apc.gc_ttl = 7200
+apc.use_request_time = 1
+apc.file_md5 = 1

=== added file 'hooks/config-changed'
--- hooks/config-changed	1970-01-01 00:00:00 +0000
+++ hooks/config-changed	2012-08-21 13:22:29 +0000
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+set -ue
+
+source inc/common
+
+tuning_level=`config-get tuning`
+# Make it lower case
+tuning_level=${tuning_level,,}
+
+wp_content_repo=`config-get wp-content`
+expose_info=`config-get debug`
+expose_info=${expose_info,,}
+
+if [ ! -f $config_file_path ]; then
+	juju-log "Nothing to configure, since nothing is installed"
+	exit 0
+fi
+
+juju-log "Show details? $expose_info"
+
+if [ "$expose_info" == "yes" ]; then
+	rsync -az files/_debug $wp_install_path/
+else
+	rm -rf $wp_install_path/_debug
+fi
+
+juju-log "I will be using this tuning level: $tuning_level"
+
+if [ "$tuning_level" == "optimized" ]; then
+	# First and foremost, we need to disable the ability to edit
+	# themes and upload/update plugins. This breaks a scale-out
+	# environment. It's sad but true. If you want to update a plugin
+	# install a theme, etc; take a look at the README.
+	make_optimized
+elif [ "$tuning_level" == "single" ]; then
+	# We need to prepare an NFS mount, because someone is probably
+	# going to try to scale out. We also need to vamp up caching.
+	make_single
+elif [ "$tuning_level" == "bare" ]; then
+	# Okay, you know what you're doing. You're probably going to
+	# use Gluster to stream-line your files, so you don't need to
+	# disable anything. We trust you to do what you need to.
+	make_bare
+else
+	juju-log "Not sure about that tuning level."
+	exit 1
+fi
+
+do_vcs $wp_content_repo
+
+chown -R www-data.www-data $wp_install_path
+
+. hooks/restart

=== added symlink 'hooks/db-relation-broken'
=== target is u'db-relation-departed'
=== modified file 'hooks/db-relation-changed'
--- hooks/db-relation-changed	2012-06-18 20:28:16 +0000
+++ hooks/db-relation-changed	2012-08-21 13:22:29 +0000
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+<<<<<<< TREE
 set -eu # -x for verbose logging to juju debug-log
 
 UPLOAD_PATH="/var/www/wp-uploads"
@@ -9,24 +10,31 @@
 
 # Check we haven't already been setup.
 config_file_path="/etc/wordpress/config-default.php"
-
-# Get the database settings; if not set, wait for this hook to be
-# invoked again
+=======
+set -eu
+
+juju-log "We've got a db"
+
+source inc/common
+
+if [ -f "$config_file_path" ]; then
+	# No longer to quietly in to that good night. Update the wp-config file with new DB values
+	juju-log "WordPress is already setup, just silently going away"
+	exit 0
+fi
+>>>>>>> MERGE-SOURCE
+
 database=`relation-get database`
-if [ -z "$database" ] ; then
-    exit 0 # wait for future handshake from database service unit
-fi
-
-# Our protocol on this interface ensures that all or none of the
-# settings are set. But we can verify the setting or the values if
-# more error checking if desired.
 user=`relation-get user`
 password=`relation-get password`
 host=`relation-get private-address`
 
-# Create an internal secret key for wordpress; this is unrelated to
-# the password generated for the admin user of wordpress
+if [ -z "$database" ] ; then
+    exit 0
+fi
+
 secret_key=`pwgen 10 1`
+<<<<<<< TREE
 
 juju-log "Creating appropriate upload paths and directories"
 # Setup appropriate upload paths and directories
@@ -37,10 +45,39 @@
 chmod 0744 $UPLOAD_PATH
 chmod 0770 "$UPLOAD_PATH/$hostname"
 chown -R root:www-data "/var/www/$hostname/wp-content"
+=======
+echo $secret_key > 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="http://wordpress.org/latest.tar.gz"
+DOWNLOAD=`ch_get_file "$LATEST_WORDPRESS" "http://wordpress.org/latest.tar.gz.sha1"`
+##
+
+if [ ! -f "$DOWNLOAD" ] || [ -z "$DOWNLOAD" ]; then
+	juju-log "Failed to retrieve $LATEST_WORDPRESS"
+	exit 1
+fi
+
+juju-log "Extract ALL THE FILES"
+tar -xzf $DOWNLOAD
+
+mkdir -p $wp_install_path
+
+juju-log "Move them in to place, but just 'drop' them in place."
+rsync -az wordpress/ $wp_install_path
+
+juju-log "Clean up"
+rm -rf wordpress
+>>>>>>> MERGE-SOURCE
 
 juju-log "Writing wordpress config file $config_file_path"
 # Write the wordpress config
-cat > $config_file_path <<EOF
+cat > $config_info_path <<EOF
 <?php
 define('DB_NAME', '$database');
 define('DB_USER', '$user');
@@ -48,49 +85,60 @@
 define('DB_HOST', '$host');
 define('SECRET_KEY', '$secret_key');
 
-#This will disable the update notification.
-define('WP_CORE_UPDATE', false);
+define('WP_CACHE', true);
+
+/*
+define('AUTH_KEY', '$secret_key');
+define('SECURE_AUTH_KEY', '$secret_key');
+define('LOGGED_IN_KEY', '$secret_key');
+define('NONCE_KEY', '$secret_key');
+*/
 
 \$table_prefix  = 'wp_';
-\$server = '$host';
-\$loginsql = '$user';
-\$passsql = '$password';
-\$base = '$database';
-\$upload_path = '/var/www/wp-uploads/$hostname';
-\$upload_url_path = 'http://$hostname/wp-uploads';
-?>
-EOF
+
+EOF
+
+cat > $config_file_path <<EOF
+<?php
+
+/* That's all, stop editing! Happy blogging. */
+
+/** Absolute path to the WordPress directory. */
+if ( !defined('ABSPATH') )
+        define('ABSPATH', dirname(__FILE__) . '/');
+
+/** Pull in the config information */
+require_once(ABSPATH . 'wp-info.php');
+require_once(ABSPATH . 'wp-overrides.php');
+
+/** Sets up WordPress vars and included files. */
+require_once(ABSPATH . 'wp-settings.php');
+
+remove_filter('template_redirect', 'redirect_canonical');
+
+EOF
+
 chmod 0644 $config_file_path
-
-# Write the apache config
-# XXX a future branch will change this to use augtool
-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
-  DocumentRoot /var/www/$hostname
-  Options All
-  ErrorLog /var/log/apache2/wp-error.log
-  TransferLog /var/log/apache2/wp-access.log
-  # Store uploads in /var/www/wp-uploads/$0
-  RewriteEngine On
-  RewriteRule ^/wp-uploads/(.*)$ /var/www/wp-uploads/%%{HTTP_HOST}/\$1
-</VirtualHost>
-EOF
-chmod 0644 $apache_config_file_path
-
-# Configure apache
-juju-log "Enabling apache modules: rewrite, vhost_alias"
-a2enmod rewrite
-a2enmod vhost_alias
+touch $config_override_path
+
 juju-log "Enabling apache site: $hostname"
+<<<<<<< TREE
 a2ensite $hostname
 a2dissite default
 
 # Restart apache
 juju-log "Restarting apache2 service"
 /etc/init.d/apache2 restart
+=======
+
+chown -R www-data.www-data $wp_install_path
+
+. hooks/config-changed
+
+# Restart nginx
+juju-log "Restarting nginx service"
+service nginx restart
+>>>>>>> MERGE-SOURCE
 
 # Make it publicly visible, once the wordpress service is exposed
 open-port 80/tcp

=== added file 'hooks/db-relation-departed'
--- hooks/db-relation-departed	1970-01-01 00:00:00 +0000
+++ hooks/db-relation-departed	2012-08-21 13:22:29 +0000
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source inc/common
+
+rm -f $config_file_path

=== modified file 'hooks/install'
--- hooks/install	2011-10-18 06:11:17 +0000
+++ hooks/install	2012-08-21 13:22:29 +0000
@@ -1,3 +1,58 @@
 #!/bin/bash
 
-apt-get -y install wordpress pwgen
+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 php-apc mailutils php-mail sysstat php5-mysql php5-mcrypt charm-helper-sh s3cmd php5-curl rsync nfs-common bzr 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
+
+juju-log "Making /mnt/logs ..."
+mkdir -p /mnt/logs/php-fpm
+chmod -R 1777 /mnt/logs
+
+## dont make this an actual ramdisk until later when size can be safely tested
+## just using plain disk cache for now
+juju-log "Making Ramdisk mount point and config ..."
+mkdir -p /mnt/ramdisk/proxy-cache
+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 -avz /var/lib/nginx /mnt/ && rm -rf /var/lib/nginx && ln -s /mnt/nginx /var/lib/
+rsync -avz /var/lib/php5 /mnt/ && rm -rf /var/lib/php5 && ln -s /mnt/php5 /var/lib/
+
+juju-log "Restarting Services ..."
+service php5-fpm restart
+service nginx restart
+
+juju-log "So, environment is setup. We'll wait for some hooks to fire off before we get all crazy"

=== added symlink 'hooks/loadbalancer-relation-broken'
=== target is u'loadbalancer-relation-joined'
=== added symlink 'hooks/loadbalancer-relation-departed'
=== target is u'loadbalancer-relation-joined'
=== added file 'hooks/loadbalancer-relation-joined'
--- hooks/loadbalancer-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/loadbalancer-relation-joined	2012-08-21 13:22:29 +0000
@@ -0,0 +1,124 @@
+#!/usr/bin/env python
+#
+#    reverseproxy-relation-changed - hook for when reverse proxy relation changes
+#
+#    Copyright (C) 2011  Canonical Ltd.
+#    Author: Clint Byrum <[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/>.
+#
+
+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("/")
+
+# TODO: maybe load this from disk for easier customization
+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 = """
+server {
+  listen 80 default;
+  server_name _;
+
+  location / {
+    set $no_cache "";
+
+    if ($request_method !~ ^(GET|HEAD)$) {
+      set $no_cache "1";
+    }
+
+    if ($no_cache = "1") {
+      add_header Set-Cookie "_mcnc=1; Max-Age=30; Path=/";
+      add_header X-Microcachable "0";
+    }
+
+    if ($http_cookie ~* "_mcnc") {
+      set $no_cache "1";
+    }
+
+    proxy_no_cache $no_cache;
+    proxy_cache_bypass $no_cache;
+
+    proxy_redirect   http://backend  /;
+    proxy_pass  http://backend;
+    proxy_cache proxycache;
+    proxy_cache_key $scheme$host$request_method$request_uri;
+    proxy_cache_valid 200 60s;
+    proxy_cache_use_stale updating;
+
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-UA-Compatible "IE=Edge,chrome=1";
+
+    proxy_max_temp_file_size 1M;
+  }
+}
+"""
+
+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 += '}'
+
+print servers
+
+with tempfile.NamedTemporaryFile(dir="/etc/nginx/sites-available/",prefix="loadbalancer", 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")
+    except:
+        os.unlink(conf.name)
+
+
+
+# Just in case haproxy wouldn't start because of empty/bad configs before, start it now
+subprocess.call(["service", "nginx", "start"])
+subprocess.check_call(["service", "nginx", "reload"])
+
+subprocess.check_call(["open-port", "80"])

=== added symlink 'hooks/nfs-relation-broken'
=== target is u'nfs-relation-departed'
=== added file 'hooks/nfs-relation-changed'
--- hooks/nfs-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/nfs-relation-changed	2012-08-21 13:22:29 +0000
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -eu
+
+juju-log "We've got a mount"
+source inc/common
+
+options=`relation-get options`
+mountpoint=`relation-get mountpoint`
+fstype=`relation-get fstype`
+host=`relation-get private-address`
+
+if [ -z "$fstype" ] ; then
+	juju-log "Going to wait for some real data"
+    exit 0
+fi
+
+# Write this out to our .nfs-mount file
+cat > .nfs-mount <<EOF
+#!/bin/bash
+MOUNT_TYPE=$fstype
+MOUNT_OPS=$options
+MOUNT_SERVER=$host
+MOUNT_PATH=$mountpoint
+
+EOF
+
+. hooks/config-changed

=== added file 'hooks/nfs-relation-departed'
--- hooks/nfs-relation-departed	1970-01-01 00:00:00 +0000
+++ hooks/nfs-relation-departed	2012-08-21 13:22:29 +0000
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -eu
+
+juju-log "We've got a mount"
+source inc/common
+
+if [ ! -f .nfs-mount ]; then
+	juju-log "I guess we've already done this."
+	exit 0
+fi
+
+source .nfs-mount
+umount /mnt/wordpress
+
+rm -f .nfs-mount
+
+juju-log "Fairwell nfs mount, we hardly knew you"
+
+. hooks/config-changed

=== added file 'hooks/restart'
--- hooks/restart	1970-01-01 00:00:00 +0000
+++ hooks/restart	2012-08-21 13:22:29 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+. hooks/stop
+. hooks/start

=== modified file 'hooks/start'
--- hooks/start	2011-02-07 22:23:02 +0000
+++ hooks/start	2012-08-21 13:22:29 +0000
@@ -1,1 +1,4 @@
 #!/bin/bash
+
+service php5-fpm restart
+service nginx restart

=== modified file 'hooks/stop'
--- hooks/stop	2011-10-14 10:22:29 +0000
+++ hooks/stop	2012-08-21 13:22:29 +0000
@@ -1,3 +1,6 @@
 #!/bin/bash
-juju-log "Stopping apache"
-/etc/init.d/apache2 stop
\ No newline at end of file
+
+service php5-fpm stop
+service nginx stop
+
+

=== modified symlink 'hooks/upgrade-charm' (properties changed: -x to +x)
=== target was u'install'
--- hooks/upgrade-charm	1970-01-01 00:00:00 +0000
+++ hooks/upgrade-charm	2012-08-21 13:22:29 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Run the install again!
+hooks/install
+
+wp_install_path="/var/www/"
+
+chown -R www-data.www-data $wp_install_path
+
+source hooks/config-changed
+source hooks/restart

=== added directory 'inc'
=== added file 'inc/common'
--- inc/common	1970-01-01 00:00:00 +0000
+++ inc/common	2012-08-21 13:22:29 +0000
@@ -0,0 +1,139 @@
+#!/bin/bash
+
+
+hostname=`unit-get public-address`
+private_name=`hostname -f`
+
+wp_install_path="/var/www/"
+config_file_path="$wp_install_path/wp-config.php"
+config_info_path="$wp_install_path/wp-info.php"
+config_override_path="$wp_install_path/wp-overrides.php"
+
+####
+## 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
+####
+
+make_bare()
+{
+	# Un-do APC
+	rm -f /etc/php5/conf.d/apc.ini
+	# IF there is an NFS mount, get everything out of it
+	if [ -f .nfs-mount ]; then # Looks like someone got fancy with NFS
+		if [ -L $wp_install_path/wp-content ]; then # Check if we actually have a symlink
+			rm -f $wp_install_path/wp-content
+			rsync -az /mnt/wordpress/wp-content $wp_install_path
+		fi
+	fi
+
+	echo "<?php" > $config_override_path
+	juju-log "We are now bare"
+}
+
+make_single()
+{
+	make_bare
+	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
+	do_nfs
+	juju-log "We are now single"
+}
+
+make_optimized()
+{
+	make_single
+	cat > $config_override_path <<EOF
+<?php
+define('DISALLOW_FILE_MODS', TRUE);
+EOF
+	juju-log "We are now optimized"
+}
+
+do_nfs()
+{
+	if [ -f .nfs-mount ]; then
+		# This has all the NFS mount stuff in it
+		source .nfs-mount
+		mkdir -p /mnt/wordpress
+		if grep -qs '/mnt/wordpress' /proc/mounts; then
+			juju-log "We're already mounted."
+		else
+			mount -t $MOUNT_TYPE -o $MOUNT_OPS $MOUNT_SERVER:$MOUNT_PATH /mnt/wordpress
+			if [ $? -ne 0 ]; then
+				juju-log "Could not connect to file-server"
+				exit 1 # OH THE HUMANITY OF IT ALL
+			fi
+			if [ ! -d /mnt/wordpress/wp-content ]; then
+				rsync -az $wp_install_path/wp-content /mnt/wordpress/
+			fi
+			
+			mv $wp_install_path/wp-content $wp_install_path/wp-content.bak.$(date +%Y%m%d-%H%M%S) && rm -rf $wp_install_path/wp-content
+			ln -s /mnt/wordpress/wp-content $wp_install_path
+			juju-log "Mounted NFS"
+		fi
+	else
+		juju-log "There is no nfs mount, not sure what to do, so we'll just bail"
+	fi
+}
+
+do_vcs()
+{
+	local NEW_REPO_URL="$1"
+
+	if [ -z "$NEW_REPO_URL" ]; then
+		rm -f .wp-repo
+		return 0
+	fi
+
+	if [ -f .wp-repo ]; then
+		source .wp-repo
+	else
+		REPO_URL=""
+	fi
+
+	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
+			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
+}

=== modified file 'metadata.yaml'
--- metadata.yaml	2012-05-22 22:35:00 +0000
+++ metadata.yaml	2012-08-21 13:22:29 +0000
@@ -1,16 +1,22 @@
 name: wordpress
+<<<<<<< TREE
 summary: "WordPress is a full featured web blogging tool"
 maintainer: Clint Byrum <[e-mail]>
+=======
+summary: "WordPress is a full featured web blogging tool, this charm deploys it."
+maintainer: Marco Ceppi <[e-mail]>
+>>>>>>> MERGE-SOURCE
 description: |
- WordPress is a full featured web blogging tool:
- - Instant publishing (no rebuilding)
- - Comment pingback support with spam protection
- - Non-crufty URLs
- - Themable
- - Plugin support
+ This will install and setup WordPress optimized to run in the cloud. This install, in particular, will 
+ place Ngnix and php-fpm configured to scale horizontally with Nginx's reverse proxy
 requires:
   db:
     interface: mysql
+  nfs:
+    interface: mount
 provides:
   website:
     interface: http
+peers:
+  loadbalancer:
+    interface: reversenginx

=== modified file 'revision'
--- revision	2012-06-18 20:28:16 +0000
+++ revision	2012-08-21 13:22:29 +0000
@@ -1,1 +1,5 @@
+<<<<<<< TREE
 34
+=======
+78
+>>>>>>> MERGE-SOURCE