apache/moksha.conf | 33 +++++++++++++++++++++++++++++++ apache/moksha.wsgi | 9 ++++++++ moksha/__init__.py | 3 +- moksha/api/widgets/chat/static/style.css | 6 ++--- start-moksha | 6 +++-- 5 files changed, 51 insertions(+), 6 deletions(-)
New commits: commit ccc54d98fdac8e2efe9b4832ed0953637bff0fa1 Author: Luke Macken lmacken@redhat.com Date: Wed Feb 11 12:46:08 2009 -0500
Add a moksha.wsgi application for mod_wsgi deployments
diff --git a/apache/moksha.wsgi b/apache/moksha.wsgi new file mode 100644 index 0000000..3a426ff --- /dev/null +++ b/apache/moksha.wsgi @@ -0,0 +1,9 @@ +import os, sys +sys.path.append('/srv/moksha') +os.environ['PYTHON_EGG_CACHE'] = '/srv/moksha/.python-eggs' + +#sys.stdout = sys.stderr + +from paste.deploy import loadapp + +application = loadapp('config:/srv/moksha/development.ini')
commit 0293853ce3de490f8cc1133f43762b9e209276a6 Author: Luke Macken lmacken@redhat.com Date: Wed Feb 11 12:45:42 2009 -0500
Add a default apache configuration for moksha
diff --git a/apache/moksha.conf b/apache/moksha.conf new file mode 100644 index 0000000..060d0b2 --- /dev/null +++ b/apache/moksha.conf @@ -0,0 +1,33 @@ +#MaxRequestsPerChild 100 +#HostnameLookups Off +#Keepalive off + +# Default Python Home, with clean site-packages: +WSGIPythonHome /srv/moksha/tg2env + +WSGIPythonEggs /srv/moksha/.python-eggs + +<VirtualHost 0.0.0.0:80> + + SSLEngine off + DocumentRoot /srv/moksha + ServerName Moksha + ErrorLog logs/moksha_error_log + CustomLog logs/moksha_access_log combined + + Alias /toscawidgets/ /srv/moksha/toscawidgets/ + <Directory /srv/moksha/toscawidgets/> + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Allow from all + </Directory> + + WSGIScriptAlias / /srv/moksha/apache/moksha.wsgi + + <Directory /srv/moksha/apache> + Order deny,allow + Allow from all + </Directory> + +</VirtualHost>
commit d5d67a823c011de1f00348f333be7f6a58cdff4a Author: Luke Macken lmacken@redhat.com Date: Tue Feb 10 17:07:57 2009 -0500
More start-moksha tweaking
diff --git a/start-moksha b/start-moksha index 996ba8c..1c46b53 100755 --- a/start-moksha +++ b/start-moksha @@ -12,6 +12,7 @@ if [ ! $VIRTUAL_ENV ]; then easy_install -U WebOb easy_install -i http://www.turbogears.org/2.0/downloads/current/index tg.devtools pushd moksha/widgetbrowser; python setup.py develop; popd + easy_install "tw.jquery==dev" else source tg2env/bin/activate fi
commit a5d958265188c8fa1d126c146645bbb1040e7b23 Author: Luke Macken lmacken@redhat.com Date: Tue Feb 10 16:59:59 2009 -0500
Include site-packages in our start-moksha, so we can pull in pysvn and mercurial
diff --git a/start-moksha b/start-moksha index 79ece4c..996ba8c 100755 --- a/start-moksha +++ b/start-moksha @@ -4,13 +4,14 @@ if [ ! $VIRTUAL_ENV ]; then if [ ! -d tg2env ]; then echo "Initializing a TurboGears2 virtual environment" - virtualenv --no-site-packages tg2env - #virtualenv tg2env + # Enable site packages so we can yum install pysvn and mercurial + # in order to build Sphinx docs on the fly. + virtualenv tg2env + #virtualenv --no-site-packages tg2env source tg2env/bin/activate easy_install -U WebOb easy_install -i http://www.turbogears.org/2.0/downloads/current/index tg.devtools pushd moksha/widgetbrowser; python setup.py develop; popd - easy_install "tw.jquery==dev" else source tg2env/bin/activate fi
commit 07a7f55060fcb80a4e437b31fa1d6e5f04f1be99 Author: Luke Macken lmacken@redhat.com Date: Tue Feb 10 16:59:31 2009 -0500
Make our chat widget colors a bit more moksha-themed
diff --git a/moksha/api/widgets/chat/static/style.css b/moksha/api/widgets/chat/static/style.css index a19f9de..c92d64e 100644 --- a/moksha/api/widgets/chat/static/style.css +++ b/moksha/api/widgets/chat/static/style.css @@ -12,7 +12,7 @@ html, body { right: 1px; top: 1px; padding: 2px; - background: #005522; + background: #3f9824; color: white; font-weight: bold; cursor: pointer; @@ -81,9 +81,9 @@ html, body { #popupContent { font-size: 120%; text-align:center; - background: #005522; + background: #3f9824; color: white; - border: 5pt solid #50A572; + border: 5pt solid #83cb22; padding: 8px; padding-bottom: 20px; width: 100%;
commit ba18a889f6c821a39e7d92d6c361737bac999415 Author: Luke Macken lmacken@redhat.com Date: Tue Feb 10 14:12:29 2009 -0500
Be a little more careful when closing the feed storage on exit
diff --git a/moksha/__init__.py b/moksha/__init__.py index c3b5e92..7ead770 100644 --- a/moksha/__init__.py +++ b/moksha/__init__.py @@ -28,4 +28,5 @@ def get_widget(name):
def shutdown(): """ Called when Moksha shuts down """ - feed_storage.close() + if feed_storage: + feed_storage.close()
moksha-commits@lists.fedorahosted.org