diff options
-rw-r--r-- | askbot/deployment/__init__.py | 2 | ||||
-rw-r--r-- | askbot/doc/askbot-docs.zip | bin | 10154 -> 0 bytes | |||
-rw-r--r-- | askbot/doc/old/INSTALL.pip | 31 | ||||
-rw-r--r-- | askbot/doc/old/README | 2 | ||||
-rw-r--r-- | askbot/doc/old/askbot-requirements.txt | 9 | ||||
-rw-r--r-- | askbot/doc/source/initial-configuration.rst | 8 | ||||
-rw-r--r-- | setup.py | 2 |
7 files changed, 6 insertions, 48 deletions
diff --git a/askbot/deployment/__init__.py b/askbot/deployment/__init__.py index 59bb1a03..b0a87d15 100644 --- a/askbot/deployment/__init__.py +++ b/askbot/deployment/__init__.py @@ -6,7 +6,7 @@ from askbot.utils import console from askbot.deployment import messages from askbot.deployment import path_utils -def startforum(): +def askbot_setup(): """basic deployment procedure asks user several questions, then either creates new deployment (in the case of new installation) diff --git a/askbot/doc/askbot-docs.zip b/askbot/doc/askbot-docs.zip Binary files differdeleted file mode 100644 index 4d3be1b5..00000000 --- a/askbot/doc/askbot-docs.zip +++ /dev/null diff --git a/askbot/doc/old/INSTALL.pip b/askbot/doc/old/INSTALL.pip deleted file mode 100644 index 2f817ff8..00000000 --- a/askbot/doc/old/INSTALL.pip +++ /dev/null @@ -1,31 +0,0 @@ -* Install virtualenv and pip: - easy_install virtualenv - easy_install pip - -* Install MySQL: - sudo apt-get install mysql-client mysql-server - -* Install sphinxsearch. See: - [optional] - http://sphinxsearch.com/downloads.html - http://www.hackido.com/2009/01/install-sphinx-search-on-ubuntu.html - git://github.com/johnl/deb-sphinx-search.git - -* Install a virtual environment OUTSIDE of this directory: - pip install -E ~/env -r askbot-requirements.txt -[there is discussion on the pinax forums about what it should be outside -the source directory] - -* Notice that you will need to register with recaptcha.net and receive - recaptcha public and private keys that need to be saved in your - settings_local.py file - -* Start your environment: - source ~/env/bin/activate - -* Install mysql-python into your virtualenv, because we can't -automagically install it with pip: - easy_install --prefix ~/env/ mysql-python - -For more information about why pip can't automatically install the -MySQL driver, see this message: http://groups.google.com/group/python-virtualenv/msg/ea988085951c92b3 diff --git a/askbot/doc/old/README b/askbot/doc/old/README deleted file mode 100644 index d93d5e7d..00000000 --- a/askbot/doc/old/README +++ /dev/null @@ -1,2 +0,0 @@ -This directory contains old bits of documentation -for possible future use or deletion. Not practically useful. diff --git a/askbot/doc/old/askbot-requirements.txt b/askbot/doc/old/askbot-requirements.txt deleted file mode 100644 index 66a37fbe..00000000 --- a/askbot/doc/old/askbot-requirements.txt +++ /dev/null @@ -1,9 +0,0 @@ -django>=1.1 # Note: email subscription sender job requires Django 1.1, everything else works with 1.0 -#mysql-python # Can't use with pip, see http://groups.google.com/group/python-virtualenv/msg/ea988085951c92b3 -python-openid -html5lib -markdown2 -git+git://github.com/robhudson/django-debug-toolbar.git -git+git://github.com/dcramer/django-sphinx.git -svn+http://recaptcha-django.googlecode.com/svn/trunk/ -svn+http://recaptcha.googlecode.com/svn/trunk/recaptcha-plugins/python/ diff --git a/askbot/doc/source/initial-configuration.rst b/askbot/doc/source/initial-configuration.rst index b72dbc34..0cd2c033 100644 --- a/askbot/doc/source/initial-configuration.rst +++ b/askbot/doc/source/initial-configuration.rst @@ -12,9 +12,9 @@ Installing Askbot as a new Django project (standalone app) When installing Askbot for the first time, you will need to initialize the site setup files by typing:: - startforum + askbot-setup -and answering the questions. The `startforum` script will ask you where to deploy Askbot. If you are in +and answering the questions. The `askbot-setup` script will ask you where to deploy Askbot. If you are in the directory where the Askbot project resides, you can answer `.` (`.` refers to the current directory). There may be an error message; ignore it. @@ -27,10 +27,10 @@ There may be an error message; ignore it. __init__.py - often empty but needed for Python manage.py - the hook allowing to run management commands - `startforum` adds those files to the directory you select (and some more things specific to Askbot). + `askbot-setup` adds those files to the directory you select (and some more things specific to Askbot). -Note that if you already have a Django site you will not want to use `startforum`, because you don't want to just overwrite your existing settings.py. See below for instructions. +Note that if you already have a Django site you will not want to use `askbot-setup`, because you don't want to just overwrite your existing settings.py. See below for instructions. Another thing you have to do if you are creating a brand new Django project is edit the file `settings.py`_. At the very minimum, you will need to provide the correct values to:: @@ -47,7 +47,7 @@ setup( keywords = 'forum, community, wiki, Q&A', entry_points = { 'console_scripts' : [ - 'startforum = askbot.deployment:startforum', + 'askbot-setup = askbot.deployment:askbot_setup', ] }, url = 'http://askbot.org', |