2 commits - apache/moksha.conf apache/moksha.wsgi moksha.spec nginx/moksha.conf production/apache rabbitmq/rabbitmq-codegen-amqp-codegen.patch rabbitmq/run sample-production.ini
apache/moksha.conf | 35 ----- apache/moksha.wsgi | 9 - moksha.spec | 1 nginx/moksha.conf | 36 ----- production/apache/moksha.conf | 35 +++++ production/apache/moksha.wsgi | 9 + rabbitmq/rabbitmq-codegen-amqp-codegen.patch | 16 -- rabbitmq/run | 22 --- sample-production.ini | 176 --------------------------- 9 files changed, 45 insertions(+), 294 deletions(-)
New commits: commit 85221b1337901fdc6a5e36ac9331396b8c7f88c8 Author: John (J5) Palmieri johnp@redhat.com Date: Tue Jun 2 15:32:52 2009 -0400
remove duplicates and move apache dir to production dir
diff --git a/apache/moksha.conf b/apache/moksha.conf deleted file mode 100644 index 59aceb8..0000000 --- a/apache/moksha.conf +++ /dev/null @@ -1,35 +0,0 @@ -#MaxRequestsPerChild 100 -#HostnameLookups Off -#Keepalive off - -# Default Python Home, with clean site-packages: -WSGIPythonHome /srv/moksha/tg2env - -WSGIRestrictStdout Off - -WSGIPythonEggs /srv/moksha/.python-eggs - -<VirtualHost 0.0.0.0:8084> - - 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> diff --git a/apache/moksha.wsgi b/apache/moksha.wsgi deleted file mode 100644 index 5f2dc95..0000000 --- a/apache/moksha.wsgi +++ /dev/null @@ -1,9 +0,0 @@ -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/production.ini') diff --git a/nginx/moksha.conf b/nginx/moksha.conf deleted file mode 100644 index dad866a..0000000 --- a/nginx/moksha.conf +++ /dev/null @@ -1,36 +0,0 @@ -upstream backend { - server 127.0.0.1:8084; -} - -server { - listen 80; - location / { - #ssi on; - proxy_set_header X_FORWARDED_PROTO $scheme; - proxy_set_header X_FORWARDED_HOST $host; - proxy_set_header X_FORWARDED_FOR $remote_addr; - - if ($request_method != GET) { - proxy_pass http://backend; - } - - set $memcached_key $request_uri; - - memcached_pass localhost:11211; - - default_type text/html; - error_page 404 502 = /dynamic; - } - - location /dynamic { - #ssi on; - proxy_set_header X_FORWARDED_PROTO $scheme; - proxy_set_header X_FORWARDED_HOST $host; - proxy_set_header X_FORWARDED_FOR $remote_addr; - proxy_pass http://backend; - } - -} - - - diff --git a/production/apache/moksha.conf b/production/apache/moksha.conf new file mode 100644 index 0000000..59aceb8 --- /dev/null +++ b/production/apache/moksha.conf @@ -0,0 +1,35 @@ +#MaxRequestsPerChild 100 +#HostnameLookups Off +#Keepalive off + +# Default Python Home, with clean site-packages: +WSGIPythonHome /srv/moksha/tg2env + +WSGIRestrictStdout Off + +WSGIPythonEggs /srv/moksha/.python-eggs + +<VirtualHost 0.0.0.0:8084> + + 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> diff --git a/production/apache/moksha.wsgi b/production/apache/moksha.wsgi new file mode 100644 index 0000000..5f2dc95 --- /dev/null +++ b/production/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/production.ini') diff --git a/rabbitmq/rabbitmq-codegen-amqp-codegen.patch b/rabbitmq/rabbitmq-codegen-amqp-codegen.patch deleted file mode 100644 index 91e3285..0000000 --- a/rabbitmq/rabbitmq-codegen-amqp-codegen.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- rabbitmq-codegen/amqp_codegen.py.orig 2009-03-06 19:33:25.000000000 -0500 -+++ rabbitmq-codegen/amqp_codegen.py 2009-03-06 19:33:39.000000000 -0500 -@@ -183,10 +183,11 @@ - fn(amqp_spec) - except: - remove(out_file) -- raise -- finally: - sys.stdout = stdout - f.close() -+ raise -+ sys.stdout = stdout -+ f.close() - - if not len(sys.argv) == 4: - usage() diff --git a/rabbitmq/run b/rabbitmq/run deleted file mode 100755 index a2d975c..0000000 --- a/rabbitmq/run +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -if [ ! -d rabbitmq-server ]; then - hg clone http://hg.rabbitmq.com/rabbitmq-server -fi -if [ ! -d rabbitmq-codegen ]; then - hg clone http://hg.rabbitmq.com/rabbitmq-codegen - patch -p0 < rabbitmq-codegen-amqp-codegen.patch -fi -if [ ! -d rabbitmq-stomp ]; then - hg clone http://hg.rabbitmq.com/rabbitmq-stomp -fi - -pushd /usr/lib*/erlang/erts-*/bin >/dev/null -export PATH=$PATH:`pwd` -popd >/dev/null - -(cd rabbitmq-server; make) -pushd rabbitmq-stomp >/dev/null -make -su -c 'make start_server' -popd >/dev/null diff --git a/sample-production.ini b/sample-production.ini deleted file mode 100644 index b287a2d..0000000 --- a/sample-production.ini +++ /dev/null @@ -1,176 +0,0 @@ -# -# moksha - Pylons development environment configuration -# -# The %(here)s variable will be replaced with the parent directory of this file -# -# This file is for deployment specific config options -- other configuration -# that is always required for the app is done in the config directory, -# and generally should not be modified by end users. - -[DEFAULT] -debug = false -# Uncomment and replace with the address which should receive any error reports -#email_to = you@yourdomain.com -smtp_server = localhost -error_email_from = paste@localhost - -## -## Moksha-specific configuration options -## - -# Where to store the feed caches. -feed_cache = postgres://moksha:m0ksh4@localhost/moksha_feeds - -# -# Feed Streamer settings -# - -# Max age (in seconds) of each feed in the cache -feed.max_age = 900 - -# Timeout in seconds for the web request -feed.timeout = 30 - -# The number of simultaneous connections -feed.deferred_groups = 10 - -# Where to initialize and store our application databases. %s is the app name. -app_db = sqlite:///%s.db - -# The location of our Orbited server -orbited_host = localhost -orbited_port = 9000 - -# Stomp broker configuration. -stomp_broker = localhost -stomp_port = 61613 -stomp_user = guest -stomp_pass = guest - -# Optional AMQP Broker. -#amqp_broker = guest/guest@localhost - -# Documentation directory -docs_dir = /srv/moksha/docs - -# Moksha chat configuration - -# Use a built-in IRC server -#chat.backend = irc://localhost:9999 -#chat.builtin = true -chat.backend = irc://irc.freenode.net:6667 -chat.rooms = default -chat.default.staticRoomName = moksha -chat.default.roomAssignmentMode = static -chat.default.display.greeting = Moksha Chat -#chat.default.display.floating = true -#chat.default.display.floatingToggle = false -#chat.default.display.width = 400 -#chat.default.display.height = 300 -#chat.default.display.theme = simple -#chat.default.display.resizable = true - -[server:main] -use = egg:Paste#http -host = 0.0.0.0 -port = 8080 - -[app:main] -use = egg:moksha -full_stack = true -#lang = ru -cache_dir = %(here)s/data -beaker.session.key = moksha -beaker.session.secret = somesecret - -beaker.cache.type = ext:memcached -beaker.cache.url = localhost:11211 - -# If you'd like to fine-tune the individual locations of the cache data dirs -# for the Cache data, or the Session saves, un-comment the desired settings -# here: -#beaker.cache.data_dir = %(here)s/data/cache -#beaker.session.data_dir = %(here)s/data/sessions - - - -# pick the form for your database -# %(here) may include a ':' character on Windows environments; this can -# invalidate the URI when specifying a SQLite db via path name -sqlalchemy.url=postgres://moksha:m0ksh4@localhost/moksha -# sqlalchemy.url=mysql://username:password@hostname:port/databasename - - -# If you have sqlite, here's a simple default to get you started -# in development - -#sqlalchemy.url = sqlite:///%(here)s/devdata.db -sqlalchemy.echo = true -sqlalchemy.echo_pool = false -sqlalchemy.pool_recycle = 3600 - -# WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT* -# Debug mode will enable the interactive debugging tool, allowing ANYONE to -# execute malicious code after an exception is raised. -#set debug = false - -# Logging configuration -# Add additional loggers, handlers, formatters here -# Uses python's logging config file format -# http://docs.python.org/lib/logging-config-fileformat.html - -[loggers] -keys = root, moksha, sqlalchemy, tg, auth, pylons - -[handlers] -keys = console - -[formatters] -keys = generic - -# If you create additional loggers, add them as a key to [loggers] -[logger_root] -level = INFO -handlers = console - -[logger_moksha] -level = DEBUG -handlers = -qualname = moksha - -[logger_tg] -level = INFO -handlers = -qualname = tg - -# repoze.who is noisy by default -[logger_auth] -level = WARNING -handlers = -qualname = auth - - -[logger_pylons] -level = INFO -handlers = -qualname = pylons - -[logger_sqlalchemy] -level = INFO -handlers = -qualname = sqlalchemy.engine -# "level = INFO" logs SQL queries. -# "level = DEBUG" logs SQL queries and results. -# "level = WARN" logs neither. (Recommended for production systems.) - -# If you create additional handlers, add them as a key to [handlers] -[handler_console] -class = StreamHandler -args = (sys.stderr,) -level = NOTSET -formatter = generic - -# If you create additional formatters, add them as a key to [formatters] -[formatter_generic] -format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s -datefmt = %H:%M:%S
commit ae7e9f9a9af1d559556cf8340eb40a985644b44a Author: John (J5) Palmieri johnp@redhat.com Date: Tue Jun 2 15:29:47 2009 -0400
add a requires
diff --git a/moksha.spec b/moksha.spec index e73a9ed..9207bc6 100644 --- a/moksha.spec +++ b/moksha.spec @@ -36,6 +36,7 @@ Requires: python-tw-forms Requires: python-morbid Requires: pytz Requires: pyevent +Requires: python-repoze-who-testutil
%description Moksha is a platform for creating real-time collaborative web applications. It
moksha-commits@lists.fedorahosted.org
-
John (J5) Palmieri