fix urls, fix sandbox wsgi, fix sandbox apache conf

diff --git a/example/apache2/telemeta.conf b/example/apache2/telemeta.conf
index 3b6cedd7f89fac1f9c679dde5e51537f56e474ee..d0bffa7175595c3df767e3f98b402e43618599f4 100644 (file)
--- a/example/apache2/telemeta.conf
+++ b/example/apache2/telemeta.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
        ServerAdmin webmaster@localhost
         ServerName telemeta.wm22.parisson.org
-        
+
         LogLevel warn
        ErrorLog ${APACHE_LOG_DIR}/error-telemeta.log
        # Possible values include: debug, info, notice, warn, error, crit,
@@ -14,10 +14,10 @@
          Order deny,allow
          Allow from all
         </Directory>
-        
+
         WSGIDaemonProcess telemeta_test user=www-data group=www-data threads=12 processes=4 maximum-requests=1000 deadlock-timeout=300
         WSGIProcessGroup telemeta_test
-        WSGIApplicationGroup %{GLOBAL} 
+        WSGIApplicationGroup %{GLOBAL}
         WSGIScriptAlias / /home/dev/telemeta/example/sandbox/wsgi.py
 
 
@@ -31,4 +31,14 @@ Alias /favicon.ico /home/dev/telemeta/telemeta/static/telemeta/images/favicon.ic
     SetHandler None
 </LocationMatch>
 
+DocumentRoot /var/www/
+Alias /static/ /var/www/telemeta/
+
+        <Directory /var/www/>
+                Options Indexes FollowSymLinks MultiViews
+                AllowOverride None
+                Order allow,deny
+                allow from all
+        </Directory>
+
 </VirtualHost>

diff --git a/example/sandbox/wsgi.py b/example/sandbox/wsgi.py
index 642c8723338b2d267b83c8b1bbc7c67ba1881816..c3642fec137b441b2f8af1dffac18149cfe6f38f 100644 (file)
--- a/example/sandbox/wsgi.py
+++ b/example/sandbox/wsgi.py
@@ -7,7 +7,7 @@ import sys
 here = os.path.dirname(__file__)
 sys.path.append(here)
 
-os.environ['DJANGO_SETTINGS_MODULE'] = 'sandbox.settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
 
 import django.core.handlers.wsgi
 application = django.core.handlers.wsgi.WSGIHandler()

diff --git a/telemeta/urls.py b/telemeta/urls.py
index 7f356af8f23c230034d03a63a206ef345da0f05e..cc16baffc1c9bf5cb3f0b2a43e0697c3f5b1404b 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -108,7 +108,7 @@ urlpatterns = patterns('',
     # url(r'^archives/collections/(?P<public_id>[A-Za-z0-9._-]+)/collection.m3u$', collection_view.collection_playlist, dict(template="telemeta/collection.m3u", mimetype="audio/mpegurl"), name="telemeta-collection-m3u"),
     url(r'^archives/collections/(?P<public_id>[A-Za-z0-9._-]+)/edit/$', CollectionEditView.as_view(), name="telemeta-collection-edit"),
     url(r'^archives/collections/(?P<public_id>[A-Za-z0-9._-]+)/copy/$', CollectionCopyView.as_view(), name="telemeta-collection-copy"),
-    url(r'^archives/collections_add//$', CollectionAddView.as_view(), name="telemeta-collection-add"),
+    url(r'^archives/collections_add/$', CollectionAddView.as_view(), name="telemeta-collection-add"),
     url(r'^archives/collections/(?P<public_id>[A-Za-z0-9._-]+)/add_item/$', ItemAddView.as_view(), name="telemeta-collection-additem"),
     url(r'^archives/collections/(?P<public_id>[A-Za-z0-9._-]+)/delete/$', collection_view.collection_delete, name="telemeta-collection-delete"),
     url(r'^archives/collections/(?P<collection_public_id>[A-Za-z0-9._-]+)/related/(?P<media_id>[A-Za-z0-9._-]+)/view/$', collection_view.related_media_collection_stream, name="telemeta-collection-related"),