Skip to content

Commit

Permalink
settings: Include analytics in default distribution.
Browse files Browse the repository at this point in the history
This moves the analytics module from being a default-off module that
is somewhat difficult to install to being a default part of the
Zulip distribution (both tarballs and what is enabled by default).
  • Loading branch information
timabbott committed Feb 3, 2017
1 parent 161522e commit 70e7550
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 0 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@
*.tif binary
.gitignore export-ignore
.gitattributes export-ignore
/analytics export-ignore
/static/assets export-ignore
/bots export-ignore
/corporate export-ignore
/static export-ignore
/tools export-ignore
/zilencer export-ignore
/templates/analytics export-ignore
/templates/corporate export-ignore
/templates/zilencer export-ignore
/puppet/zulip_internal export-ignore
Expand Down
5 changes: 4 additions & 1 deletion zproject/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,10 @@ def get_secret(key):
'DBX_APNS_CERT_FILE': None,
'DBX_APNS_KEY_FILE': None,
'PERSONAL_ZMIRROR_SERVER': None,
'EXTRA_INSTALLED_APPS': [],
# Structurally, we will probably eventually merge
# analytics into part of the main server, rather
# than a separate app.
'EXTRA_INSTALLED_APPS': ['analytics'],
'DEFAULT_NEW_REALM_STREAMS': {
"social": {"description": "For socializing", "invite_only": False},
"general": {"description": "For general stuff", "invite_only": False},
Expand Down

0 comments on commit 70e7550

Please sign in to comment.