From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 11 Apr 2019 02:43:55 +0000 (+1000)
Subject: FEATURE: brotli support is not conditional
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=77edaf675a47729bb693d09b94713a2a98b5d686;p=discourse_docker.git

FEATURE: brotli support is not conditional

Due to changes in the core (backported to stable) all brotli support
is unconditional.

No need to carry any special logic here.
---

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index a668fc4..6e82084 100644
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -4,7 +4,6 @@ FROM ubuntu:16.04
 
 ENV PG_MAJOR 10
 ENV RUBY_ALLOCATOR /usr/lib/libjemalloc.so.1
-ENV COMPRESS_BROTLI 1
 
 #LABEL maintainer="Sam Saffron \"https://twitter.com/samsaffron\""
 
diff --git a/templates/web.template.yml b/templates/web.template.yml
index ceb701c..be590b1 100644
--- a/templates/web.template.yml
+++ b/templates/web.template.yml
@@ -49,13 +49,6 @@ run:
         # find DISCOURSE_ env vars, strip the leader, lowercase the key
         /usr/local/bin/ruby -e 'ENV.each{|k,v| puts "#{$1.downcase} = '\''#{v}'\''" if k =~ /^DISCOURSE_(.*)/}' > $conf
 
-  - file:
-     path: /etc/runit/1.d/enable-brotli
-     chmod: "+x"
-     contents: |
-        #!/bin/bash
-        [ ! -z "$COMPRESS_BROTLI" ] && sed -i "s/. brotli/  brotli/" /etc/nginx/conf.d/discourse.conf || sed -i "s/. brotli/# brotli/" /etc/nginx/conf.d/discourse.conf
-
   - file:
      path: /etc/service/unicorn/run
      chmod: "+x"