Merge lp:~jose/charms/precise/kusabax/1297602-fix into lp:charms/kusabax

Proposed by José Antonio Rey
Status: Merged
Merged at revision: 9
Proposed branch: lp:~jose/charms/precise/kusabax/1297602-fix
Merge into: lp:charms/kusabax
Diff against target: 204 lines (+105/-68)
4 files modified
README.md (+101/-0)
config.yaml (+1/-1)
metadata.yaml (+3/-0)
readme (+0/-67)
To merge this branch: bzr merge lp:~jose/charms/precise/kusabax/1297602-fix
Reviewer Review Type Date Requested Status
Charles Butler (community) Approve
Review via email: mp+212761@code.launchpad.net

Commit message

Added maintainer and category, fixed typo on config.yaml, fixed typos on README and reformatted it to Markdown

Description of the change

Charmworld reports the following errors:

    err: Charms need a maintainer (See RFC2822) - Name <email>
    warn: Metadata is missing categories.
    warn: No icon.svg file.
    warn: config.yaml: option style-switcher does not have the keys: default
    warn: config.yaml: option style-switcher has unknown keys: defualt

Fixed all of them. Set the charm author as maintainer as he showed the wish to be so, but didn't know how to fix it (see MP #111982, https://code.launchpad.net/~charmers/charms/precise/kusabax/trunk/+merge/111982). Also reformatted README to Markdown.

To post a comment you must log in.
10. By José Antonio Rey

Removed icon as it didn't comply with Charm Store policies

Revision history for this message
Charles Butler (lazypower) wrote :

Greetings Jose, Thanks for all the hard work! This merge looks great.

Acked as a +1 for merging.

I'll follow up once this has been merged into upstream.

Thanks again!

Revision history for this message
Charles Butler (lazypower) wrote :

Merged!

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-03-29 00:57:04 +0000
4@@ -0,0 +1,101 @@
5+Kusaba X Juju Charm
6+Copyright 2012 by Chris Hardee
7+
8+# About
9+This charm is used to deploy a fully usable Kusaba X imageboard instance without
10+any user interaction. This is a great charm to deploy if you want a
11+2ch/4chan-style imageboard but are not up to speed on server installation etc.
12+
13+# Tutorial
14+First make sure your environment is setup and you have juju installed, please
15+see the [juju documentation](https://juju.ubuntu.com/docs/) for help on this.
16+
17+Edit the config.yaml, and change anything you'd like. Please be careful when
18+changing the slogan value, as some characters will break the scripts. As of now,
19+don't use pipes '|' or single-quotes.
20+
21+After juju has been configured, bootstrap it:
22+
23+ juju bootstrap
24+
25+(if running a local instance you might need sudo privileges)
26+
27+Then deploy kusabax, you should do this from the root charm directory
28+(ie charmroot/*distros*/kusabax)
29+
30+ juju deploy --repository=. local:kusabax
31+
32+Then deploy mysql:
33+
34+ juju deploy --repository=. local:mysql
35+
36+Check on the status:
37+
38+ juju status
39+
40+When both nodes are up and running, add the relation:
41+
42+ juju add-relation kusabax mysql
43+
44+Then expose kusabax:
45+
46+ juju expose kusabax
47+
48+Check on that status until the relation is set and everything is running.
49+
50+Grab the public address from the status output and paste it into your browser.
51+If everything went ok, then you should see the basic kusaba x imageboard ready
52+to go.
53+
54+## We're not done yet though!
55+
56+Navigate to manage.php by appending it to the public address
57+(e.g. http://23.42.52.232/manage.php).
58+
59+Login with username: admin password: admin
60+
61+ 1. On the left side, under Site Administration, click on Staff.
62+ 2. Add a new administrator by giving a username, password, leaving the type to
63+ administrator, and clicking Add Staff Member.
64+ 3. Log off, then renavigate to the manage.php site and log in with the new
65+ user. If everything went ok, then Delete the old default Admin user.
66+
67+You are now ready!
68+
69+Remember to add a board under Boards Administration, then go to Edit Section and
70+Add Section, then finally under Board options select the new board you just made
71+and change the Section drop-down to the new section.
72+
73+When you navigate to the home page, you should see your new board and should be
74+able to post. Repeat for other boards/sections.
75+
76+## Known limitations and issues
77+
78+This charm will checkout the latest stable release from
79+http://kusabax.cultnet.net/svn/ and installs it to the root /var/www directory.
80+
81+Currently the script uses the current hostname for all configuration, you might
82+get some errors if you want to move to a proper domain (e.g. example.com).
83+
84+Keep in mind imageboards like these are notorious for cross-site scripting
85+attacks, so keep note of current vulnerabilities from the kusabax home page.
86+
87+# Support
88+
89+For support on kusabax itself, checked out the
90+[support board](http://kusabax.cultnet.net/sup/) and the
91+[wiki](http://kusabax.cultnet.net/wiki/).
92+
93+# Contact Information
94+
95+Maintainer: Chris Hardee <shazzner@gmail.com>
96+Report bugs at: https://bugs.launchpad.net/charms
97+
98+# TODOs
99+
100+ * More config options
101+ * Add postgresql support
102+ * Double-check what exactly needs permissions to avoid www-root chmod 777
103+ * Add a way to change db relations
104+ * Would probably be a good candidate for
105+ [apparmor support](https://juju.ubuntu.com/AppArmor)
106
107=== modified file 'config.yaml'
108--- config.yaml 2012-04-06 00:57:35 +0000
109+++ config.yaml 2014-03-29 00:57:04 +0000
110@@ -12,6 +12,6 @@
111 type: string
112 description: Site slogan, set to nothing to disable its display
113 style-switcher:
114- defualt: 'true'
115+ default: 'true'
116 type: boolean
117 description: If true, will allow users to change style
118
119=== modified file 'metadata.yaml'
120--- metadata.yaml 2012-03-27 18:53:41 +0000
121+++ metadata.yaml 2014-03-29 00:57:04 +0000
122@@ -1,7 +1,10 @@
123 name: kusabax
124+maintainer: Chris Hardee <shazzner@gmail.com>
125 summary: "Kusaba X is a continuation of the Imageboard software Kusaba"
126 description: |
127 Deploys KusabaX
128+categories:
129+ - applications
130 requires:
131 db:
132 interface: mysql
133
134=== removed file 'readme'
135--- readme 2012-04-02 08:52:39 +0000
136+++ readme 1970-01-01 00:00:00 +0000
137@@ -1,67 +0,0 @@
138-Kusaba X Juju Charm
139-Copyright 2012 by Chris Hardee
140-
141-About:
142-This charm is used to deploy a fully usable Kusaba X imageboard instance without any user interaction. This is a great charm to deploy if you want a 2ch/4chan-style imageboard but are not up to speed on server installation etc.
143-
144-Tutorial:
145-First make sure your environment is setup and you have juju installed, please see the juju documentation for help on this:
146-https://juju.ubuntu.com/docs/index.html
147-
148-Edit the config.yaml, and change anything you'd like. Please be careful when changing the slogan value, as some characters will break the scripts. As of now, don't use pipes '|' or single-quotes.
149-
150-After juju has been configured, bootstrap it:
151- juju bootstrap
152-(if running a local instance you might need sudo privileges)
153-
154-Then deploy kusabax, you should do this from the root charm directory (ie charmroot/*distros*/kusabax)
155- juju deploy --repository=. local:kusabax
156-Then deploy mysql:
157- juju deploy --repository=. local:mysql
158-
159-Check on the status:
160- juju status
161-When both nodes are up and running, add the relation:
162- juju add-relation kusabax mysql
163-Then expose kusabax:
164- juju expose kusabax
165-
166-Check on that status until the relation is set and everything is running.
167-
168-Grab the public address from the status output and paste it into your browser. If everything went ok, then you should see the basic kusaba x imageboard ready to go.
169-
170-We're not done yet though!
171-
172-Naviagate to manage.php by appending it to the public address (ie http://23.42.52.232/manage.php).
173-
174-Login with username: admin password: admin
175-
176-On the left side, under Site Administration, click on Staff
177-Add a new administrator by giving a username, password, leaving the type to administrator, and clicking Add Staff Member.
178-Log off, then renavigate to the manage.php site and log in with the new user. If everything went ok, then Delete the old default Admin user.
179-
180-You are now ready!
181-
182-Remember to add a board under Boards Administration, then go to Edit Section and Add Section, then finally under Board options select the new board you just made and change the Section drop-down to the new section.
183-When you navigate to the home page, you should see your new board and should be able to post. Repeat for other boards/sections.
184-
185-Notes:
186-This charm will checkout the latest stable release from http://kusabax.cultnet.net/svn/ and install it to the root /var/www directory.
187-Currently the script uses the current hostname for all configuration, you might get some errors if you want to move to a proper domain ie. example.com.
188-Keep in mind imageboards like these are notorious for cross-site scripting attacks, so keep note of current vulnerabilities from the kusabax home page.
189-
190-Support:
191-For support on kusabax itself, checked out the support board:
192-http://kusabax.cultnet.net/sup/
193-and the wiki:
194-http://kusabax.cultnet.net/wiki/
195-
196-For issues with the charm itself, please contact me at:
197-shazzner@gmail.com
198-
199-TODOs:
200-More config options
201-Add postgresql support
202-Double-check what exactly needs permissions to avoid www-root chmod 777
203-Add a way to change db relations
204-Would probably be a good candidate for apparmor support: https://juju.ubuntu.com/AppArmor

Subscribers

People subscribed via source and target branches

to all changes: