Merge branch 'develop/nginx'

# Conflicts:
#	templates/Nginx/0/docker-compose.yml

templates/Nginx/0/docker-compose.yml

@@ -2,8 +2,8 @@ version: '2'
 
 services:
   nginx:
-    image: nginx:alpine
-    dns:
+    image: nginx:${IMAGE_TAG}
+    dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
     labels:
@@ -16,7 +16,7 @@ services:
       ### Start Web Segment
       traefik.frontend.entryPoints: http,https
       traefik.frontend.headers.forceSTSHeader: true
-      traefik.frontend.headers.referrerPolicy: no-referrer
+      traefik.frontend.headers.referrerPolicy: no-referrer # Security enhancement (Prevents leaking of referer information)
       traefik.frontend.headers.SSLRedirect: true
       traefik.frontend.headers.STSPreload: true
       traefik.frontend.headers.STSSeconds: 15552000
@@ -24,16 +24,11 @@ services:
       traefik.frontend.rule: Host:${TRAEFIK_HOST}
       traefik.port: "80"
       ### End Web Segment
-      {{- else}}
-      traefik.enable: false
-      {{- end}}
-    {{- if .Values.WEB_PORT}}
-    ports:
-      - "${WEB_PORT}:80"
-    {{- end}}
     restart: on-failure
     volumes:
+      - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system
+      - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
       {{- if eq .Values.PERSIST_CONF "true"}}
       - /RancherCattle/${DATA_DIR}/Configuration:/etc/nginx
       {{- end}}
-      - /RancherCattle/${DATA_DIR}/HTML:/usr/share/nginx/html
+      - /RancherCattle/${DATA_DIR}/HTML:/usr/share/nginx/html