From 3eaef976cf424fa31fad8843836021a157a92c69 Mon Sep 17 00:00:00 2001
From: Peter-Jan Brone <peter-jan@settlemint.com>
Date: Wed, 25 Nov 2020 17:26:44 +0100
Subject: [PATCH] Revert wildcard include (#540)

* Revert wildcard include

* Revert gitignore
---
 .gitignore                                                      | 2 --
 docker/nginx/conf.d/client.conf                                 | 2 +-
 .../nginx/conf.d/include/{ratelimited/example => ratelimited}   | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)
 rename docker/nginx/conf.d/include/{ratelimited/example => ratelimited} (79%)

diff --git a/.gitignore b/.gitignore
index d6ca2d86..6b1aa7a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,8 +74,6 @@ packages/webapp/cypress/videos
 
 # Docker data
 docker/data
-docker/nginx/conf.d/include/ratelimited/*
-!docker/nginx/conf.d/include/ratelimited/example
 
 # Docker override
 docker-compose.override.yml
diff --git a/docker/nginx/conf.d/client.conf b/docker/nginx/conf.d/client.conf
index 1c76e673..fa3e165e 100644
--- a/docker/nginx/conf.d/client.conf
+++ b/docker/nginx/conf.d/client.conf
@@ -3,7 +3,7 @@ proxy_cache_path /data/nginx/cache levels=1:2 keys_zone=skynet:10m max_size=10g
 # ratelimit specified IPs
 geo $limit {
 	default 0;
-	include /etc/nginx/conf.d/include/ratelimited/*;
+	include /etc/nginx/conf.d/include/ratelimited;
 }
 map $limit $limit_key {
 	0 "";
diff --git a/docker/nginx/conf.d/include/ratelimited/example b/docker/nginx/conf.d/include/ratelimited
similarity index 79%
rename from docker/nginx/conf.d/include/ratelimited/example
rename to docker/nginx/conf.d/include/ratelimited
index 31fc4c5a..3e5b5c00 100644
--- a/docker/nginx/conf.d/include/ratelimited/example
+++ b/docker/nginx/conf.d/include/ratelimited
@@ -1,6 +1,4 @@
 # Add a list of IPs here that should be severely rate limited on upload.
-# Every file in this directory will be included.
-#
 # Note that it is possible to add IP ranges as well as the full IP address.
 #
 # Examples: