Skip to content

Commit

Permalink
Dependabot mix (#54)
Browse files Browse the repository at this point in the history
* Remove legacy mailbox test
* Extend Dependabot scope for Docker

---------

Signed-off-by: Benoit Donneaux <[email protected]>
  • Loading branch information
btlogy authored May 12, 2023
1 parent 66e5525 commit 9567c03
Show file tree
Hide file tree
Showing 6 changed files with 116 additions and 372 deletions.
15 changes: 9 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,16 @@ updates:
reviewers:
- "btlogy"
- package-ecosystem: "docker"
directory: "/docker/mailbox"
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-major", "version-update:semver-minor"]
directory: "/.github/actions/magic-wormhole-secret"
schedule:
interval: "daily"
time: "12:00"
reviewers:
- "btlogy"
- package-ecosystem: "composer"
directory: "/ansible/docker"
schedule:
interval: "daily"
time: "12:00"
# Raise all docker pull requests with reviewers
reviewers:
- "la-test/sbx"
- "btlogy"
107 changes: 107 additions & 0 deletions ansible/docker/magic-wormhole-backend.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
version: "3.3"
services:
traefik:
image: "traefik:v2.9.10"
command:
- "--accesslog"
- "--metrics.datadog=true"
- "--metrics.datadog.address=172.18.0.1:8125"
- "--api.insecure=true"
- "--providers.docker=true"
- "--providers.docker.exposedbydefault=false"
- "--entrypoints.web.address=:80"
- "--entrypoints.webtls.address=:443"
- "--entrypoints.mailbox_ws.address=:4000"
- "--entrypoints.relay_tcp.address=:4001"
- "--entrypoints.relay_ws.address=:4002"
- "--certificatesresolvers.le.acme.tlschallenge=true"
- "[email protected]"
- "--certificatesresolvers.le.acme.storage=/letsencrypt/acme.json"
ports:
- "80:80"
- "443:443"
- "4000:4000"
- "4001:4001"
- "4002:4002"
volumes:
- "./letsencrypt:/letsencrypt"
- "/var/run/docker.sock:/var/run/docker.sock:ro"
mailbox:
image: leastauthority/magic-wormhole-mailbox:20230214-1
logging:
driver: "json-file"
options:
max-file: "5"
max-size: "1g"
labels:
- "traefik.enable=true"
- "traefik.http.routers.mailbox.rule=Host({{ '`' + mailbox_hosts|join('`,`') + '`' }})"
- "traefik.http.routers.mailbox.entrypoints=web"
- "traefik.http.routers.mailbox.service=mailbox-service"
- "traefik.http.routers.mailbox_tls.rule=Host({{ '`' + mailbox_hosts|join('`,`') + '`' }})"
- "traefik.http.routers.mailbox_tls.tls.certresolver=le"
- "traefik.http.routers.mailbox_tls.entrypoints=webtls"
- "traefik.http.routers.mailbox_tls.service=mailbox-service"
- "traefik.http.routers.mailbox_ws.rule=HostRegexp(`{catchall:.*}`)"
- "traefik.http.routers.mailbox_ws.entrypoints=mailbox_ws"
- "traefik.http.routers.mailbox_ws.service=mailbox-service"
- "traefik.http.services.mailbox-service.loadbalancer.server.port=4000"
volumes:
- "./mailbox_database:/db"
relay:
image: leastauthority/magic-wormhole-relay:20230214-1
logging:
driver: "json-file"
options:
max-file: "5"
max-size: "1g"
labels:
- "traefik.enable=true"
- "traefik.http.routers.relay.rule=Host({{ '`' + transit_hosts|join('`,`') + '`' }})"
- "traefik.http.routers.relay.entrypoints=web"
- "traefik.http.routers.relay.service=relay_ws-service"
- "traefik.http.routers.relay_tls.rule=Host({{ '`' + transit_hosts|join('`,`') + '`'}})"
- "traefik.http.routers.relay_tls.tls.certresolver=le"
- "traefik.http.routers.relay_tls.entrypoints=webtls"
- "traefik.http.routers.relay_tls.service=relay_ws-service"
- "traefik.tcp.routers.relay_tcp.rule=HostSNI(`*`)"
- "traefik.tcp.routers.relay_tcp.entrypoints=relay_tcp"
- "traefik.tcp.routers.relay_tcp.service=relay_tcp-service"
- "traefik.http.routers.relay_ws.rule=HostRegexp(`{catchall:.*}`)"
- "traefik.http.routers.relay_ws.entrypoints=relay_ws"
- "traefik.http.routers.relay_ws.service=relay_ws-service"
- "traefik.tcp.services.relay_tcp-service.loadbalancer.server.port=4001"
- "traefik.http.services.relay_ws-service.loadbalancer.server.port=4002"
volumes:
- "./relay_database:/db"
feedback:
image: leastauthority/feedback-http-server:0.1.3
logging:
driver: "json-file"
options:
max-file: "5"
max-size: "256m"
environment:
- SMTP_HELO={{ feedback_hosts[0] }}
- SMTP_SERVER=aspmx.l.google.com
- SMTP_PORT=25
- SMTP_USERNAME=feedback # Only to avoid warning when auth. is not required
- SMTP_PASSWORD=xxx # TODO: Remove user/pass when upstream is ready
- SMTP_USE_TLS=false
- SMTP_USE_INSECURE_TLS=false
- SMTP_FROM={{ feedback_from_addr }}
- SMTP_TO={{ feedback_to_addr }}
- HTTP_PORT=8001
labels:
- "traefik.enable=true"
- "traefik.http.routers.feedback.rule=Host({{ '`' + feedback_hosts|join('`,`') + '`' }})"
- "traefik.http.routers.feedback.entrypoints=web"
- "traefik.http.routers.feedback.service=feedback-service"
- "traefik.http.routers.feedback_tls.rule=Host({{ '`' + feedback_hosts|join('`,`') + '`'}})"
- "traefik.http.routers.feedback_tls.tls.certresolver=le"
- "traefik.http.routers.feedback_tls.entrypoints=webtls"
- "traefik.http.routers.feedback_tls.service=feedback-service"
- "traefik.http.routers.feedback.middlewares=redirect-to-https"
- "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
- "traefik.http.middlewares.redirect-to-https.redirectscheme.permanent=true"
- "traefik.http.services.feedback-service.loadbalancer.server.port=8001"
25 changes: 0 additions & 25 deletions docker/mailbox/Dockerfile

This file was deleted.

10 changes: 0 additions & 10 deletions docker/mailbox/Pipfile

This file was deleted.

Loading

0 comments on commit 9567c03

Please sign in to comment.