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

Subscribers

People subscribed via source and target branches