Fixed spacing & indents

Dockerfile

@@ -3,6 +3,9 @@ LABEL version=3
 LABEL description="Single caching container for caching game content at LAN parties."
 LABEL maintainer="LanCache.Net Team <team@lancache.net>"
 
+RUN	apt-get update							;\
+	apt-get install -y jq git				;
+
 ENV GENERICCACHE_VERSION=2 \
     CACHE_MODE=monolithic \
     WEBUSER=www-data \
@@ -17,9 +20,6 @@ ENV GENERICCACHE_VERSION=2 \
     CACHE_DOMAINS_BRANCH=master \
     NGINX_WORKER_PROCESSES=auto
 
-RUN	apt-get update							;\
-	apt-get install -y jq git				;
-
 COPY overlay/ /
 
 RUN rm /etc/nginx/sites-enabled/* /etc/nginx/stream-enabled/* ;\
@@ -27,18 +27,17 @@ RUN rm /etc/nginx/sites-enabled/* /etc/nginx/stream-enabled/* ;\
     chmod 754  /var/log/tallylog ; \
     id -u ${WEBUSER} &> /dev/null || adduser --system --home /var/www/ --no-create-home --shell /bin/false --group --disabled-login ${WEBUSER} ;\
     chmod 755 /scripts/*			;\
-	mkdir -m 755 -p /data/cache		;\
+	  mkdir -m 755 -p /data/cache		;\
-	mkdir -m 755 -p /data/info		;\
+	  mkdir -m 755 -p /data/info		;\
-	mkdir -m 755 -p /data/logs		;\
+    mkdir -m 755 -p /data/logs		;\
-	mkdir -m 755 -p /tmp/nginx/		;\
+    mkdir -m 755 -p /tmp/nginx/		;\
-	chown -R ${WEBUSER}:${WEBUSER} /data/	;\
+    chown -R ${WEBUSER}:${WEBUSER} /data/	;\
-	mkdir -p /etc/nginx/sites-enabled	;\
+    mkdir -p /etc/nginx/sites-enabled	;\
-	ln -s /etc/nginx/sites-available/10_cache.conf /etc/nginx/sites-enabled/10_generic.conf; \
+    ln -s /etc/nginx/sites-available/10_cache.conf /etc/nginx/sites-enabled/10_generic.conf; \
-	ln -s /etc/nginx/sites-available/20_upstream.conf /etc/nginx/sites-enabled/20_upstream.conf; \
+    ln -s /etc/nginx/sites-available/20_upstream.conf /etc/nginx/sites-enabled/20_upstream.conf; \
-	ln -s /etc/nginx/stream-available/10_sni.conf /etc/nginx/stream-enabled/10_sni.conf
+    ln -s /etc/nginx/stream-available/10_sni.conf /etc/nginx/stream-enabled/10_sni.conf; \
-
+    mkdir -m 755 -p /data/cachedomains		;\
-RUN mkdir -m 755 -p /data/cachedomains		;\
+    mkdir -m 755 -p /tmp/nginx
-	mkdir -m 755 -p /tmp/nginx
 
 RUN git clone --depth=1 --no-single-branch https://github.com/uklans/cache-domains/ /data/cachedomains
 

overlay/etc/nginx/nginx.conf

@@ -5,36 +5,37 @@ pid /run/nginx.pid;
 include /etc/nginx/modules-enabled/*.conf;
 
 events {
-	worker_connections 4096;
+  worker_connections 4096;
-	multi_accept on;
+  multi_accept on;
-	use epoll;
+  use epoll;
 }
 
 http {
-	aio threads;
+  aio threads;
-	sendfile on;
+  sendfile on;
-	tcp_nopush on;
+  tcp_nopush on;
-	tcp_nodelay on;
+  tcp_nodelay on;
-	keepalive_timeout 65;
+  keepalive_timeout 65;
-	types_hash_max_size 2048;
+  types_hash_max_size 2048;
 
-	include /etc/nginx/mime.types;
+  include /etc/nginx/mime.types;
-	default_type application/octet-stream;
+  default_type application/octet-stream;
 
-	access_log /var/log/nginx/access.log;
+  access_log /var/log/nginx/access.log;
-	error_log /var/log/nginx/error.log;
+  error_log /var/log/nginx/error.log;
 
 
 
-	gzip on;
+  gzip on;
 
-	include /etc/nginx/conf.d/*.conf;
+  include /etc/nginx/conf.d/*.conf;
 
-	include /etc/nginx/sites-enabled/*.conf;
+  include /etc/nginx/sites-enabled/*.conf;
 }
 
 
 stream {                                
-	include /etc/nginx/stream.d/*.conf; 
+  include /etc/nginx/stream.d/*.conf; 
-	include /etc/nginx/stream-enabled/*;
+  include /etc/nginx/stream-enabled/*;
 }                                       
+

overlay/etc/nginx/sites-available/20_upstream.conf

@@ -5,10 +5,10 @@
 
 server {
 
-	# Internal bind on 3128, this should not be externally mapped
+  # Internal bind on 3128, this should not be externally mapped
   listen localhost:3128 reuseport;
 
-	# No access_log tracking as all requests to this instance are already logged through monolithic
+  # No access_log tracking as all requests to this instance are already logged through monolithic
 
   # access_log /data/logs/upstream-access.log cachelog;
   error_log /data/logs/upstream-error.log;

overlay/etc/nginx/sites-available/cache.conf.d/root/90_upstream.conf

@@ -1,8 +1,7 @@
     # Upstream Configuration
     proxy_next_upstream error timeout http_404;
-#    proxy_pass http://$host$request_uri;
 
-		# Proxy into the redirect handler
+    # Proxy into the redirect handler
     proxy_pass http://127.0.0.1:3128$request_uri;
 
     proxy_redirect off;

overlay/etc/nginx/sites-available/upstream.conf.d/20_tracking.conf

@@ -1,2 +1,2 @@
-	# Header to track if resolved from upstream or 302 redirect
+  # Header to track if resolved from upstream or 302 redirect
   set $orig_loc 'upstream';

overlay/etc/nginx/sites-available/upstream.conf.d/30_primary_proxy.conf

@@ -1,9 +1,9 @@
-	# Proxy all requests to upstream
+  # Proxy all requests to upstream
   location / {
     # Simple proxy the request
-		proxy_pass http://$host$request_uri;
+    proxy_pass http://$host$request_uri;
 
-		# Catch the errors to process the redirects
+    # Catch the errors to process the redirects
     proxy_intercept_errors on;
     error_page 301 302 307 = @upstream_redirect;
   }

overlay/etc/nginx/sites-available/upstream.conf.d/40_redirect_proxy.conf

@@ -1,11 +1,11 @@
-	# Special location block to handle 302 redirects
+  # Special location block to handle 302 redirects
   location @upstream_redirect {
-		# Upstream_http_location contains the Location: redirection from the upstream server
+    # Upstream_http_location contains the Location: redirection from the upstream server
     set $saved_upstream_location '$upstream_http_location';
 
-		# Set debug header
+    # Set debug header
     set $orig_loc 'upstream-302';
 
-		# Pass to proxy and reproxy the request
+    # Pass to proxy and reproxy the request
     proxy_pass $saved_upstream_location;
   }

overlay/etc/nginx/stream-available/10_sni.conf

@@ -1,9 +1,9 @@
 server {
-	listen 443;
+  listen 443;
   resolver UPSTREAM_DNS ipv6=off;
-	proxy_pass  $ssl_preread_server_name:443;
+  proxy_pass  $ssl_preread_server_name:443;
-	ssl_preread on;
+  ssl_preread on;
 
-	access_log /data/logs/stream-access.log stream_basic;
+  access_log /data/logs/stream-access.log stream_basic;
-	error_log /data/logs/stream-error.log;
+  error_log /data/logs/stream-error.log;
 }