Merge ~mthaddon/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:readme-markdon into ubuntu-mirror-charm:master

Proposed by Tom Haddon
Status: Merged
Approved by: Romain Couturat
Approved revision: 2603536b86b4f339e1ab24e2196545c249af3a20
Merged at revision: deff9500f3af2e12e089278b960d8f51ac1d2e72
Proposed branch: ~mthaddon/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:readme-markdon
Merge into: ubuntu-mirror-charm:master
Diff against target: 66 lines (+14/-13)
1 file modified
README.md (+14/-13)
Reviewer Review Type Date Requested Status
Barry Price Approve
Romain Couturat (community) Approve
Canonical IS Reviewers Pending
Review via email: mp+408615@code.launchpad.net

Commit message

Rename README to include file extension for rendering on charmhub, some formatting updates, and juju config vs. juju set

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
Romain Couturat (romaincout) wrote :

lgtm

review: Approve
Revision history for this message
Barry Price (barryprice) wrote :

LGTM +1

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

Change successfully merged at revision deff9500f3af2e12e089278b960d8f51ac1d2e72

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README b/README.md
2similarity index 63%
3rename from README
4rename to README.md
5index 3d96b98..1687979 100644
6--- a/README
7+++ b/README.md
8@@ -17,9 +17,9 @@ be deployed using:
9 Once deployed, you will need to configure it for your local environment.
10 An Ubuntu archive mirror can be created using the following commands:
11
12- juju set ubuntu-mirror mirror_ubuntu_name="myhost.mydomain.com"
13- juju set ubuntu-mirror mirror_ubuntu_sync_time="0 1 * * *"
14- juju set ubuntu-mirror role_map='{"myhost":["ubuntu"]}'
15+ juju config ubuntu-mirror mirror_ubuntu_name="myhost.mydomain.com"
16+ juju config ubuntu-mirror mirror_ubuntu_sync_time="0 1 * * *"
17+ juju config ubuntu-mirror role_map='{"myhost":["ubuntu"]}'
18
19 Replace "myhost" with the hostname of your server and "myhost.mydomain.com" with
20 its fully qualified domain name (FQDN).
21@@ -29,34 +29,35 @@ The "role_map" variable tells the charm what type of mirror you want to create
22 "releases" (a mirror of releases.ubuntu.com), "cdimage" (a mirror of
23 cdimage.ubuntu.com" or "ports" (a mirror of ports.ubuntu.com) If you have a
24 sufficiently large server, multiple roles can be assigned to one server
25-(role_map='{"myhost":["ubuntu","cdimage"]}' for example)
26+(`role_map='{"myhost":["ubuntu","cdimage"]}'` for example).
27
28-If you have more than one server, you should list each one (e.g. role_map='{"host1":["cdimage","ubuntu"],"host2":["releases"]}')
29+If you have more than one server, you should list each one (e.g. `role_map='{"host1":["cdimage","ubuntu"],"host2":["releases"]}'`).
30
31 The "mirror_ubuntu_name" variable is the name the webserver will use for
32 the Ubuntu mirror. In the above example, it would answer requests for
33-http://myhost.mydomain.com
34+`http://myhost.mydomain.com`.
35
36 The "mirror_ubuntu_sync_time" variable tells the charm what time it should
37 update. In the above example, the update would happen every day at 1am.
38
39 There are a number of variables that can be set on a per-role basis. They
40-all follow the pattern mirror_<rolename>_<variable>, so if we were setting up
41+all follow the pattern `mirror_<rolename>_<variable>`, so if we were setting up
42 a cdimage mirror, we would use "mirror_cdimage_name" and
43 "mirror_cdimage_sync_time".
44
45 To cater for rsync servers that require authentication, there is a per-role
46-variable, mirror_<rolename>_rsync_auth. If you don't need to authenticate
47+variable, `mirror_<rolename>_rsync_auth`. If you don't need to authenticate
48 against your upstream mirror, leave this alone, the defaults will be fine.
49 If you do need to authenticate, this variable should be used like this:
50
51- juju set ubuntu-mirror mirror_cdimage_rsync_auth='{"myhost":{"user":"eric", "password":"YXBwbGVzCg=="}}'
52+ juju config ubuntu-mirror mirror_cdimage_rsync_auth='{"myhost":{"user":"eric", "password":"YXBwbGVzCg=="}}'
53
54-The password value is just a Base64-encoded string, just in case it needs to contain any special characters (it also helps avoid people casually reading passwords over your shoulder when you run juju get).
55+The password value is just a Base64-encoded string, just in case it needs to
56+contain any special characters (it also helps avoid people casually reading
57+passwords over your shoulder when you run `juju config`).
58
59 As with role_map (above), if you have multiple servers they should all be listed
60-(e.g. mirror_cdimage_rsync_auth='{"host1":{"user":"eric","password":"YXBwbGVzCg=="},"host2":{"user":"frank","password":"b3Jhbmdlcwo="}}')
61+(e.g. `mirror_cdimage_rsync_auth='{"host1":{"user":"eric","password":"YXBwbGVzCg=="},"host2":{"user":"frank","password":"b3Jhbmdlcwo="}}'`).
62
63 For simplicity, if all of your servers authenticate with the same username
64-and password, you can use: '{"<<all>>":{"user":"eric","password":"YXBwbGVzCg=="}}'.
65-
66+and password, you can use: `{"<<all>>":{"user":"eric","password":"YXBwbGVzCg=="}}`.

Subscribers

People subscribed via source and target branches