diff --git a/dokuwiki/docker-compose.yml b/dokuwiki/docker-compose.yml index b87f172..cc47a1d 100644 --- a/dokuwiki/docker-compose.yml +++ b/dokuwiki/docker-compose.yml @@ -2,14 +2,30 @@ version: '3.7' services: dokuwiki: image: bitnami/dokuwiki - ports: - - '8080:80' + labels: + - "traefik.enable=true" + - "traefik.http.routers.wiki.entrypoints=https" + - "traefik.http.routers.wiki.rule=Host(`${DOMAIN}`)" + - "traefik.http.routers.wiki.tls=true" + - "traefik.http.routers.wiki.tls.certresolver=letsEncrypt" + - "traefik.http.routers.wiki.service=wiki-service" + - "traefik.http.services.wiki-service.loadbalancer.server.port=8080" environment: - DOKUWIKI_USERNAME=admin - DOKUWIKI_PASSWORD=admin - DOKUWIKI_WIKI_NAME=amega-wiki volumes: - data:/bitnami' + networks: + - wikinet + - webproxy volumes: data: + +networks: + wikinet: + name: wikinet + webproxy: + name: webproxy + external: true diff --git a/traefik-repo/traefik/data/custom/s3-minio.domain.ru.yml.example b/traefik-repo/traefik/data/custom/s3-minio.domain.ru.yml similarity index 68% rename from traefik-repo/traefik/data/custom/s3-minio.domain.ru.yml.example rename to traefik-repo/traefik/data/custom/s3-minio.domain.ru.yml index a33e941..8a6189e 100644 --- a/traefik-repo/traefik/data/custom/s3-minio.domain.ru.yml.example +++ b/traefik-repo/traefik/data/custom/s3-minio.domain.ru.yml @@ -3,7 +3,7 @@ http: s3-minio: entryPoints: - https - rule: Host(`s3.domain.ru`) + rule: Host(`s3.rmcert.ru`) service: s3-minio-service tls: certResolver: letsEncrypt @@ -13,8 +13,7 @@ http: healthCheck: path: /minio/health/live scheme: http + interval: "10s" + timeout: "5s" servers: - url: http://192.168.1.3:9000 - - url: http://192.168.1.4:9000 - - url: http://192.168.1.5:9000 - - url: http://192.168.1.6:9000 diff --git a/traefik-repo/traefik/data/traefik.yml b/traefik-repo/traefik/data/traefik.yml index 1c77407..e7824b4 100644 --- a/traefik-repo/traefik/data/traefik.yml +++ b/traefik-repo/traefik/data/traefik.yml @@ -28,9 +28,9 @@ providers: docker: endpoint: "unix:///var/run/docker.sock" exposedByDefault: false - # file: - # directory: /custom - # watch: true + file: + directory: /custom + watch: true # kubernetesIngress: # endpoint: "https://rke.domain.ru/k8s/clusters/c-xxxxx" # token: "" # Token from Rancher diff --git a/traefik-repo/traefik/docker-compose.yml b/traefik-repo/traefik/docker-compose.yml index 02b11c3..bd5b510 100644 --- a/traefik-repo/traefik/docker-compose.yml +++ b/traefik-repo/traefik/docker-compose.yml @@ -17,7 +17,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro - ./data/traefik.yml:/traefik.yml:ro - ./data/acme.json:/acme.json - # - ./data/custom/:/custom/:ro + - ./data/custom/:/custom/:ro - ./data/basic.auth:/basic.auth labels: - "traefik.enable=true"