summaryrefslogtreecommitdiff
path: root/apache
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-10-09 17:47:02 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-10-09 17:47:02 +0200
commit57af459400d9160f413f384d140f80e9e2329b61 (patch)
treed6d70cf31a6038062e06eabd43f96926f9576268 /apache
parentef17bd0f0e94a0c379b1b9b37216e2290707a558 (diff)
downloadChimère-57af459400d9160f413f384d140f80e9e2329b61.tar.bz2
Chimère-57af459400d9160f413f384d140f80e9e2329b61.zip
Integration of Alban Tiberghien <alban.tiberghien@gmail.com> changes to make the application more 'pip' and 'virtualenv' friendly
Changes has been integrated in alternate files 'local_settings.py.pip.sample' and 'apache-wsgi-pip.conf' in order to not conflict with installation not using 'pip'. The changes are: - Add django-extensions - Install tinymce as 3rd app - Minor fix in jquery path - Fix shabang in order to work with virtual environment As I want to minimise the size of the tracked files in the Git repository jQuery-UI files were not included (as a small fix Google CDN is set by default for jquery-UI).
Diffstat (limited to 'apache')
-rw-r--r--apache/apache-wsgi-pip.conf13
1 files changed, 13 insertions, 0 deletions
diff --git a/apache/apache-wsgi-pip.conf b/apache/apache-wsgi-pip.conf
new file mode 100644
index 0000000..df690d2
--- /dev/null
+++ b/apache/apache-wsgi-pip.conf
@@ -0,0 +1,13 @@
+<VirtualHost *:80>
+ ServerName chimere.example.com
+ WSGIDaemonProcess chimere processes=2 maximum-requests=500 threads=1
+ WSGIProcessGroup chimere
+ WSGIScriptAlias / /var/local/chimere/apache/mydjango.wsgi
+ Alias /static "/var/local/chimere/mychimere_project/static"
+ Alias /admin/doc "/var/local/chimere/docs/_build/html/"
+
+ ErrorLog ${APACHE_LOG_DIR}/chimere/error.log
+ LogLevel warn
+ CustomLog ${APACHE_LOG_DIR}/chimere/access.log combined
+
+</VirtualHost>