Move a few more articles to be page bundles

nginx.conf

         /res/images/wemo/switch.jpg             /2016/05/02/monitoring-power-with-wemo/switch.jpg;
         /res/images/wemo/desk-1d.png            /2016/05/02/monitoring-power-with-wemo/desk-1d.png;
         /res/images/wemo/desk-1w.png            /2016/05/02/monitoring-power-with-wemo/desk-1w.png;
+        /res/images/docker/logo.png             /2016/05/21/docker-automatic-nginx-proxy/logo.png;
+        /res/images/docker/reverse-proxy.png    /2016/05/21/docker-automatic-nginx-proxy/reverse-proxy.png;
+        /res/images/https/https-everywhere.jpg  /2016/06/17/why-you-should-be-using-https/https-everywhere.jpg;
     }
 
     server {

site/assets/style/modules/_articles.sass

   img
     max-width: 100%
 
+  img + p
+    margin-top: 1.5em
+
   p a
     color: $link-color
     text-decoration-color: $link-underline-color

site/content/post/2016-05-21-docker-automatic-nginx-proxy.md → site/content/post/2016-05-21-docker-automatic-nginx-proxy/index.md

 ---
 date: 2016-05-21
-strapline: It's containers all the way down...
-thumbnail: /res/images/docker/logo.thumb.png
 title: Automatic reverse proxying with Docker and nginx
-url: /2016/05/21/docker-automatic-nginx-proxy/
-aliases: ["/2016/05/21/docker-automatic-nginx-proxy.html"]
-image: /res/images/docker/reverse-proxy.png
 description: Automatically retrieve certificates from Let's Encrypt and configure an SSL-terminating reverse proxy based on running containers.
 area: Docker
+url: /2016/05/21/docker-automatic-nginx-proxy/
+aliases: ["/2016/05/21/docker-automatic-nginx-proxy.html"]
+
+resources:
+  - src: reverse-proxy.png
+    name: Diagram showing components of a reverse proxy implementation
+    params:
+      default: true
+  - src: logo.png
+    name: The Docker project logo
 ---
 
-<figure class="right">
-  <img src="/res/images/docker/logo.png" alt="Docker logo">
-  <figcaption>The Docker project logo</figcaption>
-</figure>
+{{< figure "right" "The Docker project logo" >}}
 
 Over the past few weeks I've gradually been migrating services from running in LXC containers to
 Docker containers. It takes a while to get into the right mindset for Docker - thinking of
 
 In the end I decided to roll my own solution. Here's a high-level overview of how it all works:
 
-<img src="/res/images/docker/reverse-proxy.png" alt="Diagram">
+{{< img "Diagram showing components of a reverse proxy implementation" >}}
 
 As you probably noticed, there are quite a few containers involved. Each one performs a small,
 well-defined task, and its output can easily be inspected in either a volume or a database. I
 automatically reruns when there are changes. It also runs once a day to renew any certs that are
 coming up for expiry.
 
-#### service-nginx and nginx.
+#### service-nginx and nginx
 
 The right fork of the diagram is concerned with nginx. My
 [service-nginx](https://github.com/csmith/docker-service-nginx) container again connects to etcd

site/content/post/2016-06-17-why-you-should-be-using-https.md → site/content/post/2016-06-17-why-you-should-be-using-https/index.md

 ---
 date: 2016-06-17
-strapline: It's time to stop with the excuses
-thumbnail: /res/images/https/https-everywhere.thumb.jpg
 title: Why you should be using HTTPS
-url: /2016/06/17/why-you-should-be-using-https/
-image: /res/images/https/https-everywhere.jpg
 description: There's no good reason for sites to avoid HTTPS any more, and lots of reasons they should be actively encouraging it.
 area: security
+url: /2016/06/17/why-you-should-be-using-https/
+
+resources:
+  - src: https-everywhere.jpg
+    name: The EFF's HTTPS Everywhere logo
+    params:
+      default: true
 ---
 
-<figure class="left">
-  <img src="/res/images/https/https-everywhere.jpg" alt="EFF HTTPS Everywhere logo">
-  <figcaption>The EFF's HTTPS Everywhere logo</figcaption>
-</figure>
+{{< figure "left" "The EFF's HTTPS Everywhere logo" >}}
 
 One of my favourite hobbyhorses recently has been the use of HTTPS, or lack thereof. HTTPS is the
 thing that makes the little padlock appear in your browser, and has existed for over 20 years.