Alexander Trost
|
5b09039c2a
|
Merge branch 'master' of git://github.com/cmcneil/docker-zulip into dev
|
2015-10-22 22:43:42 +02:00 |
|
Alexander Trost
|
0a5e969daa
|
Added the current "namespace" to all log messages
|
2015-10-22 22:43:18 +02:00 |
|
Alexander Trost
|
03bd0d8fff
|
Fixed the IRC link
1.3.7
|
2015-10-22 20:15:02 +02:00 |
|
Alexander Trost
|
7f59156d08
|
Merge branch 'dev'
|
2015-10-22 20:07:37 +02:00 |
|
Carson McNeil
|
33d17c586e
|
Fix a broken link
Got copied from the wiki with a relative path.
|
2015-10-22 10:47:03 -07:00 |
|
Alexander Trost
|
f07669881e
|
Changed some output messages to be a bit more meaningful
|
2015-10-22 19:39:24 +02:00 |
|
Carson McNeil
|
d3facb40ad
|
Merge pull request #1 from Galexrt/master
Catching up with master
|
2015-10-22 09:56:56 -07:00 |
|
Alexander Trost
|
8a2e642fc2
|
Merge branch 'dev'
|
2015-10-22 18:49:24 +02:00 |
|
Alexander Trost
|
3818a5a3ee
|
Set default value for env var ZULIP_AUTO_GENERATE_CERTS
|
2015-10-22 18:48:33 +02:00 |
|
Alexander Trost
|
80b5405caa
|
Merge branch 'dev'
|
2015-10-22 18:33:35 +02:00 |
|
Alexander Trost
|
8a5aeb8011
|
Fixes to the entrypoint.sh
|
2015-10-22 17:53:57 +02:00 |
|
Alexander Trost
|
c3dbdfd0cf
|
Added docker pull ...:dev to README.md
|
2015-10-22 17:21:01 +02:00 |
|
Alexander Trost
|
3adf602d09
|
Removed uneeded variable from entrypoint.sh
|
2015-10-22 16:42:34 +02:00 |
|
Alexander Trost
|
573bbee657
|
This fixes the change to zproject/settings.py
|
2015-10-22 16:36:35 +02:00 |
|
Alexander Trost
|
d116b77945
|
Added check for True or False in case for SET_SETTINGS
|
2015-10-22 16:10:46 +02:00 |
|
Alexander Trost
|
347d819464
|
Fixes the setupZulipUser.sh script #26
|
2015-10-22 15:58:37 +02:00 |
|
Alexander Trost
|
59fb721747
|
We now link /etc/zulip/settings.py to /data/zulip-settings.py
|
2015-10-22 15:27:32 +02:00 |
|
Alexander Trost
|
5f3ff5f0a9
|
Fixed a problem with the process_fts_updates script
|
2015-10-22 14:41:32 +02:00 |
|
Alexander Trost
|
e54a1cd654
|
Merge branch 'dev'
|
2015-10-22 14:22:40 +02:00 |
|
Alexander Trost
|
24f759cf7d
|
Replaced the MAILTO=root with MAILTO=""
No emails should be sent by cron
|
2015-10-22 13:40:20 +02:00 |
|
Alexander Trost
|
b473edfa55
|
Fixed the ZULIP_AUTH_BACKENDS env var in the deployment files
|
2015-10-22 13:12:07 +02:00 |
|
Alexander Trost
|
ef884a23ae
|
Merge branch 'dev'
|
2015-10-22 12:00:33 +02:00 |
|
Alexander Trost
|
3fe93c1896
|
Added IRC channel to README.md
|
2015-10-22 11:56:37 +02:00 |
|
Alexander Trost
|
4abce26618
|
Merge branch 'dev'
|
2015-10-22 11:11:50 +02:00 |
|
Alexander Trost
|
35cd4cd6ae
|
Added better README.md
|
2015-10-22 11:11:12 +02:00 |
|
Alexander Trost
|
254d643b44
|
Hotfix for static set ZULIP_AUTH_BACKENDS
|
2015-10-22 10:32:21 +02:00 |
|
Alexander Trost
|
84e7e91fc8
|
Changed the behaviour of ZULIP_AUTH_BACKENDS
ZULIP_AUTH_BACKENDS is now a comma seperated list with authentication backends
|
2015-10-22 10:22:55 +02:00 |
|
Alexander Trost
|
113b7d12c6
|
Cleaned up some functions
Added #24
|
2015-10-22 08:41:54 +02:00 |
|
Alexander Trost
|
63b8c6821c
|
Merge current Dev Zulip version 1.3.7 changes to master #20
|
2015-10-22 00:49:55 +02:00 |
|
Alexander Trost
|
b5cf042dbe
|
Fixed wrong var here
The script isn't working currently, I'll fix this in another commit
|
2015-10-22 00:48:57 +02:00 |
|
Alexander Trost
|
7ec534f69e
|
export of the ZULIP_USER_* env vars is needed in order for the user create script to function properply
|
2015-10-22 00:04:07 +02:00 |
|
Alexander Trost
|
4c7efdacb4
|
Changed AUTH_BACKEND_VAR to AUTH_BACKEND_KEY
|
2015-10-21 23:24:08 +02:00 |
|
Alexander Trost
|
e2b9dcef67
|
Fix for ZULIP_AUTH_BACKENDS_* settings
|
2015-10-21 23:23:08 +02:00 |
|
Alexander Trost
|
2478b5e948
|
More fixes for the env var setup
|
2015-10-21 22:33:18 +02:00 |
|
Alexander Trost
|
192793cf36
|
Several fixes for wrongly replaced env vars
|
2015-10-21 22:24:15 +02:00 |
|
Alexander Trost
|
8d356c343e
|
Added node argument to rabbitmqctl commands
|
2015-10-21 22:11:39 +02:00 |
|
Alexander Trost
|
cd8d6c89bf
|
Added RABBITMQ_PASS to docker-compose.yml
|
2015-10-21 21:41:10 +02:00 |
|
Alexander Trost
|
f2f5d1b871
|
Change RABBITMQ_PASSWORD settings var already in rabbitmq setup
|
2015-10-21 21:38:25 +02:00 |
|
Alexander Trost
|
edd5788cdd
|
This should fix the problems with rabbitmq (+ rabbitmq setup)
|
2015-10-21 21:30:24 +02:00 |
|
Carson McNeil
|
d50e49b876
|
Added -d flag to docker run commands in script. This is necessary because otherwise the bash script wont run the next line while the first container is still up.
|
2015-10-21 11:01:06 -07:00 |
|
Alexander Trost
|
70a6f43c20
|
Merge branch 'master' into dev
|
2015-10-21 19:30:46 +02:00 |
|
Alexander Trost
|
54c4f01c8b
|
Merge branch 'cmcneil-master'
|
2015-10-21 19:23:37 +02:00 |
|
Alexander Trost
|
1c983b88f2
|
Removed the dot from .zulip-secrets.conf
|
2015-10-21 18:09:18 +02:00 |
|
Alexander Trost
|
24baabd3cf
|
This could fix the errors appearing in dev branch
|
2015-10-21 16:41:57 +02:00 |
|
Alexander Trost
|
08324662c5
|
Expect exitcode 200 from zulip_postsetup script so we know everythings okay
|
2015-10-21 15:47:12 +02:00 |
|
Alexander Trost
|
0be186ca11
|
Added some comments for documentation purpose
|
2015-10-21 15:32:12 +02:00 |
|
Alexander Trost
|
e31ae82235
|
Changed the *_PORT vars to *_HOST_PORT
Docker creates them by default, so we change this up
|
2015-10-21 15:23:55 +02:00 |
|
Alexander Trost
|
0dc25e2bc9
|
Fixes to the old veresion env vars
|
2015-10-21 15:06:18 +02:00 |
|
Alexander Trost
|
a6ca3a24cd
|
Moved most env vars from Dockerfile to entrpoint.sh
A little bit of clean up for other versions of Zulip
|
2015-10-21 14:56:30 +02:00 |
|
Alexander Trost
|
ca3eeec66b
|
Clean up the env vars
Fixed the checksum fail during build.
|
2015-10-21 14:47:46 +02:00 |
|