summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2012-11-22 17:02:27 +0100
committerAurélien Bompard <aurelien@bompard.org>2012-11-22 17:02:27 +0100
commitb3fcdf9951fbb7154f217c55b26c7be2e6ae5e27 (patch)
tree78934af8c5fc506e0d9c1e1dc308ef8c9b349538
parent1bd98c9b501a339f5767235cb58cefda3bc2f5b5 (diff)
downloadhyperkitty-b3fcdf9951fbb7154f217c55b26c7be2e6ae5e27.tar.gz
hyperkitty-b3fcdf9951fbb7154f217c55b26c7be2e6ae5e27.tar.xz
hyperkitty-b3fcdf9951fbb7154f217c55b26c7be2e6ae5e27.zip
Make a few post-QA fixes
-rw-r--r--MANIFEST.in2
-rw-r--r--doc/database.rst7
-rw-r--r--doc/install.rst13
-rw-r--r--hyperkitty/templates/index.html2
-rw-r--r--requirements.txt1
-rwxr-xr-xsetup.py2
6 files changed, 16 insertions, 11 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index d03bd16..1ccb6ce 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-include AUTHORS.txt COPYING.txt pylintrc distribute_setup.py
+include AUTHORS.txt COPYING.txt pylintrc distribute_setup.py requirements.txt
# http://bruno.im/2010/may/05/packaging-django-reusable-app/
recursive-include hyperkitty *.py *.html *.js
graft hyperkitty/static
diff --git a/doc/database.rst b/doc/database.rst
index 1eb8e9a..56b1fa4 100644
--- a/doc/database.rst
+++ b/doc/database.rst
@@ -6,7 +6,7 @@ access URLs in ``hyperkitty_standalone/settings.py`` (or
``hyperkitty_standalone/settings_local.py``). HyperKitty's database can be
created using the following command::
- python manage.py syncdb
+ python hyperkitty_standalone/manage.py syncdb
KittyStore's database will be created automatically on first access.
@@ -16,3 +16,8 @@ mailman database. Thoses archives can be downloaded by a script similar to the
installing hyperkitty on the machine which hosted the previous version of
mailman, the archived are already available locally and you can use them
directly.
+
+.. warning::
+ If you're using SQLite and you're getting "Database is locked" errors, stop
+ your webserver during the import.
+
diff --git a/doc/install.rst b/doc/install.rst
index 6827054..7a109ce 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -40,9 +40,6 @@ file) and ``KITTYSTORE_URL`` (at the bottom).
.. _Django documentation: https://docs.djangoproject.com/en/1.4/ref/settings/#databases
-Third, you must setup the database tables, and the admin account (you will be
-prompted for it).
-
.. Setting up the databases
@@ -66,13 +63,13 @@ Add following line to your apache/httpd configuration file::
And reload Apache. We're almost ready. But you need to collect the static files
from HyperKitty (which resides somewhere on your pythonpath) to be able to
-serve them from the site directory. All you have to do is to change into the
-``hyperkitty_standalone`` directory and run::
+serve them from the site directory. All you have to do is run::
- python manage.py collectstatic
+ python hyperkitty_standalone/manage.py collectstatic
-These static files will be served by Apache. You should now be all set. Try
-accessing HyperKitty in your web browser.
+These static files will be collected in the ``hyperkitty_standalone/static``
+directory and served by Apache. You should now be all set. Try accessing
+HyperKitty in your web browser.
Connecting to Mailman
diff --git a/hyperkitty/templates/index.html b/hyperkitty/templates/index.html
index 3d312a4..637a85f 100644
--- a/hyperkitty/templates/index.html
+++ b/hyperkitty/templates/index.html
@@ -11,6 +11,8 @@
<td><a href="{% url list_overview mlist_fqdn=mlist %}"> Overview </a></td>
<td><a href="{% url archives mlist_fqdn=mlist %}"> Archives </a></td>
</tr>
+ {% empty %}
+ <tr><td>No archived list yet.</td></tr>
{% endfor %}
</tbody>
</table>
diff --git a/requirements.txt b/requirements.txt
index 71494ad..e00163e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,5 @@ Django==1.4
django-gravatar==0.1.0
django-social-auth==0.7.0
djangorestframework==0.3.3
+mailman>=3.0.0b2
kittystore
diff --git a/setup.py b/setup.py
index eaf105b..6fae574 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ from setuptools import setup, find_packages
setup(
name="HyperKitty",
- version="0.1",
+ version="0.1.1",
description="A web interface to access GNU Mailman v3 archives",
long_description=open('README.rst').read(),
author='HyperKitty Developers',