From dc1cd6e4104b3698730b907db06969cf186139d9 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Mon, 22 Dec 2014 10:51:13 +0000
Subject: [PATCH] remove videoprefix from config, defined by backend

---
 pandora/config.0xdb.jsonc         | 3 +--
 pandora/config.indiancinema.jsonc | 3 +--
 pandora/config.padma.jsonc        | 3 +--
 pandora/config.pandora.jsonc      | 5 +----
 pandora/settings.py               | 3 ++-
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/pandora/config.0xdb.jsonc b/pandora/config.0xdb.jsonc
index 251b28d56..33d854234 100644
--- a/pandora/config.0xdb.jsonc
+++ b/pandora/config.0xdb.jsonc
@@ -780,8 +780,7 @@
         "id": "0xdb",
         "name": "0xDB",
         "sendReferrer": false,
-        "url": "0xDB.org",
-        "videoprefix": ""
+        "url": "0xDB.org"
     },
     /*
     */
diff --git a/pandora/config.indiancinema.jsonc b/pandora/config.indiancinema.jsonc
index 6f1e49551..684c6a927 100644
--- a/pandora/config.indiancinema.jsonc
+++ b/pandora/config.indiancinema.jsonc
@@ -795,8 +795,7 @@
         "id": "indiancinema",
         "name": "Indiancine.ma",
         "sendReferrer": true,
-        "url": "indiancine.ma",
-        "videoprefix": ""
+        "url": "indiancine.ma"
     },
     /*
     */
diff --git a/pandora/config.padma.jsonc b/pandora/config.padma.jsonc
index aed0303fd..938e6c73c 100644
--- a/pandora/config.padma.jsonc
+++ b/pandora/config.padma.jsonc
@@ -681,8 +681,7 @@
         "id": "padma",
         "name": "Pad.ma",
         "sendReferrer": true,
-        "url": "pad.ma",
-        "videoprefix": ""
+        "url": "pad.ma"
     },
     /*
     */
diff --git a/pandora/config.pandora.jsonc b/pandora/config.pandora.jsonc
index acc6d05e7..41466a456 100644
--- a/pandora/config.pandora.jsonc
+++ b/pandora/config.pandora.jsonc
@@ -685,8 +685,6 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
     "site" contains various settings for this instance. In "email", "contact"
     if the address in the contact form (to), "system" is the address used by
     the system (from).
-    Note that "videoprefix" (subdomains to serve the video files from) gets
-    populated automatically and can be left empty.
     */
     "site": {
         "description": "This is a demo of pan.do/ra - a free, open source media archive. It allows you to manage large, decentralized collections of video, to collaboratively create metadata and time-based annotations, and to serve your archive as a cutting-edge web application.",
@@ -702,8 +700,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
         "id": "pandora",
         "name": "Demo",
         "sendReferrer": true,
-        "url": "pandora.local",
-        "videoprefix": ""
+        "url": "pandora.local"
     },
     /*
     "sitePages" defines the sections of the main site dialog. If "news" is
diff --git a/pandora/settings.py b/pandora/settings.py
index f232f2f3f..8f87256b1 100644
--- a/pandora/settings.py
+++ b/pandora/settings.py
@@ -192,7 +192,8 @@ POSTER_PRECEDENCE = ()
 
 USE_IMDB = False
 
-#if you set VIDEO_PREFIX make sure cookies work accros subsomains
+#If you set VIDEO_PREFIX make sure cookies work accros subsomains
+#by setting SESSION_COOKIE_DOMAIN to ".domain.tld"
 VIDEO_PREFIX=''
 #VIDEO_PREFIX = '//video{uid}.example.com'
 MEDIA_PREFIX=''