From 18a83d7e3803b1d6006dc644f913de26c658a3c4 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Wed, 20 May 2015 10:22:45 +0200
Subject: [PATCH] Re-use official static3 package as 0.6.1 fixed the bug we
 found Use own dj-static fork as long as our patch is in review Remove setting
 for FORCE_SCRIPT_NAME

---
 doc/admin/config.rst            | 4 ----
 src/pretix/settings.py          | 1 -
 src/requirements/production.txt | 4 ++--
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/doc/admin/config.rst b/doc/admin/config.rst
index 6423ecd33..edeb60ad1 100644
--- a/doc/admin/config.rst
+++ b/doc/admin/config.rst
@@ -25,7 +25,6 @@ Example::
     instance_name=pretix.de
     global_registration=off
     site_url=http://localhost
-    scriptname=/presale/
     currency=EUR
     cookiedomain=.pretix.de
     securecookie=on
@@ -37,9 +36,6 @@ Example::
     Whether or not this installation supports global user accounts (in addition to
     event-bound accounts). Defaults to ``True``.
 
-``scriptname``
-    The path pretix runs at, if it does not run under its own subdomain.
-
 ``site_url``
     The installation's full URL, without a trailing slash.
 
diff --git a/src/pretix/settings.py b/src/pretix/settings.py
index 05b657804..2c731ae5b 100644
--- a/src/pretix/settings.py
+++ b/src/pretix/settings.py
@@ -46,7 +46,6 @@ PRETIX_INSTANCE_NAME = config.get('pretix', 'instance_name', fallback='pretix.de
 PRETIX_GLOBAL_REGISTRATION = config.getboolean('pretix', 'global_registration', fallback=True)
 
 SITE_URL = config.get('pretix', 'url', fallback='http://localhost')
-FORCE_SCRIPT_NAME = config.get('pretix', 'scriptname', fallback=None)
 
 DEFAULT_CURRENCY = config.get('pretix', 'currency', fallback='EUR')
 
diff --git a/src/requirements/production.txt b/src/requirements/production.txt
index 97a08c8bf..368288571 100644
--- a/src/requirements/production.txt
+++ b/src/requirements/production.txt
@@ -14,5 +14,5 @@ BeautifulSoup4
 html5lib
 slimit
 lxml
--e git+https://github.com/pretix/static3.git@readme#egg=static3
-dj-static==0.0.6
+static3==0.6.1
+-e git+https://github.com/pretix/dj-static.git@script-path#egg=dj-static