Content Cache Charm

Merge ~mthaddon/content-cache-charm/+git/content-cache-charm:readme-md into content-cache-charm:master

  1. Git
  2. lp:~mthaddon/content-cache-charm/+git/content-cache-charm
  3. readme-md
  4. Merge into master
Proposed by Tom Haddon
Status: Merged
Approved by: Nick Moffitt
Approved revision: becc1e80b665a3c05010e235eb6f19a787a571f7
Merged at revision: 394c6ee0b2adb58174a8804cfacef0bd2967a830
Proposed branch: ~mthaddon/content-cache-charm/+git/content-cache-charm:readme-md
Merge into: content-cache-charm:master
Diff against target: 80 lines (+36/-36)
1 file modified
README.md (+36/-36)
Reviewer Review Type Date Requested Status
Content Cache Charmers Pending
Review via email: mp+366678@code.launchpad.net

Commit message

Fix indenting of example config in README.md for markdown rendering

Description of the change

Fix indenting of example config in README.md for markdown rendering

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 394c6ee0b2adb58174a8804cfacef0bd2967a830

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index 210d6df..6f8000e 100644
3--- a/README.md
4+++ b/README.md
5@@ -10,39 +10,39 @@ To deploy the charm:
6
7 Set juju config for the `site` option as required. For example:
8
9-# Site with some public, some authenticated content, using another site
10-# with two IPs for authentication. In this case, 10.1.1.2 and 10.1.1.3
11-# would need to listen on 443 for auth.example1.com and process
12-# authentication requests.
13-example1.com:
14- tls-cert-bundle-path: /var/lib/haproxy
15- locations:
16- '/':
17- extra-config:
18- - root /srv/example1.com/content/
19- - autoindex on
20- '/auth':
21- modifier: '='
22- backends:
23- - 10.1.1.2:443
24- - 10.1.1.3:443
25- backend-check-path: /status
26- backend-path: /auth-check/
27- backend-tls: True
28- cache-validity: '200 401 1h'
29- origin-headers:
30- - Original-URI: $request_uri
31- - Resource-Name: example1
32- extra-config:
33- - internal
34- - proxy_cache_key $http_authorization
35- site-name: auth.example1.com
36- '/status':
37- extra-config:
38- - stub_status on
39- '/private/content/':
40- extra-config:
41- - root /srv/example1.com/content/
42- - autoindex on
43- - auth_request /auth
44- nagios-expect: 401 Unauthorized
45+ # Site with some public, some authenticated content, using another site
46+ # with two IPs for authentication. In this case, 10.1.1.2 and 10.1.1.3
47+ # would need to listen on 443 for auth.example1.com and process
48+ # authentication requests.
49+ example1.com:
50+ tls-cert-bundle-path: /var/lib/haproxy
51+ locations:
52+ '/':
53+ extra-config:
54+ - root /srv/example1.com/content/
55+ - autoindex on
56+ '/auth':
57+ modifier: '='
58+ backends:
59+ - 10.1.1.2:443
60+ - 10.1.1.3:443
61+ backend-check-path: /status
62+ backend-path: /auth-check/
63+ backend-tls: True
64+ cache-validity: '200 401 1h'
65+ origin-headers:
66+ - Original-URI: $request_uri
67+ - Resource-Name: example1
68+ extra-config:
69+ - internal
70+ - proxy_cache_key $http_authorization
71+ site-name: auth.example1.com
72+ '/status':
73+ extra-config:
74+ - stub_status on
75+ '/private/content/':
76+ extra-config:
77+ - root /srv/example1.com/content/
78+ - autoindex on
79+ - auth_request /auth
80+ nagios-expect: 401 Unauthorized

Subscribers

People subscribed via source and target branches