diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-14 16:55:22 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-14 16:55:22 +0200 |
| commit | ea65e5512c236b81e7f4b8757521facadae4b3b8 (patch) | |
| tree | 739cdf40fb6a89de90c4189936d695288a82849f /apache/apache-wsgi.conf | |
| parent | 4b0f0777c434f5fa1366ca408c34d257d4833fad (diff) | |
| parent | a55f77a246f99764ff6289686f80825526654e2b (diff) | |
| download | Chimère-ea65e5512c236b81e7f4b8757521facadae4b3b8.tar.bz2 Chimère-ea65e5512c236b81e7f4b8757521facadae4b3b8.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/fixtures/initial_data.json
chimere/forms.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/models.py
chimere/static/chimere/css/styles.css
chimere/templates/chimere/detail.html
chimere/templatetags/chimere_tags.py
chimere/views.py
chimere/widgets.py
Diffstat (limited to 'apache/apache-wsgi.conf')
| -rw-r--r-- | apache/apache-wsgi.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apache/apache-wsgi.conf b/apache/apache-wsgi.conf index 4bd2b81..3ed1b1d 100644 --- a/apache/apache-wsgi.conf +++ b/apache/apache-wsgi.conf @@ -2,8 +2,9 @@ ServerName chimere.example.com WSGIDaemonProcess chimere processes=2 maximum-requests=500 threads=1 WSGIProcessGroup chimere - WSGIScriptAlias / /var/local/chimere/chimere/apache/mydjango.wsgi + WSGIScriptAlias / /var/local/chimere/apache/mydjango.wsgi Alias /static "/var/local/chimere/mychimere_project/static" + Alias /admin/doc "/var/local/chimere/docs/_build/html/" Alias /tinymce "/usr/share/tinymce/www" <Directory "/usr/share/tinymce/www/"> Options Indexes MultiViews FollowSymLinks |