Skip to content

Commit 4bd35fc

Browse files
author
Richard Jones
committed
More documentation and a new TODO item.
1 parent 4358c63 commit 4bd35fc

File tree

2 files changed

+76
-24
lines changed

2 files changed

+76
-24
lines changed

README.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ roundupdb:
9393
. split the file storage into multiple dirs?
9494
roundup-mailgw:
9595
. errors as attachments
96+
. limits on the e-mail addresses that may use the mail gateway
9697
roundup-server:
9798
. check the source file timestamps before reloading
9899
cgi_client

doc/index.html

Lines changed: 75 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ <h1>Contents</h1>
3232
</ul>
3333
<li><a href="#custom">Customising Roundup</a>
3434
<ul>
35+
<li><a href="#config">Instance Configuration</a>
3536
<li><a href="#custinst">Instance Schema</a>
3637
<li><a href="#custweb">Web Interface</a>
3738
</ul>
@@ -125,25 +126,26 @@ <h2><a name="startcmd">Command Line Tool</a></h2>
125126
<li>Administration user "admin" password.
126127
</ol>
127128

128-
Roundup is configurable using a localconfig.py file in the instance home.
129-
It may have the following variable declarations:
129+
Roundup is configurable using an instance_config.py file in the instance home.
130+
It should be edited before roundup is used, and may have the following
131+
variable declarations:
130132

131133
<ol>
132134
<li>MAILHOST
133135
<br>The SMTP mail host that roundup will use to send mail
134136
<li>MAIL_DOMAIN
135137
<br>The domain name used for email addresses
138+
<li>ISSUE_TRACKER_WEB
139+
<br>The web address of the issue tracker's web interface
136140
</ol>
137141

138-
Any further configuration should be possible by editing the instance home's
139-
__init__.py directly.
140142
<p>
141143
The email addresses used by the system by default are:
142144

143145
<ol>
144-
<li>issue_tracker@MAIL_DOMAIN
146+
<li>ISSUE_TRACKER_EMAIL - issue_tracker@MAIL_DOMAIN
145147
<br>submissions of issues
146-
<li>roundup-admin@MAIL_DOMAIN
148+
<li>ADMIN_EMAIL - roundup-admin@MAIL_DOMAIN
147149
<br>roundup's internal use (problems, etc)
148150
</ol>
149151

@@ -268,61 +270,61 @@ <h2><a name="cmd">Command Line Tool</a></h2>
268270
<table border=1 cellspacing=0>
269271
<tr><th colspan=2>Command Help</th></tr>
270272
<tr><td valign=top><strong>history</strong></td>
271-
<td><tt>history designator</tt><br>
273+
<td><tt>history designator</tt><p>
272274
Lists the journal entries for the node identified by the designator.
273275
</td></tr>
274276

275277
<tr><td valign=top><strong>find</strong></td>
276-
<td><tt>find classname propname=value ...</tt><br>
278+
<td><tt>find classname propname=value ...</tt><p>
277279
Find the nodes of the given class with a given property value. The
278280
value may be either the nodeid of the linked node, or its key value.
279281
</td></tr>
280282

281283
<tr><td valign=top><strong>list</strong></td>
282-
<td><tt>list classname [property]</tt><br>
284+
<td><tt>list classname [property]</tt><p>
283285
Lists all instances of the given class along. If the property is not
284286
specified, the "label" property is used. The label property is tried
285287
in order: the key, "name", "title" and then the first property,
286288
alphabetically.
287289
</td></tr>
288290

289291
<tr><td valign=top><strong>retire</strong></td>
290-
<td><tt>retire designator[,designator]*</tt><br>
292+
<td><tt>retire designator[,designator]*</tt><p>
291293
This action indicates that a particular node is not to be retrieved by
292294
the list or find commands, and its key value may be re-used.
293295
</td></tr>
294296

295297
<tr><td valign=top><strong>create</strong></td>
296-
<td><tt>create classname property=value ...</tt><br>
298+
<td><tt>create classname property=value ...</tt><p>
297299
This creates a new entry of the given class using the property
298300
name=value arguments provided on the command line after the "create"
299301
command.
300302
</td></tr>
301303

302304
<tr><td valign=top><strong>get</strong></td>
303-
<td><tt>get property designator[,designator]*</tt><br>
305+
<td><tt>get property designator[,designator]*</tt><p>
304306
Retrieves the property value of the nodes specified by the designators.
305307
</td></tr>
306308

307309
<tr><td valign=top><strong>spec</strong></td>
308-
<td><tt>spec classname</tt><br>
310+
<td><tt>spec classname</tt><p>
309311
This lists the properties for a given class.
310312
</td></tr>
311313

312314
<tr><td valign=top><strong>set</strong></td>
313-
<td><tt>set designator[,designator]* propname=value ...</tt><br>
315+
<td><tt>set designator[,designator]* propname=value ...</tt><p>
314316
Sets the property to the value for all designators given.
315317
</td></tr>
316318

