Merge lp://staging/~abentley/charms/precise/charmworld/apache2 into lp://staging/~juju-jitsu/charms/precise/charmworld/trunk

Proposed by Aaron Bentley
Status: Merged
Merged at revision: 37
Proposed branch: lp://staging/~abentley/charms/precise/charmworld/apache2
Merge into: lp://staging/~juju-jitsu/charms/precise/charmworld/trunk
Diff against target: 66 lines (+29/-2)
5 files modified
README.md (+9/-1)
hooks/reverseproxy-relation-joined (+3/-0)
metadata.yaml (+2/-0)
revision (+1/-1)
scripts/configure-apache2 (+14/-0)
To merge this branch: bzr merge lp://staging/~abentley/charms/precise/charmworld/apache2
Reviewer Review Type Date Requested Status
Juju-Jitsu Hackers Pending
Review via email: mp+146490@code.staging.launchpad.net

Description of the change

Support apache2 frontend

Allow apache2 to be used as a reverse proxy by supporting the reverseproxy
relation. Add config script and update docs for setting up apache2 properly.

https://codereview.appspot.com/7271047/

To post a comment you must log in.
Revision history for this message
Richard Harding (rharding) wrote :

lgtm with a couple of questions. I figure this will probably need some
testing/etc to get it working 100% right.

https://codereview.appspot.com/7271047/diff/1/README.md
File README.md (right):

https://codereview.appspot.com/7271047/diff/1/README.md#newcode29
README.md:29: juju deploy local:apache2
Doesn't this need to point to a path with the right stucture? Should
that be documented?

Or is it picked up without the --repository as long as it's in the cwd?

https://codereview.appspot.com/7271047/diff/1/scripts/configure-apache2
File scripts/configure-apache2 (right):

https://codereview.appspot.com/7271047/diff/1/scripts/configure-apache2#newcode6
scripts/configure-apache2:6: ServerName staging.jujucharms.com
This hard coding of a server name seems like trouble. I wonder if this
can be removed, made to pull from the environment somehow, or does it
need to be a config option as well? It seems like IS should have had to
do this themselves so curious if they've got an answer already.

https://codereview.appspot.com/7271047/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: