From 3b01f968b38dd09f3ae42d2785519768a1e01ba6 Mon Sep 17 00:00:00 2001 From: kaiyou Date: Sun, 24 Sep 2017 15:45:10 +0200 Subject: [PATCH] Remove traefik which has become incompatible --- traefik/Dockerfile | 8 -------- traefik/conf/cert.toml | 24 ------------------------ traefik/conf/letsencrypt.toml | 29 ----------------------------- traefik/conf/notls.toml | 14 -------------- traefik/start.sh | 12 ------------ 5 files changed, 87 deletions(-) delete mode 100644 traefik/Dockerfile delete mode 100644 traefik/conf/cert.toml delete mode 100644 traefik/conf/letsencrypt.toml delete mode 100644 traefik/conf/notls.toml delete mode 100755 traefik/start.sh diff --git a/traefik/Dockerfile b/traefik/Dockerfile deleted file mode 100644 index efb2b364..00000000 --- a/traefik/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM traefik:alpine - -RUN apk add --no-cache bash - -COPY conf /conf -COPY start.sh /start.sh - -CMD /start.sh diff --git a/traefik/conf/cert.toml b/traefik/conf/cert.toml deleted file mode 100644 index dab3cccb..00000000 --- a/traefik/conf/cert.toml +++ /dev/null @@ -1,24 +0,0 @@ -defaultEntryPoints = ["http", "https"] -logLevel = "ERROR" -accessLogsFile = "/dev/stdout" - -[entryPoints] - [entryPoints.http] - address = ":80" - [entryPoints.http.redirect] - entryPoint = "https" - [entryPoints.https] - address = ":443" - [entryPoints.https.tls] - MinVersion = "VersionTLS11" - CipherSuites = ["TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA", "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"] - [[entryPoints.https.tls.certificates]] - CertFile = "/certs/cert.pem" - KeyFile = "/certs/key.pem" - -[docker] -endpoint = "unix:///docker.sock" -domain = "{{ DOMAIN }}" -watch = true -exposedbydefault = false - diff --git a/traefik/conf/letsencrypt.toml b/traefik/conf/letsencrypt.toml deleted file mode 100644 index ddc2a7b4..00000000 --- a/traefik/conf/letsencrypt.toml +++ /dev/null @@ -1,29 +0,0 @@ -defaultEntryPoints = ["http", "https"] -logLevel = "ERROR" -accessLogsFile = "/dev/stdout" - -[entryPoints] - [entryPoints.http] - address = ":80" - [entryPoints.http.redirect] - entryPoint = "https" - [entryPoints.https] - address = ":443" - [entryPoints.https.tls] - MinVersion = "VersionTLS11" - CipherSuites = ["TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA", "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"] - -[docker] -endpoint = "unix:///docker.sock" -domain = "{{ DOMAIN }}" -watch = true -exposedbydefault = false - -[acme] -email = "{{ POSTMASTER }}@{{ DOMAIN }}" -storageFile = "/certs/acme.json" -onDemand = false -OnHostRule = true -entryPoint = "https" - - diff --git a/traefik/conf/notls.toml b/traefik/conf/notls.toml deleted file mode 100644 index 3226aa3f..00000000 --- a/traefik/conf/notls.toml +++ /dev/null @@ -1,14 +0,0 @@ -defaultEntryPoints = ["http"] -logLevel = "ERROR" -accessLogsFile = "/dev/stdout" - -[entryPoints] - [entryPoints.http] - address = ":80" - -[docker] -endpoint = "unix:///docker.sock" -domain = "{{ DOMAIN }}" -watch = true -exposedbydefault = false - diff --git a/traefik/start.sh b/traefik/start.sh deleted file mode 100755 index ee148a6d..00000000 --- a/traefik/start.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# Substitute configuration -for VARIABLE in `env | cut -f1 -d=`; do - sed -i "s={{ $VARIABLE }}=${!VARIABLE}=g" /conf/*.toml -done - -# Select the proper configuration -cp /conf/$TLS_FLAVOR.toml /conf/traefik.toml - -exec traefik -c /conf/traefik.toml -