diff --git a/mastodon/docker-compose.yml b/mastodon/docker-compose.yml index 41abab4..fd165f7 100644 --- a/mastodon/docker-compose.yml +++ b/mastodon/docker-compose.yml @@ -136,7 +136,7 @@ services: # - triton.cns.services=mastodon-redis web: - image: tootsuite/mastodon:v4.2.0 + image: tootsuite/mastodon:v4.2.1 mem_limit: 1g restart: always env_file: .env.production @@ -149,7 +149,7 @@ services: - triton.cns.services=mastodon-web streaming: - image: tootsuite/mastodon:v4.2.0 + image: tootsuite/mastodon:v4.2.1 mem_limit: 1g restart: always env_file: .env.production @@ -162,7 +162,7 @@ services: - triton.cns.services=mastodon-streaming sidekiq: - image: tootsuite/mastodon:v4.2.0 + image: tootsuite/mastodon:v4.2.1 mem_limit: 1g restart: always env_file: .env.production diff --git a/terraform/lev-1/dns.tf b/terraform/lev-1/dns.tf index a6244f2..2b4ce70 100644 --- a/terraform/lev-1/dns.tf +++ b/terraform/lev-1/dns.tf @@ -6,28 +6,28 @@ resource "namecheap_domain_records" "pub-solar" { record { hostname = "flora-6" - type = "CNAME" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" } record { hostname = "auth" - type = "CNAME" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" } record { hostname = "ci" - type = "CNAME" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" } record { hostname = "git" - type = "CNAME" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" } record { hostname = "stream" - type = "CNAME" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" } record { hostname = "list" @@ -36,13 +36,13 @@ resource "namecheap_domain_records" "pub-solar" { } record { hostname = "obs-portal" - type = "CNAME" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" } record { hostname = "vpn" - type = "CNAME" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" } record { hostname = "cache" @@ -56,64 +56,64 @@ resource "namecheap_domain_records" "pub-solar" { } record { hostname = "collabora" - type = "CNAME" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" } record { hostname = "@" - type = "ALIAS" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" ttl = 300 } record { hostname = "chat" - type = "CNAME" - address = "matrix.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone." + type = "A" + address = "85.88.23.162" } record { hostname = "cloud" - type = "CNAME" - address = "nc-web.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.133" } record { hostname = "coturn" - type = "CNAME" - address = "nc-hpb.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.239" } record { hostname = "hpb" - type = "CNAME" - address = "nc-hpb.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.239" } record { hostname = "dimension" - type = "CNAME" - address = "matrix.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone." + type = "A" + address = "85.88.23.162" } record { hostname = "element" - type = "CNAME" - address = "matrix.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone." + type = "A" + address = "85.88.23.162" } record { hostname = "files" - type = "CNAME" - address = "mastodon-proxy.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone." + type = "A" + address = "85.88.23.161" } record { hostname = "mastodon" - type = "CNAME" - address = "mastodon-proxy.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone." + type = "A" + address = "85.88.23.161" } record { hostname = "matrix" - type = "CNAME" - address = "matrix.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone." + type = "A" + address = "85.88.23.162" } record { hostname = "www" - type = "CNAME" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" } record { hostname = "@"