Merge lp:~johnsca/charms/precise/thinkup/charm-proof into lp:~marcoceppi/charms/precise/thinkup/tests

Proposed by Cory Johns
Status: Merged
Merged at revision: 23
Proposed branch: lp:~johnsca/charms/precise/thinkup/charm-proof
Merge into: lp:~marcoceppi/charms/precise/thinkup/tests
Diff against target: 62 lines (+30/-0)
3 files modified
README.md (+26/-0)
config.yaml (+3/-0)
metadata.yaml (+1/-0)
To merge this branch: bzr merge lp:~johnsca/charms/precise/thinkup/charm-proof
Reviewer Review Type Date Requested Status
Matt Bruzek (community) Approve
Marco Ceppi Pending
Review via email: mp+243469@code.launchpad.net

Description of the change

Boilerplate README and fixed charm proof warnings

To post a comment you must log in.
23. By Cory Johns

Added README missed in prev commit

Revision history for this message
Matt Bruzek (mbruzek) wrote :

+1 LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'README.md'
2--- README.md 1970-01-01 00:00:00 +0000
3+++ README.md 2014-12-02 22:52:58 +0000
4@@ -0,0 +1,26 @@
5+# Overview
6+
7+ThinkUp is a free, installable web application that gives you insights into your
8+activity on social networks, including Twitter, Facebook, Foursquare, and
9+Google+. Find out more at http://thinkup.com.
10+
11+# Usage
12+
13+You can deploy the charm using the following:
14+
15+ juju deploy servicename
16+ juju deploy haproxy
17+ juju deploy mysql
18+ juju add-relation thinkup:website haproxy:reverseproxy
19+ juju add-relation thinkup:db mysql:db
20+ juju expose haproxy
21+
22+Then browse to the public-address for the haproxy service which can be retrieved
23+via:
24+
25+ juju status haproxy
26+
27+## Upstream Project Name
28+
29+- https://www.thinkup.com/
30+- https://github.com/ginatrapani/ThinkUp
31
32=== modified file 'config.yaml'
33--- config.yaml 2012-03-13 22:39:21 +0000
34+++ config.yaml 2014-12-02 22:52:58 +0000
35@@ -6,12 +6,15 @@
36 name:
37 type: string
38 description: The full name of the administrator
39+ default: ''
40 email:
41 type: string
42 description: The email address of the administrator (used for login and cannot be changed after initial value has been set)
43+ default: ''
44 password:
45 type: string
46 description: The password of the administrator
47+ default: ''
48 timezone:
49 default: UTC
50 type: string
51
52=== modified file 'metadata.yaml'
53--- metadata.yaml 2012-06-26 00:44:18 +0000
54+++ metadata.yaml 2014-12-02 22:52:58 +0000
55@@ -1,6 +1,7 @@
56 name: thinkup
57 summary: social network aggregator
58 maintainer: Nathan Osman <admin@quickmediasolutions.com>
59+tags: ["applications"]
60 description: |
61 ThinkUp is a free, open source web application that captures all your
62 activity on social networks.

Subscribers

People subscribed via source and target branches

to all changes: