# HG changeset patch # User Brian Neal # Date 1323633032 0 # Node ID 5794e34145966eec17ca4c5a8bc8d054df9066f0 # Parent e6298cde9cc98ba9ab9a818ffde0fd12409bdf29 Converted production environment to a virtualenv; had to tweak some paths and the .wsgi file accordingly. I also added packages in preparation for working with Celery, so I updated the requirements file according to production. diff -r e6298cde9cc9 -r 5794e3414596 gpp/apache/sg101.wsgi --- a/gpp/apache/sg101.wsgi Thu Dec 08 02:25:22 2011 +0000 +++ b/gpp/apache/sg101.wsgi Sun Dec 11 19:50:32 2011 +0000 @@ -1,14 +1,18 @@ import os import sys +import site + OFFLINE = False -sys.path.append('/home/var/django-sites/sg101') -sys.path.append('/home/var/django-sites/sg101/3rdparty') -sys.path.append('/home/var/django-sites/sg101/sg101-trunk') -sys.path.append('/home/var/django-sites/sg101/sg101-trunk/gpp') +site.addsitedir('/home/var/django-sites/virtualenvs/sg101/lib/python2.5/site-packages') -os.environ['PYTHON_EGG_CACHE'] = '/home/var/django-sites/sg101/eggs/' +sys.path.append('/home/var/django-sites/virtualenvs/sg101/sg101') +sys.path.append('/home/var/django-sites/virtualenvs/sg101/sg101/gpp') +sys.path.append('/home/var/django-sites/virtualenvs/sg101/sg101/tools') + +os.environ['PYTHON_EGG_CACHE'] = '/home/var/django-sites/virtualenvs/sg101/eggs' +os.environ['CELERY_LOADER'] = 'django' def offline_handler(environ, start_response): diff -r e6298cde9cc9 -r 5794e3414596 gpp/settings/production.py --- a/gpp/settings/production.py Thu Dec 08 02:25:22 2011 +0000 +++ b/gpp/settings/production.py Sun Dec 11 19:50:32 2011 +0000 @@ -17,7 +17,7 @@ # Path to elsewhere application static images STATICFILES_DIRS.append(('elsewhere', - '/home/var/django-sites/sg101/3rdparty/elsewhere/img')) + '/home/var/django-sites/virtualenvs/sg101/src/django-elsewhere/elsewhere/img')) STATIC_ROOT = os.path.abspath(os.path.join(PROJECT_PATH, '..', 'static_serve')) diff -r e6298cde9cc9 -r 5794e3414596 requirements.txt --- a/requirements.txt Thu Dec 08 02:25:22 2011 +0000 +++ b/requirements.txt Sun Dec 11 19:50:32 2011 +0000 @@ -1,20 +1,32 @@ Django==1.3.1 --e git+https://github.com/waylan/Python-Markdown.git@067d88bc41c7924c9087b724ff5247235243ce6b#egg=Markdown-dev +-e git://github.com/waylan/Python-Markdown.git@067d88bc41c7924c9087b724ff5247235243ce6b#egg=Markdown-dev MySQL-python==1.2.3 django-debug-toolbar==0.8.5 --e git+https://github.com/leah/django-elsewhere.git@d8353f90c5cda6c42a5f8345f98992db8f685421#egg=django_elsewhere-dev --e git+https://github.com/toastdriven/django-haystack.git@53512d286e12bc5881dbb35fa1020321b669c4cf#egg=django_haystack-dev +-e git://github.com/leah/django-elsewhere.git@d8353f90c5cda6c42a5f8345f98992db8f685421#egg=django_elsewhere-dev +-e git://github.com/toastdriven/django-haystack.git@53512d286e12bc5881dbb35fa1020321b669c4cf#egg=django_haystack-dev django-tagging==0.3.1 gdata==2.0.15 html5lib==0.90 pytz==2011n --e git+https://github.com/toastdriven/queued_search.git@daca1074d1ab870b1845bd32f31f0502d768707e#egg=queued_search-dev +-e git://github.com/toastdriven/queued_search.git@daca1074d1ab870b1845bd32f31f0502d768707e#egg=queued_search-dev queues==0.6.1 --e git+https://github.com/andymccurdy/redis-py.git@368cccd29559ec0915ec5f4739504a55bed2a644#egg=redis-dev +redis==2.4.10 repoze.timeago==0.5 --e git+https://github.com/notanumber/xapian-haystack.git@144c4e6225caaaba67dc6251dbed189560519058#egg=xapian_haystack-dev +-e git://github.com/notanumber/xapian-haystack.git@144c4e6225caaaba67dc6251dbed189560519058#egg=xapian_haystack-dev +amqplib==1.0.2 +anyjson==0.3.1 +celery==2.4.5 +django-celery==2.4.2 +django-picklefield==0.1.9 +importlib==1.0.2 +kombu==1.5.1 +multiprocessing==2.6.2.1 +ordereddict==1.1 +python-dateutil==1.5 +python-memcached==1.48 # # There were two packages that I punted on and hacked into my virtualenv by symlinking to the global -# Python 2.6 site-packages (actually dist-packages): +# site-packages # PIL # xapian +#