From 66e6e2d366eaf45c65b230418a6ce95479f806b6 Mon Sep 17 00:00:00 2001
From: VibroAxe <vibs@macrolevel.co.uk>
Date: Sun, 2 Dec 2018 16:27:23 +0000
Subject: [PATCH] Updated readying for steamcache/generic 2

---
 Dockerfile                                              | 2 --
 overlay/etc/nginx/conf.d/{20_maps.conf => 30_maps.conf} | 0
 overlay/hooks/entrypoint-pre.d/15_generate_maps.sh      | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)
 rename overlay/etc/nginx/conf.d/{20_maps.conf => 30_maps.conf} (100%)

diff --git a/Dockerfile b/Dockerfile
index 3b03157..4938e93 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
 FROM vibroaxe/generic:supervisord
-#FROM 1and1internet/ubuntu-18-nginx:latest
 MAINTAINER SteamCache.Net Team <team@steamcache.net>
 
 ENV GENERICCACHE_VERSION 2
@@ -25,5 +24,4 @@ RUN mkdir -m 755 -p /data/cachedomains		;\
 VOLUME ["/data/logs", "/data/cache", "/data/cachedomains", "/var/www"]
 
 EXPOSE 80
-
 WORKDIR /scripts
diff --git a/overlay/etc/nginx/conf.d/20_maps.conf b/overlay/etc/nginx/conf.d/30_maps.conf
similarity index 100%
rename from overlay/etc/nginx/conf.d/20_maps.conf
rename to overlay/etc/nginx/conf.d/30_maps.conf
diff --git a/overlay/hooks/entrypoint-pre.d/15_generate_maps.sh b/overlay/hooks/entrypoint-pre.d/15_generate_maps.sh
index 9a53617..d8a8b08 100644
--- a/overlay/hooks/entrypoint-pre.d/15_generate_maps.sh
+++ b/overlay/hooks/entrypoint-pre.d/15_generate_maps.sh
@@ -27,5 +27,5 @@ jq -r '.cache_domains | to_entries[] | .key' cache_domains.json | while read CAC
 done
 echo "}" >> $OUTPUTFILE
 cat $OUTPUTFILE
-cp $OUTPUTFILE /etc/nginx/conf.d/20_maps.conf
+cp $OUTPUTFILE /etc/nginx/conf.d/30_maps.conf
 rm -rf $TEMP_PATH