Skip to content

Commit

Permalink
Re-use official static3 package as 0.6.1 fixed the bug we found
Browse files Browse the repository at this point in the history
Use own dj-static fork as long as our patch is in review
Remove setting for FORCE_SCRIPT_NAME
  • Loading branch information
raphaelm committed May 20, 2015
1 parent 82bd843 commit 18a83d7
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
4 changes: 0 additions & 4 deletions doc/admin/config.rst
Expand Up @@ -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
Expand All @@ -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.

Expand Down
1 change: 0 additions & 1 deletion src/pretix/settings.py
Expand Up @@ -46,7 +46,6 @@
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')

Expand Down
4 changes: 2 additions & 2 deletions src/requirements/production.txt
Expand Up @@ -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

0 comments on commit 18a83d7

Please sign in to comment.