summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2013-12-06 16:20:31 +0100
committerAurélien Bompard <aurelien@bompard.org>2013-12-06 16:20:31 +0100
commitb49044c9a1c49e94ac5d1ad4d8714ceaeee2e4f9 (patch)
tree20f98664186eefb35543a552e80445e5031cf5a0
parent7eb2d86f64178ec38753bc5640cc5eb9b90be225 (diff)
downloadhyperkitty-b49044c9a1c49e94ac5d1ad4d8714ceaeee2e4f9.tar.gz
hyperkitty-b49044c9a1c49e94ac5d1ad4d8714ceaeee2e4f9.tar.xz
hyperkitty-b49044c9a1c49e94ac5d1ad4d8714ceaeee2e4f9.zip
Use django-admin instead of manage.py
-rw-r--r--doc/database.rst5
-rw-r--r--doc/development.rst13
-rw-r--r--doc/install.rst14
3 files changed, 19 insertions, 13 deletions
diff --git a/doc/database.rst b/doc/database.rst
index 798ab1f..385b413 100644
--- a/doc/database.rst
+++ b/doc/database.rst
@@ -10,9 +10,8 @@ access URLs in ``hyperkitty_standalone/settings.py`` (or
``hyperkitty_standalone/settings_local.py``). HyperKitty's database can be
created using the following command::
- python hyperkitty_standalone/manage.py syncdb
- python hyperkitty_standalone/manage.py migrate hyperkitty
- python hyperkitty_standalone/manage.py migrate social_auth
+ django-admin syncdb --pythonpath hyperkitty_standalone --settings settings
+ django-admin migrate --pythonpath hyperkitty_standalone --settings settings
KittyStore's database is configured using an URI. The syntax is as follows::
diff --git a/doc/development.rst b/doc/development.rst
index 57a618d..ab6b1fa 100644
--- a/doc/development.rst
+++ b/doc/development.rst
@@ -55,11 +55,15 @@ If you ever want to turn the ``DEBUG`` variable to ``False`` (by removing it
from ``settings_local.py``), you'll have to run two additional commands at
first and each time you change the static files::
- python hyperkitty_standalone/manage.py collectstatic
- python hyperkitty_standalone/manage.py assets build --parse-templates
+ django-admin collectstatic --pythonpath hyperkitty_standalone --settings settings
+ django-admin assets --pythonpath hyperkitty_standalone --settings settings build --parse-templates
But for development purposes, it's better to keep ``DEBUG = True``.
+.. note::
+ Your ``django-admin`` command may be called ``django-admin.py`` depending
+ on your installation method.
+
.. Setting up the databases
@@ -72,8 +76,7 @@ Running HyperKitty
If you're coding on HyperKitty, you can use Django's integrated web server.
It can be run with the following command::
- cd hyperkitty_standalone
- python manage.py runserver
+ django-admin runserver --pythonpath hyperkitty_standalone --settings settings
.. warning::
You should use the development server only locally. While it's possible to
@@ -86,7 +89,7 @@ Testing
Use the following command::
- python hyperkitty_standalone/manage.py test hyperkitty
+ django-admin test --pythonpath hyperkitty_standalone --settings settings hyperkitty
All test modules reside in the ``hyperkitty/tests`` directory
and this is where you should put your own tests, too. To make the django test
diff --git a/doc/install.rst b/doc/install.rst
index d1dad99..a69d2b6 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -70,8 +70,12 @@ 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 run::
- python hyperkitty_standalone/manage.py collectstatic
- python hyperkitty_standalone/manage.py assets build --parse-templates
+ django-admin collectstatic --pythonpath hyperkitty_standalone --settings settings
+ django-admin assets --pythonpath hyperkitty_standalone --settings settings build --parse-templates
+
+.. note::
+ Your ``django-admin`` command may be called ``django-admin.py`` depending
+ on your installation method.
These static files will be collected in the ``hyperkitty_standalone/static``
directory and served by Apache. You should now be all set. Try accessing
@@ -109,7 +113,7 @@ with some data that may be useful, for example a set of thread categories to
assign to your mailing-list threads. This can be done by running the following
command::
- python hyperkitty_standalone/manage.py loaddata first_start
+ django-admin loaddata --pythonpath hyperkitty_standalone --settings settings first_start
Thread categories can be edited and added from the Django administration
interface (append ``/admin`` to your base URL).
@@ -137,8 +141,8 @@ This command may take a long time to complete, don't interrupt it.
Then, to update the HyperKitty database, run::
- python hyperkitty_standalone/manage.py syncdb
- python hyperkitty_standalone/manage.py migrate hyperkitty
+ django-admin syncdb --pythonpath hyperkitty_standalone --settings settings
+ django-admin migrate --pythonpath hyperkitty_standalone --settings settings
After those commands complete, your database will be updated, you can start
your webserver again, and restart Mailman (to take the KittyStore upgrade into