Commit Graph

237 Commits

Author SHA1 Message Date
Anders Kaseorg
c8f5aa264d Run generate_secrets.py unconditionally.
We may need to populate newly added secrets when upgrading Zulip.

Fixes #163.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-12-04 13:21:51 -08:00
Tim Abbott
a1ff3938ca entrypoint: Initialize settings.py files with the template.
This fixes a bug introduced in
62bf74190b, where the template
settings.py content wasn't being put in place properly.

The previous model meant that if the user exported the settings.py
file to the data directory, we'd end up appending various versions of
the users' configuration to it over time.

While those users should have been using the MANUAL_CONFIGURATION
setting, this at least is a much cleaner model for managing configuration.

Fixes #130.
Fixes #153.
Fixes #155.
2018-08-31 11:45:23 -07:00
Tim Abbott
f874136af1 entrypoint: Remove references to ZULIP_AUTO_GENERATE_CERTS. 2018-08-23 13:30:42 -07:00
Tim Abbott
1190873d0f entrypoint: Remove unnecessary directory creation logging. 2018-08-23 13:16:56 -07:00
Tim Abbott
f61b48b96f entrypoint: Remove obsolete RabbitMQ configuration.
The ignore option was removed a long time ago, and the settings style
variable for RabbitMQ is very old backwards-compatibility code that is
no longer needed.
2018-08-23 13:09:28 -07:00
Tim Abbott
78480d4de5 secrets: Use crudini to edit secrets file.
Using an actual tool designed to do this is a lot more robust and
fixes some nasty escaping issues involving secrets containing `~` that
were reported in #143.
2018-08-23 12:53:21 -07:00
Tim Abbott
081e64c46e entrypoint: Use extended globbing for integer detection.
This fixes #150, and should eliminate the possibility for future bugs
in the same vein.

I still want to eliminate this whole type-detection system, but that's
for future work.
2018-08-13 15:40:05 -07:00
jeaye
3b5d63b9ba setup: Add certbot support.
The task is to generate a self-signed cert so Zulip can be started, then
to wait until Zulip is up before using certbot to generate new certs.
Zulip needs to be up so it can meet certbot's challenge. Using a deploy
hook, certs are persisted in the data directory. The same applies to
renewal.

Tweaked by tabbott mostly to edit comments remove an unnecessary
setting before merging.

Fixes #120.
2018-07-23 22:29:10 -07:00
Sampriti Panda
d3c32ab0c1 Remove setup_files/ and related code from docker-compose.
This removes the fork of the core Zulip nginx configuration file that
we were maintaining in the docker-zulip project; doing so improves the
maintainability of this project for the future, since we don't need to
check on every Zulip upgrade whether we've made any changes to the
`nginx` package in zulip/zulip.

The only feature we were using that for was the DISABLE_HTTPS setting
in docker-zulip, and it's now possible to do that by editing
zulip.conf instead.

Fixes #114.
2018-07-10 12:22:41 +05:30
Sampriti Panda
de7b59b352 entrypoint: Add call to zulip-puppet-apply for nginx config.
First, we stop deleting the `puppet` directory, which is important for
being able to run `zulip-puppet-apply` inside the container (super
useful for debugging).

Second, we call this inside the code block for the `nginx` option, in
order to support the `DISABLE_HTTPS` option working without any copied
nginx configuration code in docker-zulip.

See #137 for how we could optimize this away.
2018-07-10 12:20:24 +05:30
Giora Guttsait
283c23fd0b Add AUTH_LDAP_CONNECTION_OPTIONS and organize conditions
fixes #127
2018-07-01 02:24:11 -07:00
Tim Abbott
fad2cf528b entrypoint: Fix writing to settings.py with MANUAL_CONFIGURATION.
The database configuration should not have been running in this
configuration model.
2018-05-31 09:14:26 -07:00
Tim Abbott
2e0d92f6b2 sample configs: Remove some obsolete settings.
These former settings no longer do anything in Zulip.
2018-05-27 17:02:57 -07:00
Tim Abbott
2fe9c43120 entrypoint: Fix typo in path to self-signed cert script. 2018-05-27 17:02:31 -07:00
Tim Abbott
1a1d199d7a entrypoint: Remove useless database options.
These didn't do anything.
2018-05-21 09:37:16 -07:00
Tim Abbott
a4428ce28e postgres: Fix configuration for getting postgres password.
This fixes a regression introduced in 87f6030726.
2018-05-21 09:35:02 -07:00
Tim Abbott
e2243b7707 Rewrite SSL certificate generation to be simpler.
This also adds a hook for where we could eventually add certbot
support.

