Skip to content

Commit 02b95b0

Browse files
author
Richard Jones
committed
*** empty log message ***
1 parent 21a8436 commit 02b95b0

File tree

6 files changed

+61
-87
lines changed

6 files changed

+61
-87
lines changed

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Fixed:
1414
Fixed:
1515
- Fixed detectors fix incorrectly fixed in bugfix release 0.6.2
1616
- Added note to upgrading doc for detectors fix in 0.6.2
17+
- added script to help migrating queries from pre-0.6 trackers
1718

1819

1920
2003-09-29 0.6.2

doc/customizing.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Customising Roundup
33
===================
44

5-
:Version: $Revision: 1.103 $
5+
:Version: $Revision: 1.104 $
66

77
.. This document borrows from the ZopeBook section on ZPT. The original is at:
88
http://www.zope.org/Documentation/Books/ZopeBook/current/ZPT.stx
@@ -16,7 +16,7 @@ What You Can Do
1616
Before you get too far, it's probably worth having a quick read of the Roundup
1717
`design documentation`_.
1818

19-
Customisation of Roundup can take one of five forms:
19+
Customisation of Roundup can take one of six forms:
2020

2121
1. `tracker configuration`_ file changes
2222
2. database, or `tracker schema`_ changes

doc/gadfly.txt

Lines changed: 0 additions & 51 deletions
This file was deleted.

doc/installation.txt

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Installing Roundup
33
==================
44

5-
:Version: $Revision: 1.60 $
5+
:Version: $Revision: 1.61 $
66

77
.. contents::
88

@@ -31,12 +31,10 @@ Roundup scripts
3131
Prerequisites
3232
=============
3333

34-
Python 2.1.1 or newer with a functioning anydbm or bsddb module. Download the
34+
Python 2.1.3 or newer with a functioning anydbm or bsddb module. Download the
3535
latest version from http://www.python.org/. It is highly recommended that
36-
users install the latest patch version of python - 2.1.3 or 2.2.3 - as these
37-
contain many fixes to serious bugs. Python 2.3 (currently in beta) has some
38-
"issues", at least with the SQLite backend, and possibly with other backends
39-
as well. It shouldn't be used with Roundup for now.
36+
users install the latest patch version of python - 2.1.3, 2.2.3 or 2.3.2 -
37+
as these contain many fixes to serious bugs.
4038

4139
If you want to use Berkeley DB bsddb3 with Roundup, use version 3.3.0 or
4240
later. Download the latest version from http://pybsddb.sourceforge.net/.
@@ -56,8 +54,8 @@ Testing your Python
5654
-------------------
5755

5856
Once you've unpacked roundup's source, run ``python ./run_tests`` in the
59-
source directory and make sure there are no errors.
60-
If there are errors, please let us know!
57+
source directory and make sure there are no errors. If there are errors,
58+
please let us know!
6159

6260
If the above fails, you may be using the wrong version of python. Try
6361
``python2 ./run_tests``. If that works, you will need to substitute
@@ -82,10 +80,10 @@ at so you may start playing. Three users will be set up:
8280
Installation
8381
============
8482

85-
Note: some systems, such as Debian and NetBSD, already have Roundup
86-
installed. Try running the command "roundup-admin" with no arguments,
87-
and if it runs you may skip the `Basic Installation Steps`_
88-
below.
83+
:Note: Some systems, such as Debian and NetBSD, already have Roundup
84+
installed. Try running the command "roundup-admin" with no arguments,
85+
and if it runs you may skip the `Basic Installation Steps`_
86+
below and go straight to `configuring your first tracker`_.
8987

