Basic conversion to Traefik v2 just to get things running

This commit is contained in:
WilliamMiceli
2019-11-09 18:27:39 -05:00
parent fc411baa52
commit abf2e3cf91
4 changed files with 36 additions and 36 deletions

View File

@@ -14,7 +14,7 @@ services:
gitlab_rails['gitlab_shell_ssh_port'] = 22 gitlab_rails['gitlab_shell_ssh_port'] = 22
nginx['real_ip_trusted_addresses'] = [ '10.42.0.0/16' ] # 10.42.0.0/16 is the default Rancher-managed subnet nginx['real_ip_trusted_addresses'] = [ '10.42.0.0/16' ] # 10.42.0.0/16 is the default Rancher-managed subnet
nginx['listen_port'] = 80 # Using HTTP between the Traefik container and GitLab nginx['listen_port'] = 80 # Using HTTP between the Traefik container and GitLab
nginx['listen_https'] = false # Traefik is handling HTTPS on outside nginx['listen_https'] = false # Traefik is handling HTTPS termination
hostname: ${TRAEFIK_HOST} hostname: ${TRAEFIK_HOST}
labels: labels:
io.rancher.container.pull_image: always io.rancher.container.pull_image: always
@@ -22,23 +22,14 @@ services:
io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
{{- end}} {{- end}}
traefik.enable: true traefik.enable: true
### Start Web Segment traefik.http.routers.gitlab-router.rule: Host(`${TRAEFIK_HOST}`)
traefik.web.frontend.entryPoints: http,https traefik.http.routers.gitlab-router.entrypoints: https
traefik.web.frontend.headers.forceSTSHeader: true traefik.http.routers.gitlab-router.service: gitlab-service
traefik.web.frontend.headers.referrerPolicy: no-referrer # Security enhancement (Prevents leaking of referer information) traefik.http.routers.gitlab-router.tls: true
traefik.web.frontend.headers.SSLRedirect: true traefik.http.routers.gitlab-router.tls.certresolver: letsencrypt
traefik.web.frontend.headers.STSPreload: true traefik.http.services.gitlab-service.loadbalancer.server.port: "80"
traefik.web.frontend.headers.STSSeconds: 15552000 traefik.http.services.gitlab-service.loadbalancer.server.scheme: http
traefik.web.frontend.passHostHeader: true traefik.http.services.gitlab-service.loadbalancer.passhostheader: true
traefik.web.frontend.rule: HostRegexp:${TRAEFIK_HOST},{subdomain:.+}.${TRAEFIK_HOST}
traefik.web.port: "80"
### End Web Segment
### Start SSH Segment
# traefik.ssh.frontend.entryPoints: ssh
# traefik.ssh.frontend.rule: Host:${TRAEFIK_HOST}
# traefik.ssh.frontend.passHostHeader: true
# traefik.ssh.port: "22"
### End SSH Segment
restart: on-failure restart: on-failure
volumes: volumes:
- /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system

View File

@@ -41,22 +41,31 @@ services:
{{- end}} {{- end}}
# io.rancher.sidekicks: cron # io.rancher.sidekicks: cron
traefik.enable: true traefik.enable: true
### Start Web UI Segment traefik.http.routers.nextcloud-router.rule: Host(`${TRAEFIK_HOST}`)
traefik.frontend.entryPoints: http,https traefik.http.routers.nextcloud-router.entrypoints: https
traefik.frontend.headers.forceSTSHeader: true traefik.http.routers.nextcloud-router.service: nextcloud-service
traefik.frontend.headers.referrerPolicy: no-referrer # Security enhancement (Prevents leaking of referer information) traefik.http.routers.nextcloud-router.tls: true
traefik.frontend.headers.SSLRedirect: true traefik.http.routers.nextcloud-router.tls.certresolver: letsencrypt
traefik.frontend.headers.STSIncludeSubdomains: true traefik.http.services.nextcloud-service.loadbalancer.server.port: "80"
traefik.frontend.headers.STSPreload: true traefik.http.services.nextcloud-service.loadbalancer.server.scheme: http
traefik.frontend.headers.STSSeconds: 15552000 traefik.http.services.nextcloud-service.loadbalancer.passhostheader: true
traefik.frontend.passHostHeader: true # Will come back to finish the conversion to Traefik v2 later
traefik.frontend.rule: Host:${TRAEFIK_HOST} # ### Start Web UI Segment
traefik.port: "80" # traefik.frontend.entryPoints: http,https
### End Web UI Segment # traefik.frontend.headers.forceSTSHeader: true
### Start CalDAV/CardDAV Redirect Segment # traefik.frontend.headers.referrerPolicy: no-referrer # Security enhancement (Prevents leaking of referer information)
traefik.frontend.redirect.permanent: true # traefik.frontend.headers.SSLRedirect: true
traefik.frontend.redirect.regex: https://(.*)/.well-known/(card|cal)dav # traefik.frontend.headers.STSIncludeSubdomains: true
traefik.frontend.redirect.replacement: https://${TRAEFIK_HOST}/remote.php/dav/ # traefik.frontend.headers.STSPreload: true
# traefik.frontend.headers.STSSeconds: 15552000
# traefik.frontend.passHostHeader: true
# traefik.frontend.rule: Host:${TRAEFIK_HOST}
# traefik.port: "80"
# ### End Web UI Segment
# ### Start CalDAV/CardDAV Redirect Segment
# traefik.frontend.redirect.permanent: true
# traefik.frontend.redirect.regex: https://(.*)/.well-known/(card|cal)dav
# traefik.frontend.redirect.replacement: https://${TRAEFIK_HOST}/remote.php/dav/
### End CalDAV/CardDAV Redirect Segment ### End CalDAV/CardDAV Redirect Segment
links: links:
- mysql - mysql

View File

@@ -16,7 +16,7 @@ services:
io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
{{- end}} {{- end}}
ports: ports:
- "1200:1200" # Traefik Dashboard (Might be temporary) - "1200:8080" # Traefik Dashboard
- "22:22" # SSH - "22:22" # SSH
- "80:80" # HTTP - "80:80" # HTTP
- "443:443" # HTTPS - "443:443" # HTTPS

View File

@@ -13,7 +13,7 @@ catalog:
label: "Host Label Key/Value Pair" label: "Host Label Key/Value Pair"
description: | description: |
The Key/Value pair of the host which the stack should be deployed. The Key/Value pair of the host which the stack should be deployed.
default: "host.id=Proxy1" default: "host.id=Proxy0"
required: false required: false
type: string type: string