Fixes #104.
2018-05-21 09:25:39 -07:00
Jason Michalski
906abd4839 Remove empty if block in entrypoint.sh. 2018-05-17 13:19:57 -07:00
Jason Michalski
a97d036a27 Remove ZPROJECT_SETTINGS from entrypoint.sh.
The ZPROJECT_SETTINGS file is part of the Zulip distribution and should
not be edited by administrators instead customizations should be made to
the files in /etc/zulip.
2018-05-17 12:51:58 -07:00
Jason Michalski
0f07e4c97e Remove custom RabbitMQ bootstrapping
The rabbitmq image has support for creating a user and granting the
permissions Zulip requires. This makes the bootstrapRabbitMQ step which
runs in the zulip container redundant so we can remove it. This script
was also the only reverse dependency of rabbitmqctl so rabbitmq-server
can be removed as well.
2018-05-16 15:08:08 -07:00
Jason Michakski
87f6030726 Use zulip/zulip-postgresql for the database
With this change the zulip specific database initialization moves out
of the zulip container and into the database container.
2018-05-16 14:38:39 -07:00
Tully Rankin
7eb93bd263 entrypoint: Fix IP address getting set as integer type instead of string.
The logic in entrypoint.sh was incorrectly detecting IP addresses as
integer type. This causes a syntax error as the IP address gets set in
the production settings file without quotes.
2018-05-15 14:19:58 -07:00
Alexander Trost
08146d4055 Merge pull request #99 from Exocortex/resurrect-DISABLE_HTTPS
resurrect DISABLE_HTTPS option
2018-04-23 20:54:37 +02:00
Bryan Larsen
0a5522f64d resurrect DISABLE_HTTPS option
There used to be a DISABLE_HTTPS setting.   I'm not sure why it was removed, but I need it so I can use Zulip behind a Kubernetes Ingress without causing an infinite redirect.
2018-04-20 18:16:00 +00:00
Bryan Larsen
bf319d5702 allow EMAIL_HOST_USER and EMAIL_HOST_PASSWORD to start with a number 2018-04-20 17:59:19 +00:00
Alexander Trost
d8c08751ab Removed createZulipAdmin script 2017-11-08 12:14:24 +01:00
Alexander Trost
3347412847 Update to Ubuntu Xenial 2017-11-01 22:48:50 +01:00
Alexander Trost
c58f94789c Renamed the entrypoint 2017-04-17 18:26:51 +02:00
Alexander Trost
d3ae865088 Renamed the entrypoint.sh to docker-entrypoint.sh
(To fit in for the official zulip/zulip project)
2016-04-24 10:53:40 +02:00
Alexander Trost
ef6c2242db This fixes a critical bug with the linking of the /etc/zulip folder 2016-04-23 10:51:35 +02:00
Alexander Trost
b3f5727c66 Fixed typo in the secretsConfiguratioFixed typo in the secretsConfigurationn 2016-04-23 10:37:55 +02:00
Alexander Trost
ef8bab71de Added all files from my pr + the modified puppet manifests 2016-03-26 14:14:15 +01:00
Alexander Trost
b3ab5016be Added ZULIP_BRANCH 2016-03-25 12:52:52 +01:00
Alexander Trost
f0e943bf16 Use 1.3.10 version tag 2016-03-25 12:07:32 +01:00
Alexander Trost
5513c80885 Fixed the app:managepy function 2016-03-25 10:03:06 +01:00
Alexander Trost
59cfaedf0d Use the existing configureCerts function 2016-03-21 09:22:43 +01:00
Alexander Trost
3ecd80afbc zulipConfiguration: Insert all vars as a "string" by default 2016-03-15 16:36:53 +01:00
Alexander Trost
6664a31d61 Fixed the LDAP file switch 2016-03-15 16:00:07 +01:00
Alexander Trost
2a354d1c8e Removed the separated LDAP setup cause it's not needed
The "special" LDAP configuration has been moved to the zulipConfiguration function
Ref #62
2016-03-15 13:15:43 +01:00
Alexander Trost
28c3ff1459 Addresses one bug found in #61
'I'm adding exceptions more variables that need to be in another config file then the default confi file (not related to your problem, but should save me some issues later on)' - Galexrt
2016-03-13 13:13:28 +01:00
Alexander Trost
1216f496b4 Switched to master branch cause Zulip v1.3.10 doesn't has my changes in it.... 2016-03-09 17:20:33 +01:00
Alexander Trost
5a48418965 Removed memcached function thingy
Issue #61
2016-03-09 16:00:08 +01:00
Alexander Trost
924925d33a Removed some uneeded vars 2016-03-09 15:55:04 +01:00
Alexander Trost
3341117ad4 Fixed the wrong variable name
Issue #61
2016-03-09 15:14:33 +01:00
Alexander Trost
1c505ef93a Fix for #50 2016-03-09 11:16:24 +01:00
Alexander Trost
07d13143ad Fixed the empty var problem 2016-03-09 10:29:53 +01:00
Alexander Trost
e0bf2b0969 Removed sed on process_fts_updates 2016-03-08 16:44:24 +01:00
Alexander Trost
38f870e29b Fixed a typo 2016-03-07 13:34:39 +01:00
Alexander Trost
e14e908d5e Added my files from the PR to make 1.3.10 version work 2016-03-07 11:04:10 +01:00
Alexander Trost
b1be47c2d6 Added DISABLE_HTTPS env var
See feature #57
2016-02-18 15:20:06 +01:00