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
This commit is contained in:
Raphael Michel
2015-05-20 10:22:45 +02:00
parent 82bd843aa3
commit 18a83d7e38
3 changed files with 2 additions and 7 deletions

View File

@@ -25,7 +25,6 @@ Example::
instance_name=pretix.de instance_name=pretix.de
global_registration=off global_registration=off
site_url=http://localhost site_url=http://localhost
scriptname=/presale/
currency=EUR currency=EUR
cookiedomain=.pretix.de cookiedomain=.pretix.de
securecookie=on securecookie=on
@@ -37,9 +36,6 @@ Example::
Whether or not this installation supports global user accounts (in addition to Whether or not this installation supports global user accounts (in addition to
event-bound accounts). Defaults to ``True``. event-bound accounts). Defaults to ``True``.
``scriptname``
The path pretix runs at, if it does not run under its own subdomain.
``site_url`` ``site_url``
The installation's full URL, without a trailing slash. The installation's full URL, without a trailing slash.

View File

@@ -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) PRETIX_GLOBAL_REGISTRATION = config.getboolean('pretix', 'global_registration', fallback=True)
SITE_URL = config.get('pretix', 'url', fallback='http://localhost') 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') DEFAULT_CURRENCY = config.get('pretix', 'currency', fallback='EUR')

View File

@@ -14,5 +14,5 @@ BeautifulSoup4
html5lib html5lib
slimit slimit
lxml lxml
-e git+https://github.com/pretix/static3.git@readme#egg=static3 static3==0.6.1
dj-static==0.0.6 -e git+https://github.com/pretix/dj-static.git@script-path#egg=dj-static