Commit Graph

7304 Commits

Author SHA1 Message Date
Leo Franchi 691c861c85 Guard against creating a realm that is already an alias to another realm
(imported from commit 365c79148a1a3af190d2eab449d735525554657b)
2013-11-13 14:17:44 -05:00
Leo Franchi 62ba16a829 [schema] Allow a realm to have aliases for multiple other domains
(imported from commit 5d0340afd4c77f50db63550a3ec8d81e885c285c)
2013-11-13 14:17:43 -05:00
Steve Howell 761c0a0266 Support !avatar syntax in bugdown.
(imported from commit 72551c5df96f5b383d3593c9618cc82413d5d95d)
2013-11-13 13:45:09 -05:00
Steve Howell 2086ee8979 Rename Gravatar class to Avatar in bugdown.
(imported from commit 97f1fb52f2582694f5ba43c24649fc58152d3486)
2013-11-13 13:45:09 -05:00
Steve Howell 2d5a19ad1b Have !gravatar markdown serve up /avatar/<email>.
The !gravatar markdown no longer hard codes to Gravatar, but
instead it serves up our generic avatar URL.

(imported from commit 4e3e2baeb3374bcf025a18ff27a8452b975c22b7)
2013-11-13 13:45:08 -05:00
Steve Howell 2238807e59 Add /avatar/<email> URL.
The /avatar/<email> URL redirects to the appropriate
avatar URL for an email, whether it's hosted by Gravatar
or Zulip.  (This will work even for external users, as
it falls through to Gravatar.)

(imported from commit 7e6f226659cb2e5a7f6426da0be8aa9bae9cff14)
2013-11-13 13:45:08 -05:00
Luke Faraone 6c57a9ec26 Hide 'redefinition of unused' pyflakes errors
(imported from commit d5c0129c40121f8bca8f2ebedde8fcbf03d718f2)
2013-11-13 13:44:14 -05:00
Tim Abbott 79ef54d6fa Fix remote_user_to_email argument.
(imported from commit f3a7fbf071cd7da1a4d55c6842207a054412feb3)
2013-11-13 12:07:16 -05:00
Tim Abbott 1eca4027fa Support filling memcached caches with no messages.
(imported from commit 3dfcdce60f84bfa99820a52b74c637ad849930a8)
2013-11-13 12:07:16 -05:00
Tim Abbott 7d61a57822 Change HOME_NOT_LOGGED_IN if SSO is the only auth enabled.
(imported from commit a6b41a83d53ac1a87547f005c26ea970fe7508f6)
2013-11-13 12:07:15 -05:00
Tim Abbott 2fff9f94ab Fix example configuration for ZulipRemoteUserBackend.
(imported from commit 9f78901d24fc88dc149af5d4db23b24e9b9859fd)
2013-11-13 12:07:15 -05:00
Tim Abbott 4cb50d8f3b Fix class name for apache_sso.pp.
(imported from commit 25daa2d98a88866824203f2e7016a12b9f91a32b)
2013-11-13 12:07:15 -05:00
Tim Abbott 47682d47c9 Move our apache2site library into the public manifest.
(imported from commit 8cb6d0a01fc286ad1a98a7e2d27a80293667e9b8)
2013-11-13 12:07:15 -05:00
Tim Abbott b4ace85d3a Make sure everything under /home/zulip is owned by zulip.
(imported from commit f6c8b6c0a6dc8b7ada79cb4951818f06faa873e7)
2013-11-13 12:07:15 -05:00
Tim Abbott 729f7460d4 Reorganize local_settings_template to put mandatory fields near top.
(imported from commit b5d447962a5e7c008e9aba44388f244359520fb4)
2013-11-13 12:02:50 -05:00
Tim Abbott 0299964051 Make the Zulip user able to edit settings.py.
(imported from commit c69ff2b2e9f176ae2e78b76a7b022e00d09e7c00)
2013-11-13 12:02:50 -05:00
Tim Abbott 6bcd5a7ffc Update installation instructions to include configuring the app.
(imported from commit 89395815c32416ec0636efcff12eb76f5d890bbd)
2013-11-13 12:02:50 -05:00
Tim Abbott e877536de5 process_fts_updates: Use peer authentication.
(imported from commit 329ec3c07c9cfb648c706e01aec7e8826c3f7737)
2013-11-13 12:02:50 -05:00
Tim Abbott 6aaa2b1a24 Create the zulip database owned by zulip.
(imported from commit cc6e895d9e97bdd9d084c7b1a7204bd5b7ae5cd8)
2013-11-13 12:02:50 -05:00
Tim Abbott 939cd864eb Fix postgres configuration to use local socket.
(imported from commit 1835e712b2fe4578cf6381891844bb3abe2b767e)
2013-11-13 12:02:50 -05:00
Tim Abbott 0ec8a7a2f1 install: Make sure we own everything under /var/log/zulip
supervisord may start up during the install process and do a bunch of
incorrect stuff, with the net effect of creating files in there owned
by root.

