diff --git a/base.yml b/base.yml index 17da863..b0c3bb7 100644 --- a/base.yml +++ b/base.yml @@ -46,7 +46,7 @@ services: volumes: - production_traefik:/etc/traefik/acme - /var/run/docker.sock:/var/run/docker.sock:ro - #- ../mistborn_volumes/base/tls:/tls + - ../mistborn_volumes/base/tls:/tls ports: - "0.0.0.0:80:80/tcp" - "0.0.0.0:443:443/tcp" diff --git a/compose/production/traefik/Dockerfile b/compose/production/traefik/Dockerfile index 575a463..7088e6f 100644 --- a/compose/production/traefik/Dockerfile +++ b/compose/production/traefik/Dockerfile @@ -2,5 +2,4 @@ FROM traefik:alpine RUN mkdir -p /etc/traefik/acme RUN touch /etc/traefik/acme/acme.json RUN chmod 600 /etc/traefik/acme/acme.json -COPY ./tls /tls COPY ./compose/production/traefik/traefik.toml /etc/traefik diff --git a/compose/production/traefik/traefik.toml.template b/compose/production/traefik/traefik.toml.template index 47db874..19164ad 100644 --- a/compose/production/traefik/traefik.toml.template +++ b/compose/production/traefik/traefik.toml.template @@ -17,7 +17,7 @@ defaultEntryPoints = ["http", "https"] [entryPoints.https] address = ":443" [entryPoints.https.tls] - [entryPoints.httpSSL.tls.defaultCertificate] + [entryPoints.https.tls.defaultCertificate] certFile = "/tls/cert.crt" keyFile = "/tls/cert.key" diff --git a/scripts/install.sh b/scripts/install.sh index e1534f7..b1dc9c0 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -183,6 +183,8 @@ sudo mkdir -p ../mistborn_volumes/extra cp ./compose/production/traefik/traefik.toml.template ./compose/production/traefik/traefik.toml # setup tls certs source ./scripts/subinstallers/openssl.sh +sudo rm -rf ../mistborn_volumes/base/tls +sudo mv ./tls ../mistborn_volumes/base/ # Download docker images while DNS is operable sudo docker-compose -f base.yml pull || true