Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
9,635 Commits 28 Branches 143 Tags 631 MiB
Commit Graph

223 Commits

Author SHA1 Message Date
Tim Abbott 140e598a89 Update configuration examples to use current Google auth backend. 2015-09-26 13:50:28 -07:00
Tim Abbott ae4cb6df35 Make python-postmonkey not a required package. 
This is in some ways a regression, but because we don't have
python-postmonkey packaged right now, this is required to make the
Zulip production installation process work on Trusty.

(imported from commit 539d253eb7fedc20bf02cc1f0674e9345beebf48)
 2015-09-25 00:22:14 -07:00
Tim Abbott a0006d5faf Remove duplicate REQUIRED_SETTINGS check. 
This makes fetching settings from here for the rabbitmq config not
work; and the main place we check for this is in initialize-database
anyway.

(imported from commit fcc6eff3882f880fdc8b127daffc9a3173f3ff20)
 2015-09-25 00:22:14 -07:00
Tim Abbott 36a9dc2cf7 Cleanup various minor Zanitization issues. 
(imported from commit 5784eb5ac70706f72b05463354434a83a6e1beaa)
 2015-09-20 00:25:38 -07:00
Reid Barton 73264ab530 Move VOYAGER detection to after initialization of ZULIP_COM 
(imported from commit c9aa814ebc30a78abe8babfc3bf2eedb8198d17d)
 2015-08-29 12:07:33 -07:00
Tim Abbott 17fd248f23 Move postgres host configuration for zulip.com out of settings.py. 
(imported from commit fe95011ae86ff7c5f20c789b459a763326da374d)
 2015-08-22 13:49:43 -07:00
Tim Abbott 930c64df8a Move zulip.com-related statsd configuration out of main settings.py. 
This also removes the convenient way to run statsd in the Dev VM,
because we don't anticipate anyone doing that.  It's just 2 lines of
config to configure it anyway:

STATSD_HOST = 'localhost'
STATSD_PREFIX = 'user'

(imported from commit 5b09422ee0e956bc7f336dd1e575634380b8bfa2)
 2015-08-22 13:49:43 -07:00
Tim Abbott 3e87c82d56 Reorganize settings.py to put the default values in a sane place. 
(imported from commit 00f09c6c65cb95d29c466e996b17f80a30635acf)
 2015-08-22 13:49:43 -07:00
Yoyo Zhou 50ccbc4230 Refactor database configuration to make ZULIP_COM the special case instead of the default. 
(imported from commit bba7a3a78dc4fd0e442503f8707295eabc581652)
 2015-08-22 13:48:52 -07:00
Yoyo Zhou 8549606eb3 Require ALLOWED_HOSTS to be set in production. 
(imported from commit 581e3d44aa42b5c8e6322b760b8b66a1f0aaf375)
 2015-08-22 13:48:52 -07:00
Tim Abbott da84aa3412 Require REQUIRED_SETTINGS in PRODUCTION. 
(imported from commit 7f43ba4d54021f806481b2e369c5482b0e0f99fe)
 2015-08-22 13:48:47 -07:00
Tim Abbott 6f50a2703e Remove duplicate ZULIP_COM detection from settings.py. 
And fix up some required configuration.

(imported from commit 761758638baa297118848c9f5640638d6b2f4f67)
 2015-08-21 10:48:13 -07:00
Tim Abbott e78361f985 Move STATSD_CONFIGURATION below setting defaults. 
(imported from commit 48d833c672ad96318f738c663c3bea61cd1ec382)
 2015-08-21 10:42:15 -07:00
Tim Abbott 83a653efce Change semantics of ZULIP_COM to include ZULIP_COM_STAGING machines. 
(imported from commit 2e84c756b4ac41c13d619ab6ceb99e347d1f48cb)
 2015-08-21 10:41:14 -07:00
Tim Abbott 16e0f21687 Fix a bunch of Zulip Voyager related comments. 
(imported from commit 176e875cbc310ba00d6137930ddb718bd68f1866)
 2015-08-21 10:40:54 -07:00
David Roe edf7e732a2 ENTERPRISE => VOYAGER. 
(imported from commit 4f8080b9f506a87ca40bef32e39de5218cba916a)
 2015-08-21 10:33:35 -07:00
