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

Document how to setup the Zulip S3 integration.

This commit is contained in:
Tim Abbott 2015-09-29 18:10:17 -07:00
parent 80fa5006f8
commit 3efdb7ebf3
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zproject/local_settings.py
View File

@ -59,7 +59,9 @@ else:
EXTERNAL_API_PATH = 'api.zulip.com' EXTERNAL_API_PATH = 'api.zulip.com'
STATSD_PREFIX = 'app' STATSD_PREFIX = 'app'
# Legacy zulip.com bucket used for old-style S3 uploads.
S3_BUCKET="humbug-user-uploads" S3_BUCKET="humbug-user-uploads"
# Buckets used for Amazon S3 integration for storing files and user avatars.
S3_AUTH_UPLOADS_BUCKET = "zulip-user-uploads" S3_AUTH_UPLOADS_BUCKET = "zulip-user-uploads"
S3_AVATAR_BUCKET="humbug-user-avatars" S3_AVATAR_BUCKET="humbug-user-avatars"

10
zproject/local_settings_template.py
View File

@ -101,10 +101,12 @@ ERROR_REPORTING = True
INLINE_IMAGE_PREVIEW = True INLINE_IMAGE_PREVIEW = True
# By default, files uploaded by users and user avatars are stored # By default, files uploaded by users and user avatars are stored
# directly on the Zulip server. If file storage in Amazon S3 (or # directly on the Zulip server. If file storage in Amazon S3 is
# elsewhere, e.g. your corporate fileshare) is desired, please contact # desired, you can configure that by setting s3_key and s3_secret_key
# Zulip Support (zulip-devel@googlegroups.com) for further instructions on # in /etc/zulip/zulip-secrets.conf to be the S3 access and secret keys
# setting up the appropriate integration. # that you want to use, and setting the S3_AUTH_UPLOADS_BUCKET and
# S3_AVATAR_BUCKET to be the S3 buckets you've created to store file
# uploads and user avatars, respectively.
LOCAL_UPLOADS_DIR = "/home/zulip/uploads" LOCAL_UPLOADS_DIR = "/home/zulip/uploads"
# Controls whether name changes are completely disabled for this installation # Controls whether name changes are completely disabled for this installation