(imported from commit 28379af9680bf9d3c72da196f329abdf8c82c6be)
2013-11-13 12:02:50 -05:00
Tim Abbott a6af391125 Remove dependency on python-argparse -- it isn't need with Python 2.7.
(imported from commit 388f6a5b7ff2b20364d22fad0d9e7d992791a18b)
2013-11-13 12:02:50 -05:00
Tim Abbott e986f1e988 puppet: Don't create /home/zulip/deployments/current symlink.
This is now managed on enterprise systems via the unpack-tarball
system.

(imported from commit 8cc4ac0b47990ed1d5a02113a27bd126f4e3f011)
2013-11-13 12:02:50 -05:00
Tim Abbott b2d4883165 postgres-init-db: Split into internal and external versions for now.
(imported from commit 3516b1377e5914dac2b504961922ef8d08148d1f)
2013-11-13 12:02:50 -05:00
Tim Abbott f4a9e99498 puppet: Move the postgres dictionary symlink creation to puppet.
(imported from commit 823f6683e3d8f3604da68e55dd6761ecb38d4b63)
2013-11-13 12:02:50 -05:00
Tim Abbott 45f21cbb14 Setup the database after the Zulip user is fully setup.
Otherwise we may run into permissions issues.

(imported from commit a8013c84796d16146336c2809dcd8cd935b43a7b)
2013-11-13 12:02:50 -05:00
Tim Abbott e1a8f511fe configure-rabbittmq: Make it work if you run it a second time.
This is to make it easier to just run the install script again if it
fails.

(imported from commit 65deb9d001e061d58deecd44c4683231de76dc79)
2013-11-13 12:02:50 -05:00
Tim Abbott 9b9c43fd50 Fix paths to nginx configuration for zulip-enterprise.
(imported from commit 4c0ec7ac752d2f4810fe089b85f733c7c21a1676)
2013-11-13 12:02:49 -05:00
Tim Abbott 5e0433009f Add enterprise apt repository to puppet.
(imported from commit e68964089adbd81580cdee6dfc2ee61e31835ce7)
2013-11-13 12:02:49 -05:00
Tim Abbott 4bf9594750 puppet: Fix dependency on postgres in enterprise.pp.
(imported from commit 09baae1a0d6adc86124a1518b14ff28ef71db6ca)
2013-11-13 12:02:49 -05:00
Luke Faraone a7237938c8 Set FEEDBACK_TARGET for enterprise case.
(imported from commit 478033bf3eefb8406d93fb2f0225420812dee7b0)
2013-11-13 12:02:49 -05:00
Tim Abbott cb9931110f Automatically configure EMAIL_GATEWAY_BOT as a superuser.
(imported from commit 1e74ae458e446edec59eb1ab238cede969c4dbbc)
2013-11-13 12:02:49 -05:00
Tim Abbott e18a08c69e settings: Move hardcoded API super users into local_settings.py.
(imported from commit fea7550a771c837db0fb948238488f778bedf73a)
2013-11-13 12:02:49 -05:00
Tim Abbott 155d50f0cb Apply sysctls before restarting postgres.
(imported from commit bc1f1ce1b880962640b8ed5f516139eaf91cb1db)
2013-11-13 12:02:02 -05:00
Zev Benjamin b4403fda43 enterprise: Generate a 40-postgresql.conf sysctl file
(imported from commit ec64d283f88d1b2f4b13e3405d39cfbe8400adc7)
2013-11-13 12:02:02 -05:00
Zev Benjamin c1bdb0c7a8 puppet: Move the removal of 30-postgresql-shm.conf into zulip::postgres_appdb
(imported from commit 6a4d089fd47a8ba6ea92eeac321e3077fa0d8cc4)
2013-11-13 12:02:01 -05:00
Zev Benjamin cf7c468e74 enterprise: Specify half the system memory for pgtune
(imported from commit 287acb1eb7b03dddd60045c43e04af1fe61f354b)
2013-11-13 12:02:01 -05:00
Leo Franchi 300cceb3e4 Create feedback bot in enterprise installs
(imported from commit 0c0a6919bd29e12484d520f80789b39b203099b0)
2013-11-13 11:18:03 -05:00
Leo Franchi 6274c33f86 Allow disabling of feedback system in UI
(imported from commit ce16b2916784e9cf10a230cb47515ffc65888778)
2013-11-13 11:18:02 -05:00
Jeff Arnold cf33d1c512 /terms-enterprise update: We prefer Massachusetts.
(imported from commit a3c889293566865b6d06844b84e97d9376596f2b)
2013-11-13 10:51:51 -05:00
Tim Abbott 09b4a2a180 Exclude some additional directories from enterprise tarballs.
(imported from commit 983f1095e9a247d139a0ba690992f78cc21e4d4c)
2013-11-12 23:21:53 -05:00
Tim Abbott 317a6f308f Fix missing dependency on python-mock.
(imported from commit e82be819a7dd0f7c8683e7efc0a5095b9844b159)
2013-11-12 23:21:52 -05:00
Leo Franchi 306ce65ea3 Only create initial passwords for local dev setups
(imported from commit 2ef33ebbab0fe21486acbb1a3a78ed434abac2db)
2013-11-12 22:42:05 -05:00
Leo Franchi d7b823f017 Point email mirror to staging for zulip.com in non-localserver, and prod otherwise
(imported from commit 3076df1e68e0200af06b79a8cdeb9822bbf4c10c)
2013-11-12 22:22:13 -05:00
Waseem Daher eaec0e0774 Better, retina-ready phone screenshots for /apps (though still not great).
(imported from commit 7a4a1fc0a203713eb83f75324f26abf8f890a37b)
2013-11-12 21:58:32 -05:00
Steve Howell 0fe751425a Always enable SlowQueryWorker.
(imported from commit 05aa98d60c34e95df0b41fe9d25d909fea547ddc)
2013-11-12 20:19:42 -05:00
Steve Howell e93215693a Always drain the slow_queries queue.
(imported from commit e11c25116529fb402d82d349a67fb1dfc40f510c)
2013-11-12 20:19:42 -05:00
Steve Howell cf79e77347 Extract process_one_batch() in SlowQueryWorker.
By extracting the function, we eliminate a redundant sleep
call.

(imported from commit 24d4485019f96ae10e9a00244643b77ff2a7db57)
2013-11-12 20:10:23 -05:00
Tim Abbott 5f655088ef Fix ~/.gitattributes syntax.
For git that's not between version 1.8.1.1 and 1.8.1.6, the previous
version did not actually exclude those things from the tarballs on
some git versions, due to changes in the syntax for that file that
were made in 1.8.1.1 and reverted in 1.8.1.6.

Kevin's also adding a check that we're not including any of the files
intended to be excluded here.

(imported from commit 503ec24ed8db4cc32c29bdf5a361e5013a02b995)
2013-11-12 19:34:30 -05:00
Luke Faraone aac6ee308d puppet: apache configuration for an example SSO instance.
(imported from commit 0aa6c80e206a70efd481d710aa2a6c2431c662f3)
2013-11-12 19:18:35 -05:00