paulmataruso/docker-zulip
1
0
Fork 0
mirror of https://github.com/zulip/docker-zulip.git synced 2025-11-04 14:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

resurrect DISABLE_HTTPS option

Browse Source 
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.
This commit is contained in:
Bryan Larsen
2018-04-20 18:16:00 +00:00
parent 1b4cedf36b
commit 0a5522f64d
3 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@@ -41,6 +41,7 @@ RUN echo 'APT::Install-Recommends 0;' >> /etc/apt/apt.conf.d/01norecommends && \
COPY includes/createZulipRealm.sh /opt/createZulipRealm.sh COPY includes/createZulipRealm.sh /opt/createZulipRealm.sh
COPY entrypoint.sh /sbin/entrypoint.sh COPY entrypoint.sh /sbin/entrypoint.sh
ADD setup_files/ /opt/files
RUN chown zulip:zulip /opt/createZulipRealm.sh RUN chown zulip:zulip /opt/createZulipRealm.sh

5
entrypoint.sh
View File

@@ -34,6 +34,7 @@ if [ -z "$SETTING_MEMCACHED_LOCATION" ]; then
SETTING_MEMCACHED_LOCATION="127.0.0.1:11211" SETTING_MEMCACHED_LOCATION="127.0.0.1:11211"
fi fi
# Nginx settings # Nginx settings
DISABLE_HTTPS="${DISABLE_HTTPS:-false}"
NGINX_WORKERS="${NGINX_WORKERS:-2}" NGINX_WORKERS="${NGINX_WORKERS:-2}"
NGINX_PROXY_BUFFERING="${NGINX_PROXY_BUFFERING:-off}" NGINX_PROXY_BUFFERING="${NGINX_PROXY_BUFFERING:-off}"
NGINX_MAX_UPLOAD_SIZE="${NGINX_MAX_UPLOAD_SIZE:-24m}" NGINX_MAX_UPLOAD_SIZE="${NGINX_MAX_UPLOAD_SIZE:-24m}"
@@ -151,6 +152,10 @@ setConfigurationValue() {
} }
nginxConfiguration() { nginxConfiguration() {
echo "Executing nginx configuration ..." echo "Executing nginx configuration ..."
if [ "$DISABLE_HTTPS" == "True" ] || [ "$DISABLE_HTTPS" == "true" ]; then
echo "Disabling https in nginx."
mv -f /opt/files/nginx/zulip-enterprise-http /etc/nginx/sites-enabled/zulip-enterprise
fi
sed -i "s/worker_processes .*/worker_processes $NGINX_WORKERS;/g" /etc/nginx/nginx.conf sed -i "s/worker_processes .*/worker_processes $NGINX_WORKERS;/g" /etc/nginx/nginx.conf
sed -i "s/client_max_body_size .*/client_max_body_size $NGINX_MAX_UPLOAD_SIZE;/g" /etc/nginx/nginx.conf sed -i "s/client_max_body_size .*/client_max_body_size $NGINX_MAX_UPLOAD_SIZE;/g" /etc/nginx/nginx.conf
sed -i "s/proxy_buffering .*/proxy_buffering $NGINX_PROXY_BUFFERING;/g" /etc/nginx/zulip-include/proxy_longpolling sed -i "s/proxy_buffering .*/proxy_buffering $NGINX_PROXY_BUFFERING;/g" /etc/nginx/zulip-include/proxy_longpolling

22
setup_files/nginx/zulip-enterprise-http Normal file
View File

@@ -0,0 +1,22 @@
include /etc/nginx/zulip-include/upstreams;
server {
listen 80;
location /user_avatars {
add_header X-Content-Type-Options nosniff;
add_header Content-Security-Policy "default-src 'none' img-src 'self'";
include /etc/nginx/zulip-include/uploads.types;
alias /home/zulip/uploads/avatars;
}
location /local-static {
alias /home/zulip/local-static;
}
include /etc/nginx/zulip-include/certbot;
include /etc/nginx/zulip-include/app;
include /etc/nginx/zulip-include/uploads.route;
}