Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dev_settings: Fix run-dev SyntaxError. 

zthumbor loads dev_settings from Python 2.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg 2020-04-24 20:07:50 -07:00
parent 01a57ddd9d
commit b46d1c8d07
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zproject/dev_settings.py
View File

@ -12,14 +12,9 @@ from typing import Set
DEPLOY_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__))) 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')
def is_dev_droplet() -> bool: # We assume dev droplets are the only places where
# We assume dev droplets are the only places where # users use zulipdev as the user.
# users use zulipdev as the user. IS_DEV_DROPLET = pwd.getpwuid(os.getuid()).pw_name == 'zulipdev'
user_id = os.getuid()
user_name = pwd.getpwuid(user_id).pw_name
return user_name == 'zulipdev'
IS_DEV_DROPLET = is_dev_droplet()
FORWARD_ADDRESS_CONFIG_FILE = "var/forward_address.ini" FORWARD_ADDRESS_CONFIG_FILE = "var/forward_address.ini"
# Check if test_settings.py set EXTERNAL_HOST. # Check if test_settings.py set EXTERNAL_HOST.