Merge lp:~jorge/charms/precise/lamp/readme-fixes into lp:charms/lamp

Proposed by Jorge Castro
Status: Rejected
Rejected by: Robert Ayres
Proposed branch: lp:~jorge/charms/precise/lamp/readme-fixes
Merge into: lp:charms/lamp
Diff against target: 33 lines (+14/-12)
1 file modified
README (+14/-12)
To merge this branch: bzr merge lp:~jorge/charms/precise/lamp/readme-fixes
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+129012@code.launchpad.net

Description of the change

Added some formatting and clarity fixes into the README.

To post a comment you must log in.

Unmerged revisions

16. By Jorge Castro

Formatting and clarity fixes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2012-10-09 15:39:10 +0000
3+++ README 2012-10-10 17:58:29 +0000
4@@ -1,14 +1,16 @@
5
6 # Overview
7-The first thing the LAMP charm does is to install and configure a new instance with Apache and PHP5. The charm will then copy any files under /website inside the charm folder structure, into /var/www.
8-
9-It also allows you to specify a Bazaar branch. It will clone the branch into the webserver and copy the contents to /var/www. As an example set:
10-juju set lamp website-bzr="lp:~vtuson/+junk/mytodo_web"
11-
12-You can set up a relationship with a Mysql service. A Mysql database is created by default at this time. You can change the name of the database as a configuration options.
13-
14-juju set lamp website-database="your_db_name"
15-
16-If you provide a file called mysql_config either on the /website folder or in the root of you Bazaar branch, this will be used to configure further the Mysql database. PLease note that this file is called every time a new unit is created. For example, item creation should first check if the table exists.
17-
18-The charm will store the details of the relationship in /var/webconfig. In there you can also find opendb.php, a basic script that will open the connection to the MySQL database for you.
19+
20+The first thing the LAMP charm does is to install and configure a new instance with Apache, PHP5, and MySQL. The charm will then copy any files under /website inside the charm folder structure into /var/www.
21+
22+You can set up a relationship with a Mysql service if you wish to use another database on another instance. A Mysql database is created by default at this time. You can change the name of the database as a configuration options.
23+
24+ juju set lamp website-database="your_db_name"
25+
26+It also allows you to specify a Bazaar branch if you wish to keep your website in version control and deploy it to the instance. It will clone the branch into the webserver and copy the contents to /var/www. As an example set:
27+
28+ juju set lamp website-bzr="lp:~vtuson/+junk/mytodo_web"
29+
30+If you provide a file called mysql_config either in the /website folder or in the root of you Bazaar branch, this will be used to further configure the Mysql database. Please note that this file is called every time a new unit is created. For example, item creation should first check if the table exists.
31+
32+The charm will store the details of the relationship in /var/webconfig. In there you can also find opendb.php, a basic script that will open the connection to the MySQL database for you.
33\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: