Update Terraform cloudflare to v4

ansible/files/nginx-docker.conf

@@ -7,6 +7,8 @@ server {
     server_name {{ server_name }};
     set $upstream {{ upstream }};
 
+    access_log /var/log/nginx/{{ server_name|split|first }}.log main;
+
     ssl_certificate {{ ssl_cert_path }}/fullchain.pem;
     ssl_certificate_key {{ ssl_cert_path }}/privkey.pem;
     ssl_trusted_certificate {{ ssl_cert_path }}/chain.pem;

ansible/roles/comentario/files/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   comentario:
-    image: registry.gitlab.com/comentario/comentario:v3.10.0
+    image: registry.gitlab.com/comentario/comentario:v3.11.0
     restart: unless-stopped
     user: "{{ docker_user.id }}:{{ docker_user.id }}"
     depends_on:

ansible/roles/forgejo/files/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   forgejo:
-    image: code.forgejo.org/forgejo/forgejo:8-rootless
+    image: code.forgejo.org/forgejo/forgejo:9-rootless
     user: "{{ docker_user.id }}:{{ docker_user.id }}"
     environment:
       - TZ={{ timezone }}

ansible/roles/mastodon/files/docker-compose.yml

@@ -1,19 +1,22 @@
 services:
   mastodon:
-    image: lscr.io/linuxserver/mastodon:4.2.12
+    image: lscr.io/linuxserver/mastodon:4.3.1
     environment:
       - TZ={{ timezone }}
       - PUID={{ docker_user.id }}
       - PGID={{ docker_user.id }}
       - LOCAL_DOMAIN=theorangeone.net
       - WEB_DOMAIN=mastodon.theorangeone.net
-      - DATABASE_URL=postgresql://mastodon:mastodon@db/mastodon
+      - DATABASE_URL=postgresql://mastodon:mastodon@db:5432/mastodon
       - REDIS_URL=redis://redis
       - SIDEKIQ_REDIS_URL=redis://redis/1
       - SECRET_KEY_BASE={{ vault_secret_key_base }}
       - OTP_SECRET={{ vault_otp_secret }}
       - VAPID_PRIVATE_KEY={{ vault_vapid_private_key }}
       - VAPID_PUBLIC_KEY={{ vault_vapid_public_key }}
+      - ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY={{ vault_active_record_encryption_deterministic_key }}
+      - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT={{ vault_active_record_encryption_key_derivation_salt }}
+      - ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY={{ vault_active_record_encryption_primary_key }}
       - SINGLE_USER_MODE=true
       - DEFAULT_LOCALE=en
       - STREAMING_CLUSTER_NUM=1

ansible/roles/mastodon/vars/vault.yml

@@ -1,30 +1,42 @@
 $ANSIBLE_VAULT;1.1;AES256
-63646161653431383335313735643535313434613362343161373961633539373932313338343633
+61313731363564306234653163633231356330313936636631393536356434396530643065333731
-6637323935616636353731336531663635656532383166640a633335666633363136333433343266
+3534663665643665613164343931646262643231356337350a333262356130636265643465323263
-37383237623837616464613561633931613230623633313533393464646464646566366330323365
+34333463353131323930636566633462613561333733636230363066343834316664363036346635
-6563396262363238320a303433636266616635313536396132366239343230656432626639653230
+6666363330383337340a316635663663343034613039353835633035633036646131303365626466
-63336165323337393664373635616532643935343363303766376533366661663366623939653564
+38636438323537303134356162633666376236346635366161356430376366626637343362363039
-35363335396266363532653038623038383836383236366466366339343433393338343566653834
+33356332333362363834373137633130306161393430393830643363636463633234646634306265
-30393761626537313531346466373136666565653731663430376664353737663039643263303533
+34366438333132633937303661356134383831373765306339363161643132393737356434653832
-35663836626462333262356330616131316432326139616165363831393036343235663736626661
+31346166333539643161346130386565376630333435376661343666636239666138316337633463
-35666264346563306133306565636261633766616135616366376430643763333031353534373033
+37633237393063313633393732616364653930353661366136346139663030393530383533646265
-35373739333562313639376264343562363130373531313563643834613533653034316536323339
+34393236643439316364376236373431643536333561613135616338643538313238303530356136
-39646337376462656362666330643831653730393562316661326433633334353963306664396264
+34393864323365633166643434363262346233393938313463643162343761643831373639313830
-30373238653832613861633263383663616538366361336163373861613538613132353963373666
+31363837393934333064316463313562393939613034653762303764333730353165623765653430
-34376464333462633839396263396335613233356261666661313763333033376434626463663133
+32383961353162306431393331643262353635383761663330323239383732346535636138636634
-32646130333635656665396335393232346661303861626566663931303637653065313031323936
+64616631373765393033306562343433373733646331643930373663323837393438643331663062
-64333931393165343761376630666462343136353335343632323435306261633232633662353137
+39323564376436353032303362653261363730383062346664663462656230613238303430303561
-32323863343365623566316537343062393638393434323134633535313531333135666535323439
+63663461376139616237333864643461343130326637616264353132613930306238613634343636
-35613439373737396562613834373638356534326438646330663564366436333962626135363833
+62393835393336646133616438336266653762366163623032323131656638393234383532333237
-63653731383163653932383632306239663365323237363562306639643662393530633430386164
+34333030356638326139333636343865636335333665656534656466333135663562303637333136
-61613137663734636666633966663366393832353166343239656335396630323138366338616430
+62386134633330663364323730646134383534623835636633653236653232393232653163613435
-37653036303735383664656530626630616437373762343263643661343464326466353234316363
+64663437383233323435386163653933383634666630383862323831316166353837323461333961
-64643733363435656365343537626364643430316630663666373932663564623835646336633034
+39626563323364653731316361333534616361366435643266626164666463613836336639373835
-65646264346439356161353838353064626230636664373035336433356530326632613035316434
+64393038336333356431326532626463333332373465613364386461623533646266626264383332
-31613434366530323263383337316432316432373835343164313963643733626362393334623266
+61393338663162343831616566346133646166353431396139393237356332616437353538313236
-65356131626135336337383139643838333134616137366530353730646634633364353333646563
+35323263383036623761643430336462656430356164313561663437383530346434306438386533
-66333134616639363932613238346538623764663831353031383834613230393936386432623434
+34366262663261636365323235326532393436333962383032353236323761373239613836646564
-37393935346238633338323432613638616466623264656434393761623363356330623632323261
+33316433656636313261653364663966633431663762363133666631653835386131643061626161
-36393064316263666432663633323535363035323535653834323064383437343530306166306239
+39633065326130643134343139363266363362393938623261646231333833643034633638386162
-37316236313533393062623066336561373138636339393631313866303433643832383230656532
+37376263613839353365336563623830333338373339393830323834326234373833336237326365
-3137
+63366664323136303638643237366265653235363266333738343437313636663163663134363262
+32663533363539313238663237366330633738613733363932653031356263643935666166363536
+61383532373565383730363662613533333265636361333230333233396534353337653662363065
+38393937396337633430303831353831376666623061356239363534333537323662306530303639
+65303735343431623561356361373330343033643130393235336535623530303236356432353834
+62376163646362616465643730353866333464666365336336383466653462346334646231633736
+62336132343737303061396636313334333538396333626263396361386631313730363766653530
+66663461616530326261343931343330313836633966646661626361643064316261313234386635
+30306534396136656432653236343337656433396337393064313466653165396562393665363938
+63393232646164333263313136303236353465636139376232626563613835303561653935316332
+61373432613632663366383933343839363765396637306339363162616237366361306237336464
+37353336306536396466356432393766623061363938633736323431313237663464646364666131
+3737

ansible/roles/uptime_kuma/files/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   uptime-kuma:
-    image: louislam/uptime-kuma:1.23.13-alpine
+    image: louislam/uptime-kuma:1.23.15-alpine
     environment:
       - TZ={{ timezone }}
       - PUID={{ docker_user.id }}

ansible/roles/vaultwarden/files/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   vaultwarden:
-    image: vaultwarden/server:1.32.0-alpine
+    image: vaultwarden/server:1.32.3-alpine
     restart: unless-stopped
     user: "{{ docker_user.id }}:{{ docker_user.id }}"
     volumes:

ansible/roles/website/files/docker-compose.yml

@@ -14,7 +14,8 @@ services:
       - UNSPLASH_CLIENT_ID={{ vault_unsplash_client_id }}
       - SENTRY_DSN={{ vault_website_sentry_dsn }}
       - BASE_HOSTNAME=theorangeone.net
-      - WEB_CONCURRENCY=5
+      - GRANIAN_WORKERS=2
+      - GRANIAN_BLOCKING_THREADS=2
       - SEO_INDEX=true
       - ACTIVITYPUB_HOST=mastodon.theorangeone.net
     volumes:

terraform/.terraform.lock.hcl

@@ -17,37 +17,38 @@ provider "registry.terraform.io/backblaze/b2" {
 }
 
 provider "registry.terraform.io/cloudflare/cloudflare" {
-  version     = "2.27.0"
+  version     = "4.45.0"
-  constraints = "2.27.0"
+  constraints = "4.45.0"
   hashes = [
-    "h1:8aI3M91kMr7B1QV9G3IjGxrKmFMD3vGEJwI9VKb1YhY=",
+    "h1:/CGpnYMkLRDmqn4iAsh/jg7ELZ6QExUw03VdjKZyK5M=",
-    "h1:9UYkGgkiOMOv5/2rTfLXgflq/UwV83rczj3hCP1MBic=",
+    "h1:82C/ryqwQvxhBINYOOyF5ZzPW/k4zJ/RYT13eCdPgEc=",
-    "h1:AI4IEvBTQnESyWCRc/EHdarhu6ejYnQbBO5Y03m4a3s=",
+    "h1:8Wu1D7ZwbLGdHakLRAzoAJ5VqZ8I14qzkPv1OGNfIlg=",
-    "h1:Cbo1qOLvk5KYUp5+EhV3GkcxPMQXY+3mwkKeTqtykkI=",
+    "h1:CVq0CAibeueOuiNk0UQtwZvMLMof33n1BgskFPOymrk=",
-    "h1:E8XxO2sA+j9wjbehKyQym7e6nl/sTIZ6f3oLecctva0=",
+    "h1:FSS5Kq+L+CX1zARy8PhaF8edBFNgsLtds4Uo8MwJiK8=",
-    "h1:FuXwhMBWAIbOdUO5lZff8ls9ms/EH4MoxG20OLOvOkA=",
+    "h1:L4qsorLII7f8xSFmv6JOoWfLWDunWQEpK964Bxk7mtM=",
-    "h1:LS9s1uazT0H7k3H5q/1zeI8goj/W8RicA5NLdh0lMic=",
+    "h1:StO3PV5PDskSCnhoHhWHOPxu6hbzJUQggfLgOSkvhwg=",
-    "h1:NuXfGshoYN1Cm09EIaOUNtdLdxLfFTwAcHbAHhXNTWs=",
+    "h1:Tjo+Er9ets5YrTRIdP9LBmi4p89nL/W+A7r8a1MM9nI=",
-    "h1:ONNWuLzxhIMn84Tev4+9W2285nN5IdzUT44U9uftGRw=",
+    "h1:XIwT+AWvks1LTytePM9zls+O8ItxoqCfPOgHwuH9ivQ=",
-    "h1:WE9CXL4fBDnj6bIKAjiGTPb1lqEoD8ezHkkDWIg+EdY=",
+    "h1:aOXn/zuM1+5GGy/SSRx8q4EYCSTFE9Tr0twHPIf5/KE=",
-    "h1:gSl1jCJxo0oIzHJ7fYnP6FoXEHcLDLQvzUpSirYSldk=",
+    "h1:lb+YcuZ4guYd8zE51vgSnDsRAD9IV00Z15l1i1X52s8=",
-    "h1:oIaG4g43i2ts961qg2t1OPSgJ7OmvingS6MFscKwPps=",
+    "h1:pYwNXGjfXA2rUEmotGMLWgmavT9D2rdHnV3TpuIK3ko=",
-    "h1:r+Nd4IvXRHVLUVllMDRxryNV+XNwYdrBDsWCkRUoWKs=",
+    "h1:q1qrnPq6KkljwBrugCwzb7f0SVP4Lzkfh+EOLARY9V8=",
-    "h1:tLjQdB+6eHKdn71+JmafCFSAhXVxQcfXhdNhPNzpfGg=",
+    "h1:v9sL4cZLTV5Gu2004DDyy7209gT0JmudBCAD0WCr/JE=",
-    "zh:15b7e8f7516ebd37461fb5a3b843dd0c250158c8000a2dc55b7b6f02780bee0f",
+    "zh:00be2a6adc76615a368491c7a026098103b6286deb31e3cfb037365dd39f095f",
-    "zh:187eed008324c43be4af075a68cf375ec2f3999c87ead243e64743abf2cb01ab",
+    "zh:05bd072e6119f7a5abff05c6064001f745473119a956586cf77ae843cf55d666",
-    "zh:407e1e32d8e4e72740f8f467b545ee15feedde0999ad756964c5f3a66e7b4f1b",
+    "zh:228bbe61345c4e8e0bc6b698b4b9652abff65662ee72ede2aecb4c3efb91b243",
-    "zh:78580cb99e7288f7ec7d9ca8aed7c3be5cf60a8ea09bff65c575aedfe68a2e41",
+    "zh:2948aeefe71ba041c94082cf931ecc95510d93af0a61d0a287880f5b9d24b11a",
-    "zh:8581ea22cf58e277c793a49037b0156fef9ea5f425262b700912a173bc904820",
+    "zh:5dfc2c5e95843ca54957212ee3ecb7ff06f2cf60bfd6ca278b5249fd70ac18f5",
-    "zh:86a91c81c8ff75216870cd5545aa45a181a20459dd3a29cfea6ce0a6a7292711",
+    "zh:69922cb45559b0b0544b9c2d31ed2d0fac9121faa75bc2f523484785b45d8e2b",
-    "zh:a52e1919ce32b9acf66424b10d0e86405ce8f0b56ff2bf787a621739d7275a33",
+    "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:b83842a5f0b5fb3832d5e97e075a0080aa1c1599d2a50531685c4c967ff79d6f",
+    "zh:9d83a0cbf72327286f7dbd63cd4af89059c648163fe6ed21b1df768e0518d445",
-    "zh:bb905ea2ddd592807a32007cbc34ead882ba6e69bedfdf36e77c8c141a2055df",
+    "zh:a8e1982945822c7d7aaa6ba8602c7247d1a3fad15d612f30eb323491a637bf8d",
-    "zh:c3301c6008a851d556fe0a79093116644e07443626ff0191a33f74d0c4684018",
+    "zh:c6d41ebd69ddb23e3dad49a0ebf1da5a9c7d8706a4f55d953115d371f407928b",
-    "zh:c933232a6607cf9a50e3237457cfd242d049bf0621d1fee0f665f55d8d1faafa",
+    "zh:d03e5442b12846c2737f099d30cd23d9f85a0c6d65437ccb44819f9a6c4e1d7f",
-    "zh:cc63056eabb7bbc8e60ac810826878b22411afb82cd1ca1046c629d1f7487fdb",
+    "zh:d446f2e1186b35037aea03b0e27d8b032d2f069f194f84b3f0e2907b3a79a955",
-    "zh:e8c9b155647dff9f41bbee59e5953a6a992a5bab837add23d0cba981ad163a7b",
+    "zh:e4d7549a4c856524e01f3dd4d69f57119ea205f7a0fa38dcfe154475b4ae9258",
-    "zh:f1cefdc8c82cda6240e371fac00527acc45cacf8046484f967fc2bda2914eb81",
+    "zh:e64b8915cb9686f85e77115bd674f2faf4f29880688067d7d0f1376566fdb3b0",
+    "zh:f046efdc55e6385cdd69baaa06a929bef9fe6809d373b0d2d6c7df8f8c23eddc",
   ]
 }
 

terraform/terraform.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = "2.27.0"
+      version = "4.45.0"
     }
     aws = {
       source  = "hashicorp/aws"