diff options
| author | Jenniferplusplus <contact@jenniferplusplus.com> | 2023-11-13 20:46:21 -0600 |
|---|---|---|
| committer | Jenniferplusplus <contact@jenniferplusplus.com> | 2023-11-13 20:46:21 -0600 |
| commit | ab2fad26ce97105d37fc2c96cfc6967d80e00da9 (patch) | |
| tree | ee82890b6a169440a0bfd4c923fe5982b9ac2550 | |
| parent | e7cf3fcb3c81a4451dbb088f4768d3b833ce80dc (diff) | |
| download | sandcastles-ab2fad26ce97105d37fc2c96cfc6967d80e00da9.tar.gz sandcastles-ab2fad26ce97105d37fc2c96cfc6967d80e00da9.tar.bz2 sandcastles-ab2fad26ce97105d37fc2c96cfc6967d80e00da9.zip | |
simplify service config a little
| -rw-r--r-- | mastodon.castle.yml | 11 | ||||
| -rw-r--r-- | pasture.castle.yml | 9 | ||||
| -rw-r--r-- | volumes/proxy/traefik.toml | 1 |
3 files changed, 4 insertions, 17 deletions
diff --git a/mastodon.castle.yml b/mastodon.castle.yml index df83712..597caf2 100644 --- a/mastodon.castle.yml +++ b/mastodon.castle.yml @@ -18,6 +18,7 @@ services: - traefik.http.routers.mastodon.tls=true - traefik.http.routers.mastodon.tls.certresolver=smallstep - traefik.port=3000 + - traefik.enable=true depends_on: - mastodon_db - mastodon_es @@ -43,8 +44,6 @@ services: - WEB_DOMAIN=mastodon.castle mastodon-streaming: - labels: - - traefik.enable=false depends_on: - mastodon image: docker.io/bitnami/mastodon:4 @@ -57,8 +56,6 @@ services: - MASTODON_ELASTICSEARCH_PASSWORD=bitnami123 - MASTODON_REDIS_HOST=mastodon_redis mastodon-sidekiq: - labels: - - traefik.enable=false depends_on: - mastodon image: docker.io/bitnami/mastodon:4 @@ -74,8 +71,6 @@ services: - MASTODON_REDIS_HOST=mastodon_redis - MASTODON_DATABASE_HOST=mastodon_db mastodon_db: - labels: - - traefik.enable=false image: docker.io/bitnami/postgresql:16 networks: - mastodon @@ -86,8 +81,6 @@ services: - POSTGRESQL_USERNAME=bn_mastodon - POSTGRESQL_PASSWORD=bitnami1 mastodon_redis: - labels: - - traefik.enable=false image: docker.io/bitnami/redis:7.0 volumes: - 'redis_data:/bitnami/redis' @@ -96,8 +89,6 @@ services: environment: - ALLOW_EMPTY_PASSWORD=yes mastodon_es: - labels: - - traefik.enable=false image: docker.io/bitnami/elasticsearch:8 networks: - mastodon diff --git a/pasture.castle.yml b/pasture.castle.yml index bd0ce8b..516daf1 100644 --- a/pasture.castle.yml +++ b/pasture.castle.yml @@ -1,8 +1,6 @@ services: pasture_one_actor: - labels: - - traefik.enable=false image: pasture-sandcastles build: dockerfile: ./pasture.Dockerfile @@ -12,14 +10,11 @@ services: networks: pasture: pasture_runner: - labels: - - traefik.enable=false image: pasture-sandcastles build: dockerfile: ./pasture.Dockerfile volumes: - ./volumes/pasture:/opt - - ./work:/work working_dir: /work depends_on: - pasture_one_actor @@ -29,8 +24,6 @@ services: networks: pasture: pasture_http_signature: - labels: - - traefik.enable=false image: pasture-sandcastles build: dockerfile: ./pasture.Dockerfile @@ -40,11 +33,13 @@ services: networks: pasture: pasture_verify_actor: + container_name: actor.pasture.castle labels: - traefik.http.routers.pasture.rule=Host(`actor.pasture.castle`) - traefik.http.routers.pasture.tls=true - traefik.http.routers.pasture.tls.certresolver=smallstep - traefik.port=80 + - traefik.enable=true image: pasture-sandcastles build: dockerfile: ./pasture.Dockerfile diff --git a/volumes/proxy/traefik.toml b/volumes/proxy/traefik.toml index c6d2e96..034461e 100644 --- a/volumes/proxy/traefik.toml +++ b/volumes/proxy/traefik.toml @@ -19,6 +19,7 @@ [providers.docker] watch = true network = "fediverse" + exposedByDefault = false [providers.file] filename = "/etc/traefik/traefik_dynamic.toml" |