docs/main/Deployment.rst | 18 +++++------------- moksha.spec | 3 +-- setup.py | 2 +- 3 files changed, 7 insertions(+), 16 deletions(-)
New commits: commit 35ae482f0aa298f8e3b4cf7411ad7f47dd4209f0 Author: Luke Macken lmacken@redhat.com Date: Fri Jan 7 16:06:01 2011 -0500
Require Orbited in our moksha-server subpackage
diff --git a/moksha.spec b/moksha.spec index ae920ab..45ba9a1 100644 --- a/moksha.spec +++ b/moksha.spec @@ -32,7 +32,6 @@ BuildRequires: python-repoze-what-quickstart BuildRequires: python-shove BuildRequires: python-bunch BuildRequires: TurboGears2 -BuildRequires: orbited
Requires: TurboGears2 Requires: python-toscawidgets >= 0.9.1 @@ -41,7 +40,6 @@ Requires: python-shove Requires: python-feedcache Requires: python-feedparser Requires: python-tw-jquery >= 0.9.4.1 -Requires: orbited Requires: python-sphinx Requires: python-paver Requires: python-tw-forms @@ -75,6 +73,7 @@ Summary: mod_wsgi Moksha server Group: Applications/Internet Requires: %{name} = %{version}-%{release} Requires: mod_wsgi httpd +Requires: orbited
%description server This package contains an Apache mod_wsgi configuration for Moksha.
commit da819e2ee77211ac8efcd3f9b2d71201c81a4de4 Author: Luke Macken lmacken@redhat.com Date: Fri Jan 7 16:05:52 2011 -0500
Some tweaks to our Deployment doc
diff --git a/docs/main/Deployment.rst b/docs/main/Deployment.rst index 677117a..1bcc866 100644 --- a/docs/main/Deployment.rst +++ b/docs/main/Deployment.rst @@ -16,23 +16,13 @@ Once extracted, comment out the ToscaWidgets alias in your `/etc/httpd/conf.d/moksha.conf`.
-Running orbited ---------------- - -.. code-block:: bash - - $ orbited -c /etc/moksha/orbited.cfg - - Setting up an AMQP message broker ---------------------------------
-By default Moksha utilizes the embeded MorbidQ message broker inside of -Orbited. This allows for widgets to communicate with the server using the -Stomp protocol. In production you can easily switch to an enterprise-grade -message broker, such as `Apache Qpid http://qpid.apache.org`_. +In production you can easily switch to an enterprise-grade message broker, such +as `Apache Qpid http://qpid.apache.org`_.
-See the documentatoin on :doc:`MessageBrokers` for how to hook up an AMQP broker. +See the documentation on :doc:`MessageBrokers` for details on how to hook up an AMQP broker.
.. seealso::
@@ -50,4 +40,6 @@ to utlize the memcached Beaker extension. This example uses two memcached serve beaker.cache.type = ext:memcached beaker.cache.url = memcached1;memcached2
+.. seealso::
+ `Caching with TurboGears http://turbogears.org/2.1/docs/main/Caching.html`
commit 181067b352161efc37c629e4a67844b2a4a0ff8e Author: Luke Macken lmacken@redhat.com Date: Fri Jan 7 16:03:20 2011 -0500
Development versions of Orbited have been slipping out to PyPi, breaking Moksha, so hardcode the version dep.
diff --git a/setup.py b/setup.py index d218d9a..64ce716 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ setup( "feedcache", "feedparser", "tw.jquery>=0.9.9", - "orbited", + "orbited==0.7.10", #"Twisted", "stomper", "Sphinx",
moksha-commits@lists.fedorahosted.org