diff --git a/mastodon/docker-compose.yml b/mastodon/docker-compose.yml index 5c65175..be9ec56 100644 --- a/mastodon/docker-compose.yml +++ b/mastodon/docker-compose.yml @@ -42,7 +42,7 @@ services: - .env.production - db.env ports: - - 3344:3000 + - 3000:3000 command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000" networks: - traefik @@ -60,7 +60,7 @@ services: - traefik.http.routers.mastodonweb.rule=Host(`kvist.knast.cc`) - traefik.http.routers.mastodonweb.entrypoints=websecure - traefik.http.routers.mastodonweb.tls.certresolver=letsencr - - traefik.http.services.mastodonweb.loadbalancer.server.port=3344 + - traefik.http.services.mastodonweb.loadbalancer.server.port=3000 # labels: # - "traefik.enable=true" # # Main Web Router @@ -95,7 +95,7 @@ services: environment: - 'REDIS_URL=redis://redis:6379' ports: - - 4433:4000 + - 4000:4000 networks: - traefik - internal_network @@ -117,7 +117,7 @@ services: # - "traefik.http.routers.mstdn-streamer-rtr.rule=(Host(`kvist.knast.cc`) && PathPrefix(`/api/v1/streaming`))" # - "traefik.http.routers.mstdn-streamer-rtr.tls=true" # - "traefik.http.routers.mstdn-streamer-rtr.tls.certResolver=letsencr" - # - "traefik.http.services.mstdn-streamer-svc.loadbalancer.server.port=4433" + # - "traefik.http.services.mstdn-streamer-svc.loadbalancer.server.port=4000" sidekiq: diff --git a/restic/docker-compose.yml b/restic/docker-compose.yml index 3702073..3644d00 100644 --- a/restic/docker-compose.yml +++ b/restic/docker-compose.yml @@ -16,10 +16,10 @@ services: --tag restic-null-machine --verbose RESTIC_FORGET_ARGS: >- - --keep-last 10 - --keep-daily 7 - --keep-weekly 5 - --keep-monthly 12 + --keep-last 3 + --keep-daily 1 + --keep-weekly 2 + --keep-monthly 1 TZ: Europe/Copenhagen volumes: - where_to_backup:/restic