Merge lp:~jose/charms/precise/landscape-client/readme-to-markdown into lp:charms/landscape-client

Proposed by José Antonio Rey
Status: Merged
Approved by: Chris Glass
Approved revision: 39
Merged at revision: 39
Proposed branch: lp:~jose/charms/precise/landscape-client/readme-to-markdown
Merge into: lp:charms/landscape-client
Diff against target: 206 lines (+93/-104)
2 files modified
README (+0/-104)
README.md (+93/-0)
To merge this branch: bzr merge lp:~jose/charms/precise/landscape-client/readme-to-markdown
Reviewer Review Type Date Requested Status
Chris Glass Approve
David Britton Approve
Review via email: mp+228347@code.launchpad.net

Description of the change

Converted README file to README.md (Markdown), fixing bug #1239576.

To post a comment you must log in.
Revision history for this message
David Britton (dpb) wrote :

+1, thanks for the contribution!

review: Approve
Revision history for this message
Chris Glass (tribaal) wrote :

Nice! Thanks a lot!
+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'README'
2--- README 2013-10-15 19:11:10 +0000
3+++ README 1970-01-01 00:00:00 +0000
4@@ -1,104 +0,0 @@
5-Overview
6-========
7-
8-Landscape client is the agent for the Landscape administration system.
9-
10-Usage
11-=====
12-
13-This subordinate charm is intended to be used to register a machine
14-against a running Landscape server. Configuration needs to be supplied
15-or it won't do anything. Here is a simple config.yaml to register
16-against the hosted version of Landscape:
17-
18-landscape-client:
19- account-name: <account_name_here>
20- registration-key: <registration_key_here>
21- tags: <csv_tag_list>
22-
23-The following is a version if you need to customize the communication URL
24-in case you are running against a dedicated version of Landscape (LDS), This
25-version also sets Script exection, and allows landscape to become any user
26-(even root), to execute scripts:
27-
28-landscape-client:
29- account-name: standalone
30- registration-key: 128-qosk-7382
31- tags: laptop,precise,developer
32- ping-url: http://landscape.example.com/ping
33- url: https://landscape.example.com/message-system
34- script-users: ALL
35- include-manager-plugins: ScriptExecution
36-
37-Configuration
38-=============
39-
40-Landscape client has a number of configuration options available allowing
41-customizability into a variety of environments where resources may be
42-scarce or security may be a concern. The most useful and common options are
43-documented below.
44-
45-To get more detail on options, these correlate directly to configuration
46-settings on landscape-client itself. (landscape-client(1),
47-landscape-client --help)
48-
49-account-name:
50- Name of the account to register against in the hosted version
51- of Landscape. In the dedicated version of Landscape (LDS), this will
52- always be "standalone"
53-
54-registration-key:
55- The account registration key, found in the Landscape account GUI.
56-
57-tags:
58- Comma separated list of tags to apply to the computer once it is
59- registered.
60-
61-url:
62- The server url to connect to, will usually be https and end with
63- /message-system
64-
65-ping-url:
66- If the server url is specified, ping-url should also be specified.
67- Will usually be http and end with /ping
68-
69-include-manager-plugins:
70- This option is primarily used to enable the ScriptExecution plugin, which
71- allows arbitrary scripts to be executed on the registered computer.
72-
73-script-users:
74- Comma-separated list of users that the landscape client can become to
75- execute scripts. Keyword "ALL" can be used to include all users on the
76- system.
77-
78-ssl-public-key:
79- If needed, use this to give the client the CA certificate it should use to
80- verify the server certificate it is connecting to.
81-
82-
83-When registering the client against a server with a custom or not well known
84-CA, you will need to use the ssl-public-key option. To insert the certificate
85-contents into the charm config directly, just encode it in base64.
86-
87-For example, let's assume ca.pem is a file with the CA certificate the client
88-needs to use to verify the server:
89-
90-$ cat ca.pem | openssl base64 -e > ca.encoded
91-
92-Now insert the ca.encoded contents into the charm config, like this:
93-
94-landscape-client:
95- url: ....
96- ping-url: ....
97- ssl-public-key: |
98- base64:<insert-here-
99- contents-of-ca.encoded>...
100- ...
101- ...
102-
103-Contact Information
104-===================
105-
106-Author: Landscape Team <landscape-team@canonical.com>,
107-Report bugs at: http://bugs.launchpad.net/charms/+source/landscape-client/+filebug
108-Location: http://jujucharms.com/charms/landscape-client
109
110=== added file 'README.md'
111--- README.md 1970-01-01 00:00:00 +0000
112+++ README.md 2014-07-25 16:43:37 +0000
113@@ -0,0 +1,93 @@
114+# Overview
115+
116+Landscape client is the agent for the Landscape administration system.
117+
118+# Usage
119+
120+This subordinate charm is intended to be used to register a machine against a
121+running Landscape server. Configuration needs to be supplied or it won't do
122+anything. Here is a simple config.yaml to register against the hosted version of
123+Landscape:
124+
125+ landscape-client:
126+ account-name: <account_name_here>
127+ registration-key: <registration_key_here>
128+ tags: <csv_tag_list>
129+
130+The following is a version if you need to customize the communication URL in
131+case you are running against a dedicated version of Landscape (LDS). This
132+version also sets Script exection, and allows landscape to become any user
133+(even root), to execute scripts:
134+
135+ landscape-client:
136+ account-name: standalone
137+ registration-key: 128-qosk-7382
138+ tags: laptop,precise,developer
139+ ping-url: http://landscape.example.com/ping
140+ url: https://landscape.example.com/message-system
141+ script-users: ALL
142+ include-manager-plugins: ScriptExecution
143+
144+# Configuration
145+
146+Landscape client has a number of configuration options available allowing
147+customizability into a variety of environments where resources may be scarce
148+or security may be a concern. The most useful and common options are documented
149+below.
150+
151+To get more detail on options, these correlate directly to configuration
152+settings on landscape-client itself. (landscape-client(1),
153+landscape-client --help)
154+
155+`account-name`: Name of the account to register against in the hosted version
156+of Landscape. In the dedicated version of Landscape (LDS), this will always be
157+"standalone"
158+
159+`registration-key`: The account registration key, found in the Landscape account
160+GUI.
161+
162+`tags`:Comma separated list of tags to apply to the computer once it is
163+registered.
164+
165+`url`: The server url to connect to, will usually be https and end with
166+/message-system
167+
168+`ping-url`: If the server url is specified, ping-url should also be specified.
169+Will usually be http and end with /ping
170+
171+`include-manager-plugins`: This option is primarily used to enable the
172+ScriptExecution plugin, which allows arbitrary scripts to be executed on the
173+registered computer.
174+
175+`script-users`: Comma-separated list of users that the landscape client can
176+become to execute scripts. Keyword "ALL" can be used to include all users on the
177+system.
178+
179+`ssl-public-key`: If needed, use this to give the client the CA certificate it
180+should use to verify the server certificate it is connecting to.
181+
182+When registering the client against a server with a custom or not well known
183+CA, you will need to use the ssl-public-key option. To insert the certificate
184+contents into the charm config directly, just encode it in base64.
185+
186+For example, let's assume ca.pem is a file with the CA certificate the client
187+needs to use to verify the server:
188+
189+ cat ca.pem | openssl base64 -e > ca.encoded
190+
191+Now insert the ca.encoded contents into the charm config, like this:
192+
193+ landscape-client:
194+ url: ....
195+ ping-url: ....
196+ ssl-public-key: |
197+ base64:<insert-here-
198+ contents-of-ca.encoded>...
199+ ...
200+ ...
201+
202+# Contact Information
203+
204+Author: Landscape Team <landscape-team@canonical.com>
205+Report bugs at: http://bugs.launchpad.net/charms/+source/landscape-client/+filebug
206+Location: http://jujucharms.com/charms/landscape-client

Subscribers

People subscribed via source and target branches