diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-17 18:02:33 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-17 18:02:33 -0400 |
| commit | 198f25b93c7b9ce4cad693a9654872a7fa80dca6 (patch) | |
| tree | 15bc64153c76037a595844b26f80f29dbb125601 | |
| parent | 59e4850d2a0427b3598a66d612b1812a37d2e002 (diff) | |
| parent | 442a2b1a9cf8e3ca0c22b3d52397e7d9b5a6fecc (diff) | |
Merge branch 'archweb-generic'parabolaweb-2016-05-17
# Conflicts:
# templates/public/index.html
| -rw-r--r-- | archweb.wsgi | 8 | ||||
| -rw-r--r-- | requirements.txt | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/archweb.wsgi b/archweb.wsgi index a0d969e7..20ec463e 100644 --- a/archweb.wsgi +++ b/archweb.wsgi @@ -3,10 +3,12 @@ import os import sys import site -base_path = "/srv/http/archweb" +base_path = os.path.dirname(os.path.realpath(__file__)) -site.addsitedir('/srv/http/archweb-env/lib/python2.7/site-packages') -sys.path.insert(0, base_path) +virtualenv_path = os.path.join(base_path, "env") +if os.path.isdir(virtualenv_path): + site.addsitedir(os.path.join(virtualenv_path, 'lib/python2.7/site-packages')) + sys.path.insert(0, base_path) os.environ['DJANGO_SETTINGS_MODULE'] = "settings" diff --git a/requirements.txt b/requirements.txt index 6ca63480..8128b451 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -Django==1.7.8 +Django==1.7.11 IPy==0.83 Jinja2==2.7.3 Markdown==2.6.2 |