apache staging conf uses cookiecutter

and remove the maximum-requests bit from WSGIDaemonProcess - see http://stackoverflow.com/a/8131650/3189 for why
aptivate · Oct 9, 2013 · c23d988 · c23d988
1 parent 2bb2f99
commit c23d988
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/{{cookiecutter.repo_name}}/apache/production.conf b/{{cookiecutter.repo_name}}/apache/production.conf
@@ -26,7 +26,7 @@ WSGIRestrictEmbedded On
 
         # Django settings - AFTER the static media stuff
         WSGIScriptAlias / /var/django/{{ cookiecutter.project_name }}/current/wsgi/wsgi_handler.py
-        WSGIDaemonProcess {{ cookiecutter.project_name }} processes=2 threads=10 maximum-requests=200
+        WSGIDaemonProcess {{ cookiecutter.project_name }} processes=2 threads=10
         WSGIProcessGroup {{ cookiecutter.project_name }} 
 
         # Possible values include: debug, info, notice, warn, error, crit,

diff --git a/{{cookiecutter.repo_name}}/apache/staging.conf b/{{cookiecutter.repo_name}}/apache/staging.conf
@@ -3,32 +3,32 @@ WSGISocketPrefix /var/run/wsgi
 WSGIRestrictEmbedded On
 
 <VirtualHost *:80>
-        ServerAdmin carers-project_name@aptivate.org
-        ServerName project_name-stage.aptivate.org
-        ServerAlias fen-vz-project_name.fen.aptivate.org
+        ServerAdmin carers-{{ cookiecutter.project_name }}@aptivate.org
+        ServerName {{ cookiecutter.project_name }}.stage.aptivate.org
+        ServerAlias fen-vz-{{ cookiecutter.project_name }}.fen.aptivate.org
 
         DocumentRoot /var/www
 
         # Static content needed by Django
-        Alias /static "/var/django/project_name/current/django/project/static/"
+        Alias /static "/var/django/{{ cookiecutter.project_name }}/current/django/project/static/"
         <Location "/static">
                 Order allow,deny
                 Allow from all
                 SetHandler None
         </Location>
 
         # Static content uploaded by users
-        Alias /uploads "/var/django/project_name/current/django/project/uploads/"
+        Alias /uploads "/var/django/{{ cookiecutter.project_name }}/current/django/project/uploads/"
         <Location "/uploads">
                 Order allow,deny
                 Allow from all
                 SetHandler None
         </Location>
 
         # Django settings - AFTER the static media stuff
-        WSGIScriptAlias / /var/django/project_name/current/wsgi/wsgi_handler.py
-        WSGIDaemonProcess project_name processes=2 threads=10 maximum-requests=200
-        WSGIProcessGroup project_name 
+        WSGIScriptAlias / /var/django/{{ cookiecutter.project_name }}/current/wsgi/wsgi_handler.py
+        WSGIDaemonProcess {{ cookiecutter.project_name }} processes=2 threads=10
+        WSGIProcessGroup {{ cookiecutter.project_name }} 
 
         # Possible values include: debug, info, notice, warn, error, crit,
         # alert, emerg.