mirror of
https://github.com/zulip/zulip.git
synced 2025-10-26 09:34:02 +00:00
settings: Allow customization of STATIC_URL.
Some requests will still be to `/static/`, either at the realm's domain, or at the root domain.
This commit is contained in:
committed by
Alex Vandiver
parent
dd21e472e7
commit
3559bf416d
@@ -56,6 +56,7 @@ def is_root_domain_available() -> bool:
|
|||||||
|
|
||||||
|
|
||||||
def is_static_or_current_realm_url(url: str, realm: Optional[Realm]) -> bool:
|
def is_static_or_current_realm_url(url: str, realm: Optional[Realm]) -> bool:
|
||||||
|
assert settings.STATIC_URL is not None
|
||||||
split_url = urllib.parse.urlsplit(url)
|
split_url = urllib.parse.urlsplit(url)
|
||||||
split_static_url = urllib.parse.urlsplit(settings.STATIC_URL)
|
split_static_url = urllib.parse.urlsplit(settings.STATIC_URL)
|
||||||
|
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ from .configured_settings import (
|
|||||||
SOCIAL_AUTH_SAML_ENABLED_IDPS,
|
SOCIAL_AUTH_SAML_ENABLED_IDPS,
|
||||||
SOCIAL_AUTH_SAML_SECURITY_CONFIG,
|
SOCIAL_AUTH_SAML_SECURITY_CONFIG,
|
||||||
SOCIAL_AUTH_SUBDOMAIN,
|
SOCIAL_AUTH_SUBDOMAIN,
|
||||||
|
STATIC_URL,
|
||||||
STATSD_HOST,
|
STATSD_HOST,
|
||||||
TORNADO_PORTS,
|
TORNADO_PORTS,
|
||||||
USING_PGROONGA,
|
USING_PGROONGA,
|
||||||
@@ -537,9 +538,10 @@ CAMO_KEY = get_secret("camo_key") if CAMO_URI != "" else None
|
|||||||
# STATIC CONTENT AND MINIFICATION SETTINGS
|
# STATIC CONTENT AND MINIFICATION SETTINGS
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
||||||
if PRODUCTION or IS_DEV_DROPLET or os.getenv("EXTERNAL_HOST") is not None:
|
if STATIC_URL is None:
|
||||||
|
if PRODUCTION or IS_DEV_DROPLET or os.getenv("EXTERNAL_HOST") is not None:
|
||||||
STATIC_URL = urljoin(ROOT_DOMAIN_URI, "/static/")
|
STATIC_URL = urljoin(ROOT_DOMAIN_URI, "/static/")
|
||||||
else:
|
else:
|
||||||
STATIC_URL = "http://localhost:9991/static/"
|
STATIC_URL = "http://localhost:9991/static/"
|
||||||
|
|
||||||
LOCAL_AVATARS_DIR = os.path.join(LOCAL_UPLOADS_DIR, "avatars") if LOCAL_UPLOADS_DIR else None
|
LOCAL_AVATARS_DIR = os.path.join(LOCAL_UPLOADS_DIR, "avatars") if LOCAL_UPLOADS_DIR else None
|
||||||
|
|||||||
@@ -19,6 +19,8 @@ DEBUG = DEVELOPMENT
|
|||||||
|
|
||||||
EXTERNAL_HOST_WITHOUT_PORT = deport(EXTERNAL_HOST)
|
EXTERNAL_HOST_WITHOUT_PORT = deport(EXTERNAL_HOST)
|
||||||
|
|
||||||
|
STATIC_URL: Optional[str] = None
|
||||||
|
|
||||||
# These settings are intended for the server admin to set. We document them in
|
# These settings are intended for the server admin to set. We document them in
|
||||||
# prod_settings_template.py, and in the initial /etc/zulip/settings.py on a new
|
# prod_settings_template.py, and in the initial /etc/zulip/settings.py on a new
|
||||||
# install of the Zulip server.
|
# install of the Zulip server.
|
||||||
|
|||||||
@@ -116,6 +116,7 @@ else:
|
|||||||
response["Access-Control-Allow-Origin"] = "*"
|
response["Access-Control-Allow-Origin"] = "*"
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
assert settings.STATIC_URL is not None
|
||||||
urls += static(urlsplit(settings.STATIC_URL).path, view=serve_static)
|
urls += static(urlsplit(settings.STATIC_URL).path, view=serve_static)
|
||||||
|
|
||||||
i18n_urls = [
|
i18n_urls = [
|
||||||
|
|||||||
Reference in New Issue
Block a user