Merge lp:~abentley/charms/precise/charmworld/proxy-cache-key into lp:~juju-jitsu/charms/precise/charmworld/trunk

[Aaron Bentley]

Configure cache in ngnix

Implement caching via nginx configuration. Also, add cache logging.

As a driveby, fix documentation.

https://codereview.appspot.com/7183045/

[Richard Harding (rharding)]

lgtm thanks!

https://codereview.appspot.com/7183045/

=== modified file 'README.md'
--- README.md	2013-01-11 20:53:06 +0000
+++ README.md	2013-01-21 21:04:21 +0000
@@ -19,7 +19,8 @@
 
 Deploy Charmworld
 
-    juju deploy juju deploy cs:~juju-jitsu/precise/charmworld --constraints instance-type=m1.small
+    juju deploy cs:~juju-jitsu/precise/charmworld --constraints \
+    instance-type=m1.small
 
 Once deployed relate mongodb to charmworld
 
 
=== modified file 'hooks/install'
--- hooks/install	2013-01-10 20:15:14 +0000
+++ hooks/install	2013-01-21 21:04:21 +0000
@@ -6,6 +6,7 @@
 apt-get install -y bzr nginx python-virtualenv python-dev python-dateutil \
   charm-helper-sh build-essential
 cp nginx/http /etc/nginx/sites-available/default
+cp nginx/cache-log.conf /etc/nginx/conf.d
 service nginx restart
 
 mkdir -p ~ubuntu/var/charms
 
=== added file 'nginx/cache-log.conf'
--- nginx/cache-log.conf	1970-01-01 00:00:00 +0000
+++ nginx/cache-log.conf	2013-01-21 21:04:21 +0000
@@ -0,0 +1,9 @@
+log_format cache '***$time_local '
+  '$upstream_cache_status '
+  'Cache-Control: $upstream_http_cache_control '
+  'Expires: $upstream_http_expires '
+  '$host '
+  '"$request" ($status) '
+  '"$http_user_agent" '
+  'Args: $args ';
+access_log /var/log/nginx/cache.log cache;
 
=== modified file 'nginx/http'
--- nginx/http	2013-01-10 20:15:14 +0000
+++ nginx/http	2013-01-21 21:04:21 +0000
@@ -27,18 +27,18 @@
 
 server {
 
-	root /usr/share/nginx/www;
-	index index.html index.htm;
+        root /usr/share/nginx/www;
+        index index.html index.htm;
 
 
         location /docs {
-	   gzip on;
+           gzip on;
            alias /home/ubuntu/docs/trunk/build/html;
            expires 5m;
         }
 
         location /static {
-	   gzip on;
+           gzip on;
            expires 48h;
            alias /home/ubuntu/charmworld/charmworld/static;
         }
@@ -51,6 +51,8 @@
           proxy_pass        http://pyramid;
           proxy_cache       my-cache;
           proxy_cache_use_stale updating;
-          proxy_cache_valid  404      	30m;
+          proxy_cache_valid  404      30m;
+          proxy_cache_valid 15m;
+          proxy_cache_key "$host$request_uri$cookie_auth_tkt";
         }
 }
 
=== modified file 'revision'
--- revision	2013-01-17 15:10:02 +0000
+++ revision	2013-01-21 21:04:21 +0000
@@ -1,1 +1,1 @@
-13
+14