David Roe f9f1fdc4d7 change deploy_type in zulip.com conf file. 
(imported from commit 6fad28d15f530a619d7359bce0a182ed61b876ab)
 2015-08-21 10:33:35 -07:00
David Roe d702ddb3cf DEPLOYED => PRODUCTION 
(imported from commit a7d365c07916c5103fc721c712db94f9af977640)
 2015-08-21 10:33:35 -07:00
David Roe 63e576b811 STAGING_DEPLOYED => ZULIP_COM_STAGING 
(imported from commit 25419979292218932c53cface59c1e8e2348a7c2)
 2015-08-21 10:33:35 -07:00
David Roe 8778c4726a Add settings.DEVELOPMENT as a complement of settings.DEPLOYED. 
(imported from commit 0437140d9fee7eec7b28abe583cfe8cde3e07c21)
 2015-08-21 10:33:35 -07:00
David Roe 24f6743288 Eliminate TESTING_DEPLOYED. 
(imported from commit 477d8b7a15f703df1e10ae5682e02fea5ce040e4)
 2015-08-21 10:33:35 -07:00
David Roe 59b94a901c Moving ALLOWED_HOSTS to local_settings. 
(imported from commit b89c6983fd87ede42954dd84706f999ed0de740d)
 2015-08-21 10:33:35 -07:00
Tim Abbott 80651c99cd Stop using local_settings.py at all in the Dev VM. 
(imported from commit d067bcfe9d71628d8f671c5bc7bb38f521f9a965)
 2015-08-21 10:33:35 -07:00
Tim Abbott 78277b5ee5 Make ADMIN_DOMAIN and ZULIP_ADMINISTRATOR have sane dev defaults. 
(imported from commit 3d2602166541c7eaa72ea7fad87a2dc86f7c8f15)
 2015-08-21 09:01:58 -07:00
Tim Abbott 3e61714035 Make DEPLOYMENT_ROLE_KEY no longer required. 
(imported from commit 046ce610d847cc987d3f6d584ccc0bc84b55df84)
 2015-08-21 09:01:58 -07:00
Reid Barton ab9539cffe Remove OpenID authentication 
(imported from commit 70a859041a851ed10dc40cfc068330e472d2ed09)
 2015-08-20 23:52:48 -07:00
Reid Barton 15fe02b618 Remove authhack 
In Django 1.8 the username length limit seems to be 254 by default.

(imported from commit cf0027431f5a4fea9e366a49d345b9d09b90d869)
 2015-08-20 23:15:45 -07:00
Reid Barton 0aab583bb1 Django 1.8 compatibility: transactions 
- autocommit is now the default
- commit_on_success is now atomic

(imported from commit b6166ca666ff23d34f2871ca365ce3ec66b0fa86)
 2015-08-20 23:15:45 -07:00
Reid Barton 599742536b Switch from South to native Django migrations 
This commit loses some indexes, unique constraints etc. that were
manually added by the old migrations. I plan to add them to a new
migration in a subsequent commit.

(imported from commit 4bcbf06080a7ad94788ac368385eac34b54623ce)
 2015-08-20 23:01:26 -07:00
Yoyo Zhou 15abf9ed31 Move all remaining calls of get_secret from local_settings.py to settings.py. 
(imported from commit 099a122121f8e06568cef3579f955cb73b20ee50)
 2015-08-20 22:19:26 -07:00
Yoyo Zhou bd5fc484f0 Move GOOGLE_OAUTH2_CLIENT_SECRET to be read in settings.py. 
(imported from commit 814dc32cd6099516486be76fa8baffbafda69596)
 2015-08-20 22:19:17 -07:00
Yoyo Zhou 4b3874988f Move DROPBOX_APP_KEY to be read from get_secrets 
(imported from commit 99acd66c4478a0826b0e0ec7bf26c9a59f7febca)
 2015-08-20 21:58:59 -07:00
Yoyo Zhou ef320c6e95 Remove Redis remote authentication feature. 
We can add it back later but for now we can just stick with localhost
since that's what most people will want.

(imported from commit c5fe524282219dc62a0670f569c0cb6af04be339)
 2015-08-20 21:58:59 -07:00