317319
<tr><td valign=top><strong>init</strong></td>
318-
<td><tt>init [template [backend [admin password]]]</tt><br>
320+
<td><tt>init [template [backend [admin password]]]</tt><p>
319321
The command will prompt for the instance home directory (if not supplied
320322
through INSTANCE_HOME or the -i option. The template, backend and admin
321323
password may be specified on the command-line as arguments, in that order.
322324
</td></tr>
323325

324326
<tr><td valign=top><strong>freshen</strong></td>
325-
<td><tt>freshen</tt><br>
327+
<td><tt>freshen</tt><p>
326328
<strong>**DO NOT USE**</strong>
327329
<p>
328330
This currently kills databases!!!!
@@ -334,12 +336,12 @@ <h2><a name="cmd">Command Line Tool</a></h2>
334336
</td></tr>
335337

336338
<tr><td><strong>help</strong></td>
337-
<td><tt>help [command]</tt><br>
339+
<td><tt>help [command]</tt><p>
338340
Short help about roundup-admin or the specific command.
339341
</td></tr>
340342

341343
<tr><td><strong>morehelp</strong></td>
342-
<td><tt>morehelp</tt><br>
344+
<td><tt>morehelp</tt><p>
343345
All available help from the roundup-admin tool.
344346
</td></tr>
345347
</table>
@@ -459,12 +461,12 @@ <h1><a name="custom">Customising Roundup</a></h1>
459461

460462
Instances have the following structure:
461463
<table>
462-
<tr><td valign=top><strong>dbinit.py</strong></td>
463-
<td>Holds the instance schema</td></tr>
464464
<tr><td valign=top><strong>instance_config.py</strong></td>
465-
<td>Holds the basic instance configuration</td></tr>
465+
<td>Holds the basic <a href="#config">instance configuration</a></td></tr>
466+
<tr><td valign=top><strong>dbinit.py</strong></td>
467+
<td>Holds the <a href="#custinst">instance schema</a></td></tr>
466468
<tr><td valign=top><strong>interfaces.py</strong></td>
467-
<td>Defines the Web and E-Mail interfaces for the instance</td></tr>
469+
<td>Defines the <a href="#custweb">Web</a> and E-Mail interfaces for the instance</td></tr>
468470
<tr><td valign=top><strong>select_db.py</strong></td>
469471
<td>Selects the database back-end for the instance</td></tr>
470472
<tr><td valign=top><strong>db/</strong></td>
@@ -474,9 +476,58 @@ <h1><a name="custom">Customising Roundup</a></h1>
474476
<tr><td valign=top><strong>detectors/</strong></td>
475477
<td>Auditors and reactors for this instance</td></tr>
476478
<tr><td valign=top><strong>html/</strong></td>
477-
<td>Web interface templates, images and style sheets</td></tr>
479+
<td>Web interface <a href="#custweb">templates</a>, images and style sheets</td></tr>
478480
</table>
479481

482+
<h2><a name="config">Instance Configuration</a></h2>
483+
The <tt>instance_config.py</tt> located in your instance home contains the
484+
basic configuration for the web and e-mail components of roundup's
485+
interfaces. This file is a Python module. The default
486+
<tt>instance_config.py</tt> is given below - as you can see, the
487+
MAIL_DOMAIN must be edited before any interaction with the instance is
488+
attempted.
489+
490+
<p>
491+
<pre>
492+
MAIL_DOMAIN=MAILHOST=HTTP_HOST=None
493+
HTTP_PORT=0
494+
495+
# roundup home is this package's directory
496+
INSTANCE_HOME=os.path.split(__file__)[0]
497+
498+
# The SMTP mail host that roundup will use to send mail
499+
if not MAILHOST:
500+
MAILHOST = 'localhost'
501+
502+
# The domain name used for email addresses.
503+
if not MAIL_DOMAIN:
504+
MAIL_DOMAIN = 'fill.me.in.'
505+
506+
# the next two are only used for the standalone HTTP server.
507+
if not HTTP_HOST:
508+
HTTP_HOST = ''
509+
if not HTTP_PORT:
510+
HTTP_PORT = 9080
511+
512+
# This is the directory that the database is going to be stored in
513+
DATABASE = os.path.join(INSTANCE_HOME, 'db')
514+
515+
# This is the directory that the HTML templates reside in
516+
TEMPLATES = os.path.join(INSTANCE_HOME, 'html')
517+
518+
# The email address that mail to roundup should go to
519+
ISSUE_TRACKER_EMAIL = 'issue_tracker@%s'%MAIL_DOMAIN
520+
521+
# The web address that the instance is viewable at
522+
ISSUE_TRACKER_WEB = 'http://some.useful.url/'
523+
524+
# The email address that roundup will complain to if it runs into trouble
525+
ADMIN_EMAIL = 'roundup-admin@%s'%MAIL_DOMAIN
526+
527+
# Somewhere for roundup to log stuff internally sent to stdout or stderr
528+
LOG = os.path.join(INSTANCE_HOME, 'roundup.log')
529+
</pre>
530+
480531
<h2><a name="custinst">Instance Schema</a></h2>
481532
An instance schema defines what data is stored in the instance's database.
482533
The two schemas shipped with Roundup turn it into a typical software bug
@@ -987,7 +1038,7 @@ <h1><a name="ack">Acknowledgements</a></h1>
9871038

9881039
<p>&nbsp;</p>
9891040
<hr>
990-
$Id: index.html,v 1.6 2001-10-01 04:58:33 richard Exp $
1041+
$Id: index.html,v 1.7 2001-10-01 06:30:23 richard Exp $
9911042
<p>&nbsp;</p>
9921043

9931044
</body></html>

0 commit comments

Comments
 (0)