コミット: 2a8097dfff60a586bb626867e5d80f4a9b5d1ade - allura (git)

allura

コミットメタ情報

• リビジョン: 2a8097dfff60a586bb626867e5d80f4a9b5d1ade (tree)
• 日時: 2012-03-30 21:23:47
• 作者: Dave Brondsema <dbrondsema@geek...>
• コミッター: Yaroslav Luzin

ログメッセージ

[#3874] move rabbitmq out of installation instructions

Signed-off-by: Dave Brondsema <[e-mail]>

変更サマリ

• modified: Allura/docs/index.rst
• add: Allura/docs/installation.rst
• modified: README.markdown

差分

--- a/Allura/docs/index.rst
+++ b/Allura/docs/index.rst
@@ -17,6 +17,7 @@ Getting Started
 .. toctree::
    :maxdepth: 2
 
+   installation
    platform_tour
    scm_host
    migration

--- /dev/null
+++ b/Allura/docs/installation.rst
@@ -0,0 +1,29 @@
+Installation
+=================
+
+Easy Setup
+---------------
+
+Our easy setup instructions are in our README.rst file.  You can read it online at https://sourceforge.net/p/allura/git/#readme
+
+You should be able to get Allura up and running in well under an hour by following those instructions.
+
+Enabling RabbitMQ
+-----------------
+
+For faster notification of background jobs, you can use RabbitMQ.  Assuming a base setup from the README, run these commands
+to install rabbitmq and set it up::
+
+(anvil)~$ sudo aptitude install rabbitmq-server
+(anvil)~$ sudo rabbitmqctl add_user testuser testpw
+(anvil)~$ sudo rabbitmqctl add_vhost testvhost
+(anvil)~$ sudo rabbitmqctl set_permissions -p testvhost testuser ""  ".*" ".*"
+(anvil)~$ pip install amqplib==0.6.1 kombu==1.0.4
+
+Then edit Allura/development.ini and change `amqp.enabled = false` to `amqp.enabled = true` and uncomment the other `amqp` settings.
+
+If your `paster taskd` process is still running, restart it::
+
+(anvil)~/src/forge/Allura$ pkill -f taskd
+(anvil)~/src/forge/Allura$ nohup paster taskd development.ini > ~/logs/taskd.log &
+

--- a/README.markdown
+++ b/README.markdown
@@ -26,9 +26,9 @@ You'll also need additional development packages in order to compile some of the
     ~$ sudo aptitude install default-jdk python-dev libssl-dev libldap2-dev libsasl2-dev libjpeg8-dev zlib1g-dev
     ~$ sudo ln -s /usr/lib/x86_64-linux-gnu/libz.so /usr/lib
 
-And finally our document-oriented database, MongoDB, and our messaging server, RabbitMQ.  Note that RabbitMQ is optional, but will make messages flow faster through our asynchronous processors.  By default, rabbitmq is disabled in development.ini.
+And finally our document-oriented database, MongoDB
 
-    ~$ sudo aptitude install mongodb-server rabbitmq-server
+    ~$ sudo aptitude install mongodb-server
 
 ## Setting up a virtual python environment
 
@@ -59,8 +59,6 @@ Although the application setup.py files define a number of dependencies, the `re
     (anvil)~/src/forge$ easy_install pip
     (anvil)~/src/forge$ pip install -r requirements-dev.txt
 
-If you want to use RabbitMQ for faster message processing (optional), also pip install 'amqplib' and 'kombu'.
-
 And now to setup each of the Forge applications for development.  Because there are quite a few (at last count 15), we'll use a simple shell loop to set them up.
 
     for APP in Allura* Forge* NoWarnings
@@ -97,15 +95,6 @@ We have a custom config ready for use.
     (anvil)~/src/apache-solr-1.4.1/example/$ nohup java -Dsolr.solr.home=$(cd;pwd)/src/forge/solr_config -jar start.jar > ~/logs/solr.log &
 
 
-### RabbitMQ message queue (optional)
-
-We'll need to setup some development users and privileges.
-
-    (anvil)~$ sudo rabbitmqctl add_user testuser testpw
-    (anvil)~$ sudo rabbitmqctl add_vhost testvhost
-    (anvil)~$ sudo rabbitmqctl set_permissions -p testvhost testuser ""  ".*" ".*"
-
-
 ### Forge task processing
 
 Responds to asynchronous task requests.
@@ -145,6 +134,7 @@ register a new project in your own forge, visit /p/add_project
 ## Extra
 
 * Read more documentation: http://allura.sourceforge.net/
+    * Including how to enable extra features: http://allura.sourceforge.net/installation.html
 * Run the test suite (slow): `$ ALLURA_VALIDATION=none ./run_tests`
 * File bug reports at <https://sourceforge.net/p/allura/tickets/new/> (login required)
 * Contribute code according to this guide: <http://sourceforge.net/p/allura/wiki/Contributing%20Code/>