Deployment fixes

adim_project/apache.conf.tpl

@@ -36,9 +36,8 @@
     ## --------------
     <IfModule xsendfile_module>
         XSendFile On
-        #XSendFileAllowAbove On
     </IfModule>
-    <Directory "{{ settings.MEDIA_ROOT }}protected/">
+    <Directory "{{ settings.MEDIA_ROOT }}ao_images/">
         Order allow,deny
         Deny from all
     </Directory>
@@ -76,7 +75,7 @@
     <IfModule rewrite_module>
         RewriteEngine On
         ## Retourne une 404 pour media/protected au lien d'une 403
-        RewriteRule ^.*media/protected/.*$ - [R=404,L,NS]
+        RewriteRule ^{{ settings.MEDIA_URL }}/ao_images/.*$ - [R=404,L,NS]
     
         #RewriteCond %{REMOTE_ADDR} !^130.223.3.229$
         #RewriteCond %{REQUEST_URI} !^/static/.*$

adim_project/generate_apache_conf.py

@@ -66,6 +66,7 @@ def _get_project_name(nb_it=0, name=None):
 
 
 if __name__ == '__main__':
+    sys.path.append(os.path.dirname(os.path.dirname(__file__)))
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "adim_project.settings")
 
     if len(sys.argv) <= 2:

requirements.txt

-Django>=1.6.4
+Django>=1.6.4,<=1.6.99
 Markdown>=2.4
 MySQL-python>=1.2.5
 Pillow>=2.4.0