Merge ~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:master into ~livepatch-charmers/charm-canonical-livepatch:master

Proposed by Barry Price
Status: Merged
Merged at revision: 428fba5dbf9d302280bd4c68c7c80652fb2b01d9
Proposed branch: ~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:master
Merge into: ~livepatch-charmers/charm-canonical-livepatch:master
Diff against target: 83 lines (+62/-6)
2 files modified
README.md (+45/-6)
copyright (+17/-0)
Reviewer Review Type Date Requested Status
Livepatch charm developers Pending
Review via email: mp+312250@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Barry Price (barryprice) wrote :

I believe these changes should make us compliant with the Charm store policy[1], which clears the path for us to request a charmers review[2], allowing us to promulgate to e.g. cs:canonical-livepatch

[1] https://jujucharms.com/docs/stable/authors-charm-policy
[2] https://review.jujucharms.com/reviews/new

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 fd273a7..4cf16a5 100644
3--- a/README.md
4+++ b/README.md
5@@ -1,10 +1,49 @@
6-Overview
7-========
8+# Overview
9
10-This subordinate charm provides live kernel updates to its unit via the Canonical Livepatch system.
11+This subordinate charm provides live kernel updates to its unit via the [Canonical Livepatch Service](https://www.ubuntu.com/server/livepatch).
12
13-The canonical-livepatch services are automatically installed from the Snap Store.
14+The canonical-livepatch software is automatically installed from the Snap Store.
15
16-You will need to supply your key from http://ubuntu.com/livepatch via juju set (1.x) or juju set-config (2.x)
17+You will need to supply your key from http://ubuntu.com/livepatch via juju set (1.x) or juju config (2.x)
18
19-Nagios checks are automatically deployed if you relate to an nagios-external-master service.
20+Nagios checks are automatically deployed if you relate to an nagios-external-master application.
21+
22+# Usage
23+
24+This is a subordinate charn, so must be related to your primary service(s):
25+
26+ juju deploy canonical-livepatch
27+
28+ juju add-relation <your_primary_charm_name> canonical-livepatch
29+
30+You will need to supply your key from http://ubuntu.com/livepatch via juju set (Juju 1.x):
31+
32+ juju set canonical-livepatch livepatch_key=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
33+
34+Or via juju config (Juju 2.x)
35+
36+ juju config canonical-livepatch livepatch_key=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
37+
38+## Known Limitations and Issues
39+
40+The Nagios nrpe check integration code is a work in progress (but is fully functional)
41+
42+# Configuration
43+
44+The livepatch_key setting must be configured in order for the software to function correctly - see above.
45+
46+By default, the livepatch software will attempt to retrieve its patch data directly over the network. If you'd like to use an HTTPS web proxy for this traffic instead, you can set the livepatch_proxy value to the address of your proxy server.
47+
48+Likewise, if you need to use a proxy server to access the Snap Store, snap_proxy can also be set to the address of your proxy server.
49+
50+We set the Nagios servicegroups to 'livepatch' by default, this can also be reconfigured to suit your needs.
51+
52+# Contact Information
53+
54+This charm is maintained here, by the livepatch-charmers team:
55+
56+https://launchpad.net/canonical-livepatch-charm
57+
58+## Canonical Livepatch Service
59+
60+- https://www.ubuntu.com/server/livepatch
61diff --git a/copyright b/copyright
62new file mode 100644
63index 0000000..1632584
64--- /dev/null
65+++ b/copyright
66@@ -0,0 +1,17 @@
67+Format: http://dep.debian.net/deps/dep5/
68+
69+Files: *
70+Copyright: Copyright 2011, Canonical Ltd., All Rights Reserved.
71+License: GPL-3
72+ This program is free software: you can redistribute it and/or modify
73+ it under the terms of the GNU General Public License as published by
74+ the Free Software Foundation, either version 3 of the License, or
75+ (at your option) any later version.
76+ .
77+ This program is distributed in the hope that it will be useful,
78+ but WITHOUT ANY WARRANTY; without even the implied warranty of
79+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
80+ GNU General Public License for more details.
81+ .
82+ You should have received a copy of the GNU General Public License
83+ along with this program. If not, see <http://www.gnu.org/licenses/>.

Subscribers

People subscribed via source and target branches