Minor updates, should be finally "done"

templates/WordPress/0/docker-compose.yml

@@ -8,46 +8,39 @@ services:
       - 1.0.0.1
     environment:
       WORDPRESS_DB_HOST: mysql
+      WORDPRESS_DB_NAME: wordpress_db
       WORDPRESS_DB_USER: wordpress_user
       WORDPRESS_DB_PASSWORD: ${DB_USER_PASS}
-      WORDPRESS_DB_NAME: wordpress # Will eventually rename this to "wordpress_db"
     labels:
       io.rancher.container.pull_image: always
       {{- if .Values.HOST_LABEL}}
       io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
       {{- end}}
-      {{- if .Values.TRAEFIK_HOST}}
       traefik.enable: true
-      traefik.frontend.rule: Host:${TRAEFIK_HOST}
-      traefik.frontend.entryPoints: http,https
-      traefik.frontend.headers.forceSTSHeader: true
-      traefik.frontend.headers.SSLRedirect: true
-      traefik.frontend.headers.STSPreload: true
-      traefik.frontend.headers.STSSeconds: 15552000
-      traefik.port: "80"
-      {{- else}}
-      traefik.enable: false
-      {{- end}}
+      ### Start Web Segment
+      traefik.web.frontend.entryPoints: http,https
+      traefik.web.frontend.headers.forceSTSHeader: true
+      traefik.web.frontend.headers.referrerPolicy: no-referrer # Security enhancement (Prevents leaking of referer information)
+      traefik.web.frontend.headers.SSLRedirect: true
+      traefik.web.frontend.headers.STSPreload: true
+      traefik.web.frontend.headers.STSSeconds: 15552000
+      traefik.web.frontend.rule: Host:${TRAEFIK_HOST}
+      traefik.web.port: "80"
+      ### End Web Segment
     links:
       - mysql
-    networks:
-      - public-proxy
-    {{- 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
-      - /RancherCattle/${DATA_DIR}/Application:/var/www/html
+      - /RancherCattle/${DATA_DIR}/Wordpress:/var/www/html
   mysql:
     image: mysql:5
     dns:
       - 1.1.1.1
       - 1.0.0.1
     environment:
-      MYSQL_DATABASE: wordpress # Will eventually rename this to "wordpress_db"
+      MYSQL_DATABASE: wordpress_db
       MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
       MYSQL_USER: wordpress_user
       MYSQL_PASSWORD: ${DB_USER_PASS}
@@ -56,18 +49,8 @@ services:
       {{- if .Values.HOST_LABEL}}
       io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
       {{- end}}
-    networks:
-      db-admin:
-        aliases:
-          - wordpress
     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
-      - /RancherCattle/${DATA_DIR}/Database:/var/lib/mysql
-
-networks:
-  db-admin:
-    external: true
-  public-proxy:
-    external: true
+      - /RancherCattle/${DATA_DIR}/Database:/var/lib/mysql

templates/WordPress/0/rancher-compose.yml

@@ -20,16 +20,7 @@ catalog:
       label: "Public Host Domain"
       description: |
         The host that Traefik will use to provide public access.
-        Leaving this empty will disable Traefik on this stack.
       default: "subdomain.domain.tld"
-      required: false
-      type: string
-
-    - variable: "WEB_PORT"
-      label: "Web Port"
-      description: |
-        The port to locally access the web interface on.
-      default: "10600"
       required: true
       type: string
 
@@ -55,10 +46,4 @@ catalog:
         The directory to store persistent data for the stack.
       default: "Personal/Wordpress"
       required: true
-      type: string
-
-services:
-  wordpress:
-    scale: 1
-  mysql:
-    scale: 1
+      type: string