From a4f0ecf8f9ea7d6028df2a1e0382daee4a5f2869 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Fri, 7 Dec 2018 14:55:57 -0500 Subject: [PATCH 01/31] Will continue this later --- templates/XWiki/0/README.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 templates/XWiki/0/README.md diff --git a/templates/XWiki/0/README.md b/templates/XWiki/0/README.md new file mode 100644 index 0000000..9bea272 --- /dev/null +++ b/templates/XWiki/0/README.md @@ -0,0 +1,5 @@ +# XWiki + +### Will continue this later + +https://store.docker.com/_/xwiki \ No newline at end of file From cc50b09dbad6eab63a0f1702f8da4634c1eacaec Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 17 Dec 2018 21:48:56 -0500 Subject: [PATCH 02/31] Initial completed configuration --- templates/XWiki/0/docker-compose.yml | 79 +++++++++++++++++++++++++++ templates/XWiki/0/rancher-compose.yml | 59 ++++++++++++++++++++ templates/XWiki/config.yml | 8 +++ 3 files changed, 146 insertions(+) create mode 100644 templates/XWiki/0/docker-compose.yml create mode 100644 templates/XWiki/0/rancher-compose.yml create mode 100644 templates/XWiki/config.yml diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml new file mode 100644 index 0000000..27a34b4 --- /dev/null +++ b/templates/XWiki/0/docker-compose.yml @@ -0,0 +1,79 @@ +version: '2' + +services: + xwiki: + image: xwiki:stable-postgres-tomcat + container_name: xwiki + dns: + - 1.1.1.1 + - 1.0.0.1 + environment: + DB_HOST: postgresql + DB_DATABASE: xwiki + DB_USER: xwiki_user + DB_PASSWORD: ${DB_USER_PASS} + 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 + ### Start Web Segment + traefik.frontend.entryPoints: http,https + traefik.frontend.headers.forceSTSHeader: true + traefik.frontend.headers.referrerPolicy: no-referrer + traefik.frontend.headers.SSLRedirect: true + traefik.frontend.headers.STSPreload: true + traefik.frontend.headers.STSSeconds: 15552000 + traefik.frontend.rule: Host:${TRAEFIK_HOST} + traefik.port: "8080" + ### End Web Segment + {{- else}} + traefik.enable: false + {{- end}} + links: + - postgresql # Using links because "depends_on" does not work in Rancher 1.6 + networks: + - public-proxy + {{- if .Values.WEB_PORT}} + ports: + - "${WEB_PORT}:8080" + {{- 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:/usr/local/xwiki + postgresql: + image: postgres:9.5 + container_name: postgresql + dns: + - 1.1.1.1 + - 1.0.0.1 + environment: + POSTGRES_INITDB_ARGS: "--encoding=UTF8" + POSTGRES_DATABASE: xwiki + POSTGRES_ROOT_PASSWORD: ${DB_ROOT_PASS} + POSTGRES_USER: xwiki_user + POSTGRES_PASSWORD: ${DB_USER_PASS} + labels: + io.rancher.container.pull_image: always + {{- if .Values.HOST_LABEL}} + io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} + {{- end}} + networks: + db-admin: + aliases: + - xwiki + 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/postgresql/data + +networks: + db-admin: + external: true + public-proxy: + external: true \ No newline at end of file diff --git a/templates/XWiki/0/rancher-compose.yml b/templates/XWiki/0/rancher-compose.yml new file mode 100644 index 0000000..2a52c70 --- /dev/null +++ b/templates/XWiki/0/rancher-compose.yml @@ -0,0 +1,59 @@ +version: '2' +catalog: + name: XWiki + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: + questions: + + - variable: "HOST_LABEL" + label: "Host Label Key/Value Pair" + description: | + The Label Key/Value pair on the host which containers should be deployed + default: "host.id=Host1" + required: false + type: string + + - variable: "TRAEFIK_HOST" + 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. + Leaving this empty will disable opening any port on the host system. + default: "11100" + required: true + type: string # "Int" sometimes causes problems, and not a huge issue + + - variable: "DB_ROOT_PASS" + label: "Database Root Password" + description: | + A secure password to be used by the "root" MySQL user. + # default: + required: true + type: password + + - variable: "DB_USER_PASS" + label: "Database User Password" + description: | + A secure password to be used by the "xwiki_user" MySQL user. + # default: + required: true + type: password + + - variable: "DATA_DIR" + label: "Data Directory" + description: | + The directory to store persistent data for the stack. + default: "Personal/XWiki" + required: true + type: string \ No newline at end of file diff --git a/templates/XWiki/config.yml b/templates/XWiki/config.yml new file mode 100644 index 0000000..ed31e90 --- /dev/null +++ b/templates/XWiki/config.yml @@ -0,0 +1,8 @@ +name: XWiki +description: | + Status: EXPERIMENTAL +version: latest +category: Wiki +maintainer: WilliamMiceli +# license: +# projectURL: \ No newline at end of file From 83bfb2af69180cdff881fc8ffab339364a38d5e1 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 17 Dec 2018 22:02:27 -0500 Subject: [PATCH 03/31] Trying later version --- templates/XWiki/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index 27a34b4..ac79342 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -46,7 +46,7 @@ services: - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system - /RancherCattle/${DATA_DIR}/Application:/usr/local/xwiki postgresql: - image: postgres:9.5 + image: postgres:latest container_name: postgresql dns: - 1.1.1.1 From 57f5a718d5e59294430de5781c5be4e5d159a7c2 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 17 Dec 2018 22:02:41 -0500 Subject: [PATCH 04/31] Fixed variable name --- templates/XWiki/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index ac79342..0545fb2 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -53,7 +53,7 @@ services: - 1.0.0.1 environment: POSTGRES_INITDB_ARGS: "--encoding=UTF8" - POSTGRES_DATABASE: xwiki + POSTGRES_DB: xwiki POSTGRES_ROOT_PASSWORD: ${DB_ROOT_PASS} POSTGRES_USER: xwiki_user POSTGRES_PASSWORD: ${DB_USER_PASS} From 2e39193ea556fd2fda34b16931b731debb7777ca Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 17 Dec 2018 22:20:26 -0500 Subject: [PATCH 05/31] Testing different data location This is to try and get around a possible permissions issue --- templates/XWiki/0/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index 0545fb2..b209d77 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -52,6 +52,7 @@ services: - 1.1.1.1 - 1.0.0.1 environment: + PGDATA: /postgresql/data POSTGRES_INITDB_ARGS: "--encoding=UTF8" POSTGRES_DB: xwiki POSTGRES_ROOT_PASSWORD: ${DB_ROOT_PASS} @@ -70,7 +71,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/postgresql/data + - /RancherCattle/${DATA_DIR}/Database:/postgresql/data networks: db-admin: From 5aa439b5d3a23ed80a776b1d18cf1475a8bc6057 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 17 Dec 2018 22:31:10 -0500 Subject: [PATCH 06/31] Trying without initialization arguments --- templates/XWiki/0/docker-compose.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index b209d77..179c683 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -52,8 +52,7 @@ services: - 1.1.1.1 - 1.0.0.1 environment: - PGDATA: /postgresql/data - POSTGRES_INITDB_ARGS: "--encoding=UTF8" + # POSTGRES_INITDB_ARGS: "--encoding=UTF8" POSTGRES_DB: xwiki POSTGRES_ROOT_PASSWORD: ${DB_ROOT_PASS} POSTGRES_USER: xwiki_user @@ -71,7 +70,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:/postgresql/data + - /RancherCattle/${DATA_DIR}/Database:/var/lib/postgresql/data networks: db-admin: From 11ce9c46d39b5d3cf022a875082f65c526090cd6 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 17 Dec 2018 22:35:28 -0500 Subject: [PATCH 07/31] Added temporary file directory --- templates/XWiki/0/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index 179c683..86254f0 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -71,6 +71,7 @@ services: - /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/postgresql/data + - /RancherCattle/${DATA_DIR}/Temp:/var/run/postgresql networks: db-admin: From 4a737bfe5ae219b9b0bb1ff0e7ecedbd16d492ac Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 17 Dec 2018 22:51:56 -0500 Subject: [PATCH 08/31] Found workaround for PostgreSQL issue --- templates/XWiki/0/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index 86254f0..0f8a3ce 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -46,13 +46,13 @@ services: - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system - /RancherCattle/${DATA_DIR}/Application:/usr/local/xwiki postgresql: - image: postgres:latest + image: postgres:alpine container_name: postgresql dns: - 1.1.1.1 - 1.0.0.1 environment: - # POSTGRES_INITDB_ARGS: "--encoding=UTF8" + POSTGRES_INITDB_ARGS: "--encoding=UTF8" POSTGRES_DB: xwiki POSTGRES_ROOT_PASSWORD: ${DB_ROOT_PASS} POSTGRES_USER: xwiki_user @@ -71,7 +71,7 @@ services: - /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/postgresql/data - - /RancherCattle/${DATA_DIR}/Temp:/var/run/postgresql + - /RancherCattle/${DATA_DIR}/Temp:/var/run/postgresql # Band-aid for PostgreSQL issue of being "out of space" networks: db-admin: From 294a37c27f50a9fe93ce7aea58be10ac1ba137e8 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 17 Dec 2018 23:21:12 -0500 Subject: [PATCH 09/31] Bug fixing testing --- templates/XWiki/0/docker-compose.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index 0f8a3ce..f393e60 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -52,7 +52,7 @@ services: - 1.1.1.1 - 1.0.0.1 environment: - POSTGRES_INITDB_ARGS: "--encoding=UTF8" + POSTGRES_INITDB_ARGS: "--encoding=UTF8 -k ''" # UTF8 Encoding and disable listening on unix socket POSTGRES_DB: xwiki POSTGRES_ROOT_PASSWORD: ${DB_ROOT_PASS} POSTGRES_USER: xwiki_user @@ -71,7 +71,8 @@ services: - /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/postgresql/data - - /RancherCattle/${DATA_DIR}/Temp:/var/run/postgresql # Band-aid for PostgreSQL issue of being "out of space" + - /RancherCattle/${DATA_DIR}/Temp1:/var/run/postgresql # Band-aid for PostgreSQL issue of being "out of space" + - /RancherCattle/${DATA_DIR}/Temp2:/usr/local/pgsql # Attempt to fix minor issue networks: db-admin: From cab8db05c8e93f778a54122b990441ee09e7468e Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 17 Dec 2018 23:26:26 -0500 Subject: [PATCH 10/31] Testing --- templates/XWiki/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index f393e60..5ff4615 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -52,7 +52,7 @@ services: - 1.1.1.1 - 1.0.0.1 environment: - POSTGRES_INITDB_ARGS: "--encoding=UTF8 -k ''" # UTF8 Encoding and disable listening on unix socket + POSTGRES_INITDB_ARGS: "--encoding=UTF8 -k \"\"" # UTF8 Encoding and disable listening on unix socket POSTGRES_DB: xwiki POSTGRES_ROOT_PASSWORD: ${DB_ROOT_PASS} POSTGRES_USER: xwiki_user From f90fa64dfb9a720d856a04eaeb4ea5770476584f Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 17 Dec 2018 23:34:54 -0500 Subject: [PATCH 11/31] Removed for now --- templates/XWiki/0/README.md | 6 +++++- templates/XWiki/0/docker-compose.yml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/XWiki/0/README.md b/templates/XWiki/0/README.md index 9bea272..d068197 100644 --- a/templates/XWiki/0/README.md +++ b/templates/XWiki/0/README.md @@ -2,4 +2,8 @@ ### Will continue this later -https://store.docker.com/_/xwiki \ No newline at end of file +https://store.docker.com/_/xwiki + + +# TODO +* Look into disabling listening on unix socket, as it's not needed, and the workaround is required for it \ No newline at end of file diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index 5ff4615..48e2f75 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -52,7 +52,7 @@ services: - 1.1.1.1 - 1.0.0.1 environment: - POSTGRES_INITDB_ARGS: "--encoding=UTF8 -k \"\"" # UTF8 Encoding and disable listening on unix socket + POSTGRES_INITDB_ARGS: "--encoding=UTF8" POSTGRES_DB: xwiki POSTGRES_ROOT_PASSWORD: ${DB_ROOT_PASS} POSTGRES_USER: xwiki_user From b4772d66094459fad8b6be5e079bfaba7ccbeafb Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 17 Dec 2018 23:40:23 -0500 Subject: [PATCH 12/31] Did not fix minor issue --- templates/XWiki/0/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index 48e2f75..96a1882 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -72,7 +72,6 @@ services: - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system - /RancherCattle/${DATA_DIR}/Database:/var/lib/postgresql/data - /RancherCattle/${DATA_DIR}/Temp1:/var/run/postgresql # Band-aid for PostgreSQL issue of being "out of space" - - /RancherCattle/${DATA_DIR}/Temp2:/usr/local/pgsql # Attempt to fix minor issue networks: db-admin: From a8884a8e7e5e6b5f688fb7270a01da022ff5ff5a Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 17 Dec 2018 23:40:46 -0500 Subject: [PATCH 13/31] Small rename --- templates/XWiki/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index 96a1882..0f8a3ce 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -71,7 +71,7 @@ services: - /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/postgresql/data - - /RancherCattle/${DATA_DIR}/Temp1:/var/run/postgresql # Band-aid for PostgreSQL issue of being "out of space" + - /RancherCattle/${DATA_DIR}/Temp:/var/run/postgresql # Band-aid for PostgreSQL issue of being "out of space" networks: db-admin: From 2c6ec7a777a9ec67d916299490cd8b159d7456d1 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 18 Dec 2018 11:09:21 -0500 Subject: [PATCH 14/31] Switched to MySQL --- templates/XWiki/0/docker-compose.yml | 23 +++++++++--------- templates/XWiki/Configuration/xwiki.cnf | 31 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 templates/XWiki/Configuration/xwiki.cnf diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index 0f8a3ce..fe6ccdb 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -2,13 +2,13 @@ version: '2' services: xwiki: - image: xwiki:stable-postgres-tomcat + image: xwiki:latest container_name: xwiki dns: - 1.1.1.1 - 1.0.0.1 environment: - DB_HOST: postgresql + DB_HOST: mysql DB_DATABASE: xwiki DB_USER: xwiki_user DB_PASSWORD: ${DB_USER_PASS} @@ -45,18 +45,17 @@ services: - /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:/usr/local/xwiki - postgresql: - image: postgres:alpine - container_name: postgresql + mysql: + image: mysql:5.7 + container_name: mysql dns: - 1.1.1.1 - 1.0.0.1 environment: - POSTGRES_INITDB_ARGS: "--encoding=UTF8" - POSTGRES_DB: xwiki - POSTGRES_ROOT_PASSWORD: ${DB_ROOT_PASS} - POSTGRES_USER: xwiki_user - POSTGRES_PASSWORD: ${DB_USER_PASS} + MYSQL_DATABASE: xwiki + MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS} + MYSQL_USER: xwiki_user + MYSQL_PASSWORD: ${DB_USER_PASS} labels: io.rancher.container.pull_image: always {{- if .Values.HOST_LABEL}} @@ -70,8 +69,8 @@ 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/postgresql/data - - /RancherCattle/${DATA_DIR}/Temp:/var/run/postgresql # Band-aid for PostgreSQL issue of being "out of space" + - /RancherCattle/${DATA_DIR}/Configuration/xwiki.cnf:/etc/mysql/conf.d/xwiki.cnf + - /RancherCattle/${DATA_DIR}/Database:/var/lib/mysql networks: db-admin: diff --git a/templates/XWiki/Configuration/xwiki.cnf b/templates/XWiki/Configuration/xwiki.cnf new file mode 100644 index 0000000..9c14b16 --- /dev/null +++ b/templates/XWiki/Configuration/xwiki.cnf @@ -0,0 +1,31 @@ +# --------------------------------------------------------------------------- +# See the NOTICE file distributed with this work for additional +# information regarding copyright ownership. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# --------------------------------------------------------------------------- + +[client] +default-character-set = utf8 + +[mysqld] +character-set-server = utf8 +collation-server = utf8_bin +explicit_defaults_for_timestamp = 1 + +[mysql] +default-character-set = utf8 + From 81dd776c5ce42d57f2bec3b221d13cef1686f494 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 18 Dec 2018 11:11:31 -0500 Subject: [PATCH 15/31] Updated link --- templates/XWiki/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index fe6ccdb..a51441d 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -33,7 +33,7 @@ services: traefik.enable: false {{- end}} links: - - postgresql # Using links because "depends_on" does not work in Rancher 1.6 + - mysql # Using links because "depends_on" does not work in Rancher 1.6 networks: - public-proxy {{- if .Values.WEB_PORT}} From 60569afbca24de4939885b070442f7273b0f9e81 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 18 Dec 2018 11:24:22 -0500 Subject: [PATCH 16/31] Trying something --- templates/XWiki/0/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index a51441d..22b9231 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -44,7 +44,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:/usr/local/xwiki + - /RancherCattleData/${DATA_DIR}/Application:/usr/local/xwiki mysql: image: mysql:5.7 container_name: mysql @@ -69,8 +69,8 @@ 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}/Configuration/xwiki.cnf:/etc/mysql/conf.d/xwiki.cnf - - /RancherCattle/${DATA_DIR}/Database:/var/lib/mysql + - /RancherCattleData/${DATA_DIR}/Configuration/xwiki.cnf:/etc/mysql/conf.d/xwiki.cnf + - /RancherCattleData/${DATA_DIR}/Database:/var/lib/mysql networks: db-admin: From d2c032c789c97d719000ff9b2bf4d396d9f40b1a Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 18 Dec 2018 11:33:50 -0500 Subject: [PATCH 17/31] Testing --- templates/XWiki/0/docker-compose.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index 22b9231..a9b93b3 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -69,8 +69,9 @@ 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 - - /RancherCattleData/${DATA_DIR}/Configuration/xwiki.cnf:/etc/mysql/conf.d/xwiki.cnf - - /RancherCattleData/${DATA_DIR}/Database:/var/lib/mysql + - /RancherCattle/${DATA_DIR}/Configuration/xwiki.cnf:/etc/mysql/conf.d/xwiki.cnf + - /RancherCattle/${DATA_DIR}/Database:/var/lib/mysql + - /RancherCattle/${DATA_DIR}/Temp:/var/run/mysqld/ # Temporary fix for socket issue networks: db-admin: From 09dc554355aad70f00f15cfac5a1bd6cd83d21c4 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 18 Dec 2018 13:29:32 -0500 Subject: [PATCH 18/31] Testing with default configuration --- templates/XWiki/0/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index a9b93b3..82f7b73 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -69,9 +69,9 @@ 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}/Configuration/xwiki.cnf:/etc/mysql/conf.d/xwiki.cnf +# - /RancherCattle/${DATA_DIR}/Configuration/xwiki.cnf:/etc/mysql/conf.d/xwiki.cnf - /RancherCattle/${DATA_DIR}/Database:/var/lib/mysql - - /RancherCattle/${DATA_DIR}/Temp:/var/run/mysqld/ # Temporary fix for socket issue +# - /RancherCattle/${DATA_DIR}/Temp:/var/run/mysqld/ # Temporary fix for socket issue networks: db-admin: From 09b9533e17adccf77126a58988573399becd8453 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 18 Dec 2018 13:30:55 -0500 Subject: [PATCH 19/31] Reverted directory for Application --- templates/XWiki/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index 82f7b73..4a33541 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -44,7 +44,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 - - /RancherCattleData/${DATA_DIR}/Application:/usr/local/xwiki + - /RancherCattle/${DATA_DIR}/Application:/usr/local/xwiki mysql: image: mysql:5.7 container_name: mysql From e767fc4fb6e521688f57aefd01f6aa8c5e5b6a6b Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 18 Dec 2018 13:51:11 -0500 Subject: [PATCH 20/31] Removing container names --- templates/XWiki/0/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index 4a33541..d948780 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: xwiki: image: xwiki:latest - container_name: xwiki +# container_name: xwiki dns: - 1.1.1.1 - 1.0.0.1 @@ -47,7 +47,7 @@ services: - /RancherCattle/${DATA_DIR}/Application:/usr/local/xwiki mysql: image: mysql:5.7 - container_name: mysql +# container_name: mysql dns: - 1.1.1.1 - 1.0.0.1 From 1bfa318a357e8c6b50dd3b887bb83fa94e3b2136 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Wed, 19 Dec 2018 10:11:03 -0500 Subject: [PATCH 21/31] Back to PostgreSQL, issue was with own infrastructure --- templates/XWiki/0/docker-compose.yml | 29 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index d948780..235c0d7 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -2,14 +2,14 @@ version: '2' services: xwiki: - image: xwiki:latest -# container_name: xwiki + image: xwiki:stable-postgres-tomcat + container_name: xwiki dns: - 1.1.1.1 - 1.0.0.1 environment: - DB_HOST: mysql - DB_DATABASE: xwiki + DB_HOST: postgresql + DB_DATABASE: xwiki_db DB_USER: xwiki_user DB_PASSWORD: ${DB_USER_PASS} labels: @@ -33,7 +33,7 @@ services: traefik.enable: false {{- end}} links: - - mysql # Using links because "depends_on" does not work in Rancher 1.6 + - postgresql # Using links because "depends_on" does not work in Rancher 1.6 networks: - public-proxy {{- if .Values.WEB_PORT}} @@ -45,17 +45,18 @@ services: - /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:/usr/local/xwiki - mysql: - image: mysql:5.7 -# container_name: mysql + postgresql: + image: postgres:alpine + container_name: postgresql dns: - 1.1.1.1 - 1.0.0.1 environment: - MYSQL_DATABASE: xwiki - MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS} - MYSQL_USER: xwiki_user - MYSQL_PASSWORD: ${DB_USER_PASS} + POSTGRES_INITDB_ARGS: "--encoding=UTF8" + POSTGRES_DB: xwiki_db + POSTGRES_ROOT_PASSWORD: ${DB_ROOT_PASS} + POSTGRES_USER: xwiki_user + POSTGRES_PASSWORD: ${DB_USER_PASS} labels: io.rancher.container.pull_image: always {{- if .Values.HOST_LABEL}} @@ -69,9 +70,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}/Configuration/xwiki.cnf:/etc/mysql/conf.d/xwiki.cnf - - /RancherCattle/${DATA_DIR}/Database:/var/lib/mysql -# - /RancherCattle/${DATA_DIR}/Temp:/var/run/mysqld/ # Temporary fix for socket issue + - /RancherCattle/${DATA_DIR}/Database:/var/lib/postgresql/data networks: db-admin: From 4c1d549c69f3bbc77b83e22a7375e8bf78cc38dc Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Wed, 19 Dec 2018 22:00:19 -0500 Subject: [PATCH 22/31] Updated README, removed MySQL config --- templates/XWiki/0/README.md | 8 +++---- templates/XWiki/Configuration/xwiki.cnf | 31 ------------------------- 2 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 templates/XWiki/Configuration/xwiki.cnf diff --git a/templates/XWiki/0/README.md b/templates/XWiki/0/README.md index d068197..ec1371a 100644 --- a/templates/XWiki/0/README.md +++ b/templates/XWiki/0/README.md @@ -1,9 +1,9 @@ # XWiki -### Will continue this later +## Will continue this later -https://store.docker.com/_/xwiki + +### TODO -# TODO -* Look into disabling listening on unix socket, as it's not needed, and the workaround is required for it \ No newline at end of file +* Fix issue with some page assets being delivered over http instead of https \ No newline at end of file diff --git a/templates/XWiki/Configuration/xwiki.cnf b/templates/XWiki/Configuration/xwiki.cnf deleted file mode 100644 index 9c14b16..0000000 --- a/templates/XWiki/Configuration/xwiki.cnf +++ /dev/null @@ -1,31 +0,0 @@ -# --------------------------------------------------------------------------- -# See the NOTICE file distributed with this work for additional -# information regarding copyright ownership. -# -# This is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this software; if not, write to the Free -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. -# --------------------------------------------------------------------------- - -[client] -default-character-set = utf8 - -[mysqld] -character-set-server = utf8 -collation-server = utf8_bin -explicit_defaults_for_timestamp = 1 - -[mysql] -default-character-set = utf8 - From 5b0bfa207061e6e84e436321f44d0390482f573b Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Wed, 19 Dec 2018 22:10:50 -0500 Subject: [PATCH 23/31] WEB_PORT not actually required --- templates/XWiki/0/rancher-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/XWiki/0/rancher-compose.yml b/templates/XWiki/0/rancher-compose.yml index 2a52c70..8f433c1 100644 --- a/templates/XWiki/0/rancher-compose.yml +++ b/templates/XWiki/0/rancher-compose.yml @@ -31,7 +31,7 @@ catalog: The port to locally access the web interface on. Leaving this empty will disable opening any port on the host system. default: "11100" - required: true + required: false type: string # "Int" sometimes causes problems, and not a huge issue - variable: "DB_ROOT_PASS" From 955ffa2d33fff42d2ad4c5d29a1acf6c2d6e5158 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sat, 29 Dec 2018 16:07:33 -0500 Subject: [PATCH 24/31] Allowing use of sub-subdomains --- templates/XWiki/0/README.md | 3 ++- templates/XWiki/0/docker-compose.yml | 2 +- templates/XWiki/0/rancher-compose.yml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/XWiki/0/README.md b/templates/XWiki/0/README.md index ec1371a..75cdd23 100644 --- a/templates/XWiki/0/README.md +++ b/templates/XWiki/0/README.md @@ -6,4 +6,5 @@ ### TODO -* Fix issue with some page assets being delivered over http instead of https \ No newline at end of file +* Fix issue with some page assets being delivered over http instead of https +* Document setting up domain DNS \ No newline at end of file diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index 235c0d7..c1ae212 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -26,7 +26,7 @@ services: traefik.frontend.headers.SSLRedirect: true traefik.frontend.headers.STSPreload: true traefik.frontend.headers.STSSeconds: 15552000 - traefik.frontend.rule: Host:${TRAEFIK_HOST} + traefik.frontend.rule: ${TRAEFIK_HOST} traefik.port: "8080" ### End Web Segment {{- else}} diff --git a/templates/XWiki/0/rancher-compose.yml b/templates/XWiki/0/rancher-compose.yml index 8f433c1..59bd5ee 100644 --- a/templates/XWiki/0/rancher-compose.yml +++ b/templates/XWiki/0/rancher-compose.yml @@ -21,7 +21,7 @@ catalog: description: | The host that Traefik will use to provide public access. Leaving this empty will disable Traefik on this stack. - default: "subdomain.domain.tld" + default: "HostRegexp:{subdomain:.*}subdomain.domain.tld" required: false type: string From 9333421a62727efdc9835f9b9b2a566c06b4f67c Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sun, 13 Jan 2019 16:52:20 -0500 Subject: [PATCH 25/31] Removed networking, miscellaneous fixes --- templates/XWiki/0/docker-compose.yml | 44 +++++++-------------------- templates/XWiki/0/rancher-compose.yml | 12 +------- 2 files changed, 12 insertions(+), 44 deletions(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index c1ae212..0de619a 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -3,7 +3,6 @@ version: '2' services: xwiki: image: xwiki:stable-postgres-tomcat - container_name: xwiki dns: - 1.1.1.1 - 1.0.0.1 @@ -17,37 +16,26 @@ services: {{- if .Values.HOST_LABEL}} io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} {{- end}} - {{- if .Values.TRAEFIK_HOST}} traefik.enable: true ### Start Web Segment - traefik.frontend.entryPoints: http,https - traefik.frontend.headers.forceSTSHeader: true - traefik.frontend.headers.referrerPolicy: no-referrer - traefik.frontend.headers.SSLRedirect: true - traefik.frontend.headers.STSPreload: true - traefik.frontend.headers.STSSeconds: 15552000 - traefik.frontend.rule: ${TRAEFIK_HOST} - traefik.port: "8080" + traefik.web.frontend.entryPoints: http, https + traefik.web.frontend.headers.forceSTSHeader: true +# traefik.web.frontend.headers.referrerPolicy: no-referrer +# traefik.web.frontend.headers.SSLRedirect: true +# traefik.web.frontend.headers.STSPreload: true +# traefik.web.frontend.headers.STSSeconds: 15552000 + traefik.web.frontend.rule: ${TRAEFIK_HOST} + traefik.web.port: "8080" ### End Web Segment - {{- else}} - traefik.enable: false - {{- end}} links: - - postgresql # Using links because "depends_on" does not work in Rancher 1.6 - networks: - - public-proxy - {{- if .Values.WEB_PORT}} - ports: - - "${WEB_PORT}:8080" - {{- end}} + - postgresql 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:/usr/local/xwiki + - /RancherCattle/${DATA_DIR}/XWiki:/usr/local/xwiki postgresql: image: postgres:alpine - container_name: postgresql dns: - 1.1.1.1 - 1.0.0.1 @@ -62,18 +50,8 @@ services: {{- if .Values.HOST_LABEL}} io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} {{- end}} - networks: - db-admin: - aliases: - - xwiki 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/postgresql/data - -networks: - db-admin: - external: true - public-proxy: - external: true \ No newline at end of file + - /RancherCattle/${DATA_DIR}/Database:/var/lib/postgresql/data \ No newline at end of file diff --git a/templates/XWiki/0/rancher-compose.yml b/templates/XWiki/0/rancher-compose.yml index 59bd5ee..3fa7b19 100644 --- a/templates/XWiki/0/rancher-compose.yml +++ b/templates/XWiki/0/rancher-compose.yml @@ -20,20 +20,10 @@ 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: "HostRegexp:{subdomain:.*}subdomain.domain.tld" - required: false + required: true type: string - - variable: "WEB_PORT" - label: "Web Port" - description: | - The port to locally access the web interface on. - Leaving this empty will disable opening any port on the host system. - default: "11100" - required: false - type: string # "Int" sometimes causes problems, and not a huge issue - - variable: "DB_ROOT_PASS" label: "Database Root Password" description: | From e412b9c23332825bcf49adc086c8339516f7a6ee Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sun, 13 Jan 2019 17:01:21 -0500 Subject: [PATCH 26/31] Re-enabled HSTS --- templates/XWiki/0/docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index 0de619a..72ac1d2 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -20,10 +20,10 @@ services: ### Start Web Segment traefik.web.frontend.entryPoints: http, https traefik.web.frontend.headers.forceSTSHeader: true -# traefik.web.frontend.headers.referrerPolicy: no-referrer -# traefik.web.frontend.headers.SSLRedirect: true -# traefik.web.frontend.headers.STSPreload: true -# traefik.web.frontend.headers.STSSeconds: 15552000 + traefik.web.frontend.headers.referrerPolicy: no-referrer + traefik.web.frontend.headers.SSLRedirect: true + traefik.web.frontend.headers.STSPreload: true + traefik.web.frontend.headers.STSSeconds: 15552000 traefik.web.frontend.rule: ${TRAEFIK_HOST} traefik.web.port: "8080" ### End Web Segment From 85914b182307a314c5ab0a53b2a1fe052ccfa3c2 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sun, 13 Jan 2019 17:51:00 -0500 Subject: [PATCH 27/31] Trying modified frontend rule --- templates/XWiki/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index 72ac1d2..66e475a 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -24,7 +24,7 @@ services: traefik.web.frontend.headers.SSLRedirect: true traefik.web.frontend.headers.STSPreload: true traefik.web.frontend.headers.STSSeconds: 15552000 - traefik.web.frontend.rule: ${TRAEFIK_HOST} + traefik.web.frontend.rule: "HostRegexp: ${TRAEFIK_HOST}, {subdomain:.+}.${TRAEFIK_HOST}" traefik.web.port: "8080" ### End Web Segment links: From 929a739c20c8c7d4b4b03d2ec865601cf236cb73 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sun, 13 Jan 2019 17:54:01 -0500 Subject: [PATCH 28/31] Modified default Traefik host --- templates/XWiki/0/rancher-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/XWiki/0/rancher-compose.yml b/templates/XWiki/0/rancher-compose.yml index 3fa7b19..7d86f2a 100644 --- a/templates/XWiki/0/rancher-compose.yml +++ b/templates/XWiki/0/rancher-compose.yml @@ -20,7 +20,7 @@ catalog: label: "Public Host Domain" description: | The host that Traefik will use to provide public access. - default: "HostRegexp:{subdomain:.*}subdomain.domain.tld" + default: "subdomain.domain.tld" required: true type: string From 20746425b3a3aa1e6403d8f81d3725e4f843eae2 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sun, 13 Jan 2019 18:42:58 -0500 Subject: [PATCH 29/31] Testing --- templates/XWiki/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index 66e475a..4b86480 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -24,7 +24,7 @@ services: traefik.web.frontend.headers.SSLRedirect: true traefik.web.frontend.headers.STSPreload: true traefik.web.frontend.headers.STSSeconds: 15552000 - traefik.web.frontend.rule: "HostRegexp: ${TRAEFIK_HOST}, {subdomain:.+}.${TRAEFIK_HOST}" + traefik.web.frontend.rule: "Host:${TRAEFIK_HOST}" # HostRegexp:${TRAEFIK_HOST},{subdomain:.+}. traefik.web.port: "8080" ### End Web Segment links: From 4fe52ac8796a6e8445774f4efeab64663a6f1b23 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sun, 13 Jan 2019 19:06:58 -0500 Subject: [PATCH 30/31] Added link for later --- templates/XWiki/0/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/XWiki/0/README.md b/templates/XWiki/0/README.md index 75cdd23..2564a7d 100644 --- a/templates/XWiki/0/README.md +++ b/templates/XWiki/0/README.md @@ -7,4 +7,4 @@ ### TODO * Fix issue with some page assets being delivered over http instead of https -* Document setting up domain DNS \ No newline at end of file +* Document setting up domain DNS for [wildcard Let's Encrypt certificates](https://docs.traefik.io/configuration/acme/#wildcard-domains) \ No newline at end of file From a9cf12ef35c2a6c04122a6de15d8d917f669f567 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sun, 13 Jan 2019 21:14:59 -0500 Subject: [PATCH 31/31] Added important articles for configuration --- templates/XWiki/0/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/templates/XWiki/0/README.md b/templates/XWiki/0/README.md index 2564a7d..17c70db 100644 --- a/templates/XWiki/0/README.md +++ b/templates/XWiki/0/README.md @@ -4,6 +4,11 @@ +## Popular Configuration Articles +* [https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/Configuration/] +* [https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/Virtualization/] +* [https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/ShortURLs/] + ### TODO * Fix issue with some page assets being delivered over http instead of https