Yoyo Zhou e41c00107d Move twitter secret keys to use get_secrets in settings.py 
(imported from commit cc21265ae64a49be20bec74386314d60ee822746)
 2015-08-20 21:58:59 -07:00
Yoyo Zhou 32f6d1055d Get s3_key and s3_secret_key from secrets in settings.py. 
(imported from commit 2c2574988486bbb6f0f769250664a5a2a4c9e6c9)
 2015-08-20 21:58:51 -07:00
Yoyo Zhou d34d44e1d4 Read ANDROID_GCM_API_KEY from secrets; move to settings.py 
(imported from commit 0d0d59116065956b9cbbe895eb09f0433b752cf1)
 2015-08-20 21:54:55 -07:00
Yoyo Zhou 2cab113035 Rename getsecret -> get_secret and remove duplicate secret-reading code in settings.py 
(imported from commit 097d6b4fad1fcf8b6f09dc212056fdb313efe5e4)
 2015-08-20 21:52:26 -07:00
Tim Abbott 58e5c654fa Make feedback button option default-off. 
(imported from commit 23b89ab72bd04826016631e01da950af0a5df694)
 2015-08-20 19:47:00 -07:00
David Roe 13f3b448e5 Kill Embed.ly integration. 
(imported from commit dfe42a26e57100108c3c50298041bd520e0d8b1b)
 2015-08-20 19:46:48 -07:00
Anders Kaseorg bded0d9d54 Remove corporate beta signup form 
(imported from commit 1b3a0cd8a59a124905fa4cbd3121a78d23aeb3a2)
 2015-08-20 18:40:34 -07:00
Tim Abbott e79447131f Make build-enterprise-tarball run again. 
(imported from commit e3dd8d75811458d0cee8a2d05a4b47abd6eda7fd)
 2015-08-20 17:33:16 -07:00
acrefoot 0a6bb975c3 Replace settings.OG_ZULIPER_EMAILS with database lookups 
Also renames the OG_ZULIPER_EMAILS to CROSS_REALM_BOT_EMAILS

(imported from commit a9e0ccebbd6b37376e535600670ad493dc8de7e1)
 2015-08-20 17:20:41 -07:00
Cat Miller 0a20f168a7 Auto-generate dev-secrets file. 
Source LOCAL_DATABASE_PASSWORD and INITIAL_PASSWORD_SALT from the secrets file.
Fix the creation of pgpass file.

Tim's note: This will definitely break the original purpose of the
tool but it should be pretty easy to add that back as an option.

(imported from commit 8ab31ea2b7cbc80a4ad2e843a2529313fad8f5cf)
 2015-08-20 00:20:44 -07:00
Tim Abbott 7cffb41e13 Reorganize and document settings.py. 
(imported from commit e2694979d5aee95c22b83b7aa84d80b56ffae1d6)
 2015-08-18 20:57:35 -07:00
Tim Abbott 5b8894cd25 Rename USING_SSO to something more clear. 
(imported from commit 94e8ae84b01419783872a5d09bafe5c2eb933c18)
 2015-08-18 20:48:15 -07:00
Tim Abbott 05b0cbb36a Zulip doesn't use MEDIA_URL. 
(imported from commit ebc370d9c5cf2d7e7d366cbb25fe721c817f212e)
 2015-08-18 20:48:15 -07:00
Tim Abbott dcc3b3fe37 Don't create Zulip employee accounts automatically in Dev VM. 
(imported from commit 378f12d3f2ac4c131919c0efbd049b9eaa961694)
 2015-08-18 20:46:35 -07:00
Tim Abbott 2de3e2ebdd Move several secrets to using the get_secret function in settings.py. 
(imported from commit 08fb828265c4a9e35294a51c0901bd5ad3990344)
 2015-08-18 20:17:48 -07:00
Tim Abbott 8c88746912 Move iOS App IDs to settings.py since it's needed to run the app. 
(imported from commit 891e32ffa82430487fc333fa549ee465f0d018c0)
 2015-08-18 20:17:48 -07:00
Tim Abbott 43c7ff64d1 Remove unused FULL_NAVBAR configuration setting. 
(imported from commit 47c3be669f7ba44426301a46e3f54054f3e2440b)
 2015-08-18 20:17:48 -07:00