9088
Set aside 15-30 minutes. Please make sure you're using a supported version of
9189
Python -- see `testing your python`_. There's several steps to follow in your
@@ -244,9 +242,8 @@ There's several to choose from, each with benefits and limitations:
244242
**mysql**
245243
Backend for popular RDBMS MySQL. According to benchmarks, this backend works
246244
much faster than any of \*dbm ones, but slightly slower than metakit and
247-
sqlite. Scalability is unknown at present. Roundup requires InnoDB or BDB
248-
support in MySQL. For more info on requirements and installation see
249-
`additional mysql documentation`_ (doc/mysql.txt)
245+
sqlite. A good scalability is not a property of this backend for now,
246+
though. For more info on backend installation see doc/mysql.txt.
250247
**metakit**
251248
This backend is implemented over the metakit_ storage system, using Mk4Py as
252249
the interface. It scales much better than the dbm backends.
@@ -327,23 +324,6 @@ name=home values on the command-line after all the other options.
327324
To make the server run in the background, use the "-d" option, specifying the
328325
name of a file to write the server process id (pid) to.
329326

330-
To run the server proxied through apache (to take advantage of SSL or other
331-
apache features), use the following configuration lines::
332-
333-
LoadModule proxy_module libexec/apache2/mod_proxy.so
334-
LoadModule proxy_connect_module libexec/apache2/mod_proxy_connect.so
335-
LoadModule proxy_http_module libexec/apache2/mod_proxy_http.so
336-
337-
<Location /prometheus/>
338-
ProxyPass http://192.168.1.2:9090/roundup/
339-
AuthType Basic
340-
AuthName Roundup
341-
AuthUserFile /some/place/htpasswd
342-
Require valid-user
343-
</Location>
344-
345-
Changing the ProxyPass line to point to the server you're running.
346-
347327

348328
Zope Product - ZRoundup
349329
~~~~~~~~~~~~~~~~~~~~~~~
@@ -585,5 +565,4 @@ Next: `User Guide`_
585565
.. _`maintenance documentation`: maintenance.html
586566
.. _sqlite: http://www.hwaci.com/sw/sqlite/
587567
.. _metakit: http://www.equi4.com/metakit/
588-
.. _`additional mysql documentation`: doc/mysql.html
589568

doc/upgrading.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,10 @@ search page using the macros detailed in the customisation doc section
154154
__ customizing.html#searching-on-categories
155155

156156
Also, the url field in the query class no longer starts with a '?'. You'll need
157-
to remove this question mark from the url field to support queries.
157+
to remove this question mark from the url field to support queries. There's
158+
a script in the "tools" directory called ``migrate-queries.py`` that should
159+
automatically change any existing queries for you. As always, make a backup
160+
of your database before running such a script.
158161

159162

160163
0.6.0 Notes for metakit backend users

tools/migrate-queries.py

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#! /usr/bin/env python
2+
'''
3+
migrate-queries <instance-home> [<instance-home> *]
4+
5+
Migrate old queries in the specified instances to Roundup 0.6.0+ by
6+
removing the leading ? from their URLs. 0.6.0+ queries do not carry a
7+
leading ?; it is added by the 0.6.0 templating, so old queries lead
8+
to query URLs with a double leading ?? and a consequent 404 Not Found.
9+
'''
10+
__author__ = 'James Kew <[email protected]>'
11+
12+
import sys
13+
import roundup.instance
14+
15+
if len(sys.argv) == 1:
16+
print __doc__
17+
sys.exit(1)
18+
19+
# Iterate over all instance homes specified in argv.
20+
for home in sys.argv[1:]:
21+
# Do some basic exception handling to catch bad arguments.
22+
try:
23+
instance = roundup.instance.open(home)
24+
except:
25+
print 'Cannot open instance home directory %s!' % home
26+
continue
27+
28+
db = instance.open('admin')
29+
30+
print 'Migrating active queries in %s (%s):'%(
31+
instance.config.TRACKER_NAME, home)
32+
for query in db.query.list():
33+
url = db.query.get(query, 'url')
34+
if url[0] == '?':
35+
url = url[1:]
36+
print ' Migrating query%s (%s)'%(query,
37+
db.query.get(query, 'name'))
38+
db.query.set(query, url=url)
39+
40+
db.commit()
41+
db.close()
42+

0 commit comments

Comments
 (0)