From: Matt Palmer <mpalmer@hezmatt.org>
Date: Fri, 30 Oct 2015 21:56:33 +0000 (+1100)
Subject: Fix broken syntax in cloudflare template
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cd384d4f6d9cff52b47f19a9b4cbf0c65e203d62;p=discourse_docker.git

Fix broken syntax in cloudflare template

My assumption is that CF used to send their IP list without a trailing
newline, and they've recently fixed that, causing riking's hack to emit an
*extra* newline, which caused the reported problem.
---

diff --git a/templates/cloudflare.template.yml b/templates/cloudflare.template.yml
index 6d5e953..df8a00d 100644
--- a/templates/cloudflare.template.yml
+++ b/templates/cloudflare.template.yml
@@ -6,7 +6,6 @@ run:
         #!/bin/bash -e
         # Download list of CloudFlare ips
         wget https://www.cloudflare.com/ips-v4 -O - > /tmp/cloudflare-ips
-        echo >> /tmp/cloudflare-ips
         wget https://www.cloudflare.com/ips-v6 -O - >> /tmp/cloudflare-ips
         # Make into nginx commands and escape for inclusion into sed append command
         CONTENTS=$(</tmp/cloudflare-ips sed 's/^/set_real_ip_from /' | sed 's/$/;/' | tr '\n' '\\' | sed 's/\\/\\n/g')