From af8d09650b4affb049b134d1ccdb318548e8774a Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 31 Dec 2018 11:01:36 -0500 Subject: [PATCH 1/3] Experimenting with change in infrastructure --- templates/WordPress/0/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/WordPress/0/docker-compose.yml b/templates/WordPress/0/docker-compose.yml index 9a44587..d84583a 100644 --- a/templates/WordPress/0/docker-compose.yml +++ b/templates/WordPress/0/docker-compose.yml @@ -40,7 +40,7 @@ services: 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 + - /FreeNAS/${DATA_DIR}/Application:/var/www/html mysql: image: mysql:5 dns: @@ -64,7 +64,7 @@ services: 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 + - /FreeNAS/${DATA_DIR}/Database:/var/lib/mysql networks: db-admin: From 9912091d3ecaabe0c330d8ccaf7b6fcc4640a0e8 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 31 Dec 2018 13:20:59 -0500 Subject: [PATCH 2/3] Test successful, using same name now --- templates/WordPress/0/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/WordPress/0/docker-compose.yml b/templates/WordPress/0/docker-compose.yml index d84583a..9a44587 100644 --- a/templates/WordPress/0/docker-compose.yml +++ b/templates/WordPress/0/docker-compose.yml @@ -40,7 +40,7 @@ services: 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 - - /FreeNAS/${DATA_DIR}/Application:/var/www/html + - /RancherCattle/${DATA_DIR}/Application:/var/www/html mysql: image: mysql:5 dns: @@ -64,7 +64,7 @@ services: 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 - - /FreeNAS/${DATA_DIR}/Database:/var/lib/mysql + - /RancherCattle/${DATA_DIR}/Database:/var/lib/mysql networks: db-admin: From 6ae14f3517e1ef060fb8b98e612d298b17cea0c8 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sat, 12 Jan 2019 19:32:18 -0500 Subject: [PATCH 3/3] Minor updates, should be finally "done" --- templates/WordPress/0/docker-compose.yml | 45 +++++++---------------- templates/WordPress/0/rancher-compose.yml | 17 +-------- 2 files changed, 15 insertions(+), 47 deletions(-) diff --git a/templates/WordPress/0/docker-compose.yml b/templates/WordPress/0/docker-compose.yml index 9a44587..84dd830 100644 --- a/templates/WordPress/0/docker-compose.yml +++ b/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 \ No newline at end of file + - /RancherCattle/${DATA_DIR}/Database:/var/lib/mysql \ No newline at end of file diff --git a/templates/WordPress/0/rancher-compose.yml b/templates/WordPress/0/rancher-compose.yml index 4bd2961..be11e89 100644 --- a/templates/WordPress/0/rancher-compose.yml +++ b/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 \ No newline at end of file + type: string \ No newline at end of file