Merge lp:~jose/charms/precise/vsftpd/fix-readme into lp:charms/vsftpd

Proposed by José Antonio Rey
Status: Merged
Merged at revision: 15
Proposed branch: lp:~jose/charms/precise/vsftpd/fix-readme
Merge into: lp:charms/vsftpd
Diff against target: 100 lines (+49/-42)
2 files modified
README (+0/-42)
README.md (+49/-0)
To merge this branch: bzr merge lp:~jose/charms/precise/vsftpd/fix-readme
Reviewer Review Type Date Requested Status
Marco Ceppi (community) Approve
Review via email: mp+215982@code.launchpad.net

Commit message

Converted README to Markdown

Description of the change

Converted README to Markdown

To post a comment you must log in.
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

LGTM +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 2012-05-03 23:38:59 +0000
3+++ README 1970-01-01 00:00:00 +0000
4@@ -1,42 +0,0 @@
5-Juju charm vsftpd
6-author: Nathan Williams <nathan@nathanewilliams.com>
7-
8-1. Setup your parameters in vsftpd.yaml
9-> vi vsftpd.yaml
10- a list of settable parameters is available usering
11-> juju get vsftpd
12-or listing config.yaml
13-
14-2. Deploying vsftpd
15-> juju bootstrap
16-> juju deploy --config vsftpd.yaml vsftpd
17-> juju expose vsftpd
18-
19-3. To find out the public address of vsftpd, browse
20- the output of the 'juju status' command.
21-
22-By default, the standard ftp port, 21, is turned on,
23-this is changeable through the config value: "port".
24-
25-When a relation is joined, a user for each juju unit
26-is created and has relation parameters generated for
27-ftp_user, and ftp_passwd. The active port and server
28-are also available in the relation details.
29-
30-The "delete_departed" config option controls whether
31-to remove files belonging to users who have left the
32-relation to the ftp-server.
33-
34-If you decide to enable anonymous access, be aware
35-that the anonymous user, while not able to upload,
36-will be able to browse and download files in any
37-users home directory.
38-
39-Note that due to vsftpd security settings, it is not
40-possible for users to upload files to their chroot'd
41-home directory. Rather, each user has a folder "ftp"
42-created within their chroot'd home folder which they
43-can up/download to.
44-
45-For additional configuration options, see:
46-https://help.ubuntu.com/12.04/serverguide/ftp-server.html#vsftpd-ftp-server-installation
47
48=== added file 'README.md'
49--- README.md 1970-01-01 00:00:00 +0000
50+++ README.md 2014-04-15 22:48:00 +0000
51@@ -0,0 +1,49 @@
52+Juju charm vsftpd
53+Author: Nathan Williams <nathan@nathanewilliams.com>
54+
55+# Usage
56+
57+Deploying vsftpd
58+
59+ juju bootstrap
60+ juju deploy --config vsftpd.yaml vsftpd
61+ juju expose vsftpd
62+
63+To find out the public address of vsftpd, browse the output of the `juju status`
64+command.
65+
66+# Configuration
67+
68+Setup your parameters in vsftpd.yaml:
69+
70+ vi vsftpd.yaml
71+
72+A list of settable parameters is available using
73+
74+ juju get vsftpd
75+
76+or listing config.yaml
77+
78+By default, the standard ftp port, 21, is turned on, this is changeable through
79+the config value: "port".
80+
81+The "delete_departed" config option controls whether to remove files belonging
82+to users who have left the relation to the ftp-server.
83+
84+If you decide to enable anonymous access, be aware that the anonymous user,
85+while not able to upload, will be able to browse and download files in any users
86+home directory.
87+
88+Note that due to vsftpd security settings, it is not possible for users to
89+upload files to their chroot'd home directory. Rather, each user has a folder
90+"ftp" created within their chroot'd home folder which they can up/download to.
91+
92+# Relations
93+
94+When a relation is joined, a user for each juju unit is created and has relation
95+parameters generated for ftp_user, and ftp_passwd. The active port and server
96+are also available in the relation details.
97+
98+# More Info
99+
100+For additional configuration options, see [Ubuntu's FTP Server help page](https://help.ubuntu.com/12.04/serverguide/ftp-server.html#vsftpd-ftp-server-installation)

Subscribers

People subscribed via source and target branches