paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-26 17:43:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "dev_settings: Deduplicate DEPLOY_ROOT definition."

Browse Source 
This reverts commit b8acd82b72.
This commit is contained in:
Anders Kaseorg
2020-06-10 02:11:00 -07:00
parent d3e8af4ad2
commit 3de3386c21
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zproject/dev_settings.py
View File

@@ -2,12 +2,13 @@ import os
import pwd import pwd
from typing import Optional, Set, Tuple from typing import Optional, Set, Tuple
from .config import DEPLOY_ROOT
ZULIP_ADMINISTRATOR = "desdemona+admin@zulip.com" ZULIP_ADMINISTRATOR = "desdemona+admin@zulip.com"
# We want LOCAL_UPLOADS_DIR to be an absolute path so that code can # We want LOCAL_UPLOADS_DIR to be an absolute path so that code can
# chdir without having problems accessing it. # chdir without having problems accessing it. Unfortunately, this
# means we need a duplicate definition of DEPLOY_ROOT with the one in
# settings.py.
DEPLOY_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
LOCAL_UPLOADS_DIR = os.path.join(DEPLOY_ROOT, 'var/uploads') LOCAL_UPLOADS_DIR = os.path.join(DEPLOY_ROOT, 'var/uploads')
# We assume dev droplets are the only places where # We assume dev droplets are the only places where