Browse Source

Move a few more articles to be page bundles

master
Chris Smith 4 years ago
parent
commit
d09088d496
Signed by: Chris Smith <chris@chameth.com> GPG Key ID: 3A2D4BBDC4A3C9A9

+ 3
- 0
nginx.conf View File

@@ -55,6 +55,9 @@ http {
55 55
         /res/images/wemo/switch.jpg             /2016/05/02/monitoring-power-with-wemo/switch.jpg;
56 56
         /res/images/wemo/desk-1d.png            /2016/05/02/monitoring-power-with-wemo/desk-1d.png;
57 57
         /res/images/wemo/desk-1w.png            /2016/05/02/monitoring-power-with-wemo/desk-1w.png;
58
+        /res/images/docker/logo.png             /2016/05/21/docker-automatic-nginx-proxy/logo.png;
59
+        /res/images/docker/reverse-proxy.png    /2016/05/21/docker-automatic-nginx-proxy/reverse-proxy.png;
60
+        /res/images/https/https-everywhere.jpg  /2016/06/17/why-you-should-be-using-https/https-everywhere.jpg;
58 61
     }
59 62
 
60 63
     server {

+ 3
- 0
site/assets/style/modules/_articles.sass View File

@@ -19,6 +19,9 @@ article
19 19
   img
20 20
     max-width: 100%
21 21
 
22
+  img + p
23
+    margin-top: 1.5em
24
+
22 25
   p a
23 26
     color: $link-color
24 27
     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 View File

@@ -1,19 +1,21 @@
1 1
 ---
2 2
 date: 2016-05-21
3
-strapline: It's containers all the way down...
4
-thumbnail: /res/images/docker/logo.thumb.png
5 3
 title: Automatic reverse proxying with Docker and nginx
6
-url: /2016/05/21/docker-automatic-nginx-proxy/
7
-aliases: ["/2016/05/21/docker-automatic-nginx-proxy.html"]
8
-image: /res/images/docker/reverse-proxy.png
9 4
 description: Automatically retrieve certificates from Let's Encrypt and configure an SSL-terminating reverse proxy based on running containers.
10 5
 area: Docker
6
+url: /2016/05/21/docker-automatic-nginx-proxy/
7
+aliases: ["/2016/05/21/docker-automatic-nginx-proxy.html"]
8
+
9
+resources:
10
+  - src: reverse-proxy.png
11
+    name: Diagram showing components of a reverse proxy implementation
12
+    params:
13
+      default: true
14
+  - src: logo.png
15
+    name: The Docker project logo
11 16
 ---
12 17
 
13
-<figure class="right">
14
-  <img src="/res/images/docker/logo.png" alt="Docker logo">
15
-  <figcaption>The Docker project logo</figcaption>
16
-</figure>
18
+{{< figure "right" "The Docker project logo" >}}
17 19
 
18 20
 Over the past few weeks I've gradually been migrating services from running in LXC containers to
19 21
 Docker containers. It takes a while to get into the right mindset for Docker - thinking of
@@ -85,7 +87,7 @@ understand it all.
85 87
 
86 88
 In the end I decided to roll my own solution. Here's a high-level overview of how it all works:
87 89
 
88
-<img src="/res/images/docker/reverse-proxy.png" alt="Diagram">
90
+{{< img "Diagram showing components of a reverse proxy implementation" >}}
89 91
 
90 92
 As you probably noticed, there are quite a few containers involved. Each one performs a small,
91 93
 well-defined task, and its output can easily be inspected in either a volume or a database. I
@@ -128,7 +130,7 @@ write a domains.txt yourself). It uses `iowait` to watch the domains text file f
128 130
 automatically reruns when there are changes. It also runs once a day to renew any certs that are
129 131
 coming up for expiry.
130 132
 
131
-#### service-nginx and nginx.
133
+#### service-nginx and nginx
132 134
 
133 135
 The right fork of the diagram is concerned with nginx. My
134 136
 [service-nginx](https://github.com/csmith/docker-service-nginx) container again connects to etcd

site/static/res/images/docker/logo.png → site/content/post/2016-05-21-docker-automatic-nginx-proxy/logo.png View File


site/static/res/images/docker/reverse-proxy.png → site/content/post/2016-05-21-docker-automatic-nginx-proxy/reverse-proxy.png View File


site/static/res/images/https/https-everywhere.jpg → site/content/post/2016-06-17-why-you-should-be-using-https/https-everywhere.jpg View File


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 View File

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

BIN
site/static/res/images/docker/logo.thumb.png View File


BIN
site/static/res/images/https/https-everywhere.thumb.jpg View File


Loading…
Cancel
Save