roles/postfix/handlers/main.yml

@@ -19,7 +19,6 @@
     - transport
     - relocated
     - domains
-    - mailman_compat
     - msa_header_checks
 
 - name: update aliases db

roles/postfix/tasks/main.yml

@@ -29,7 +29,6 @@
     - header_checks
     - relocated
     - domains
-    - mailman_compat
     - msa_header_checks
   notify:
     - postmap additional files

roles/postfix/templates/main.cf.j2

@@ -188,7 +188,6 @@ alias_database = ${indexed}/aliases
 {% if postfix_server %}
 virtual_alias_maps =
   ${indexed}/users
-  ${indexed}/mailman_compat
   pcre:${config_directory}/users.pcre
 virtual_alias_domains =  ${indexed}/domains
 
@@ -196,7 +195,6 @@ virtual_alias_domains =  ${indexed}/domains
 local_recipient_maps =
   ${indexed}/users
   $alias_maps
-  ${indexed}/mailman_compat
   pcre:${config_directory}/transport.pcre
 relocated_maps = ${indexed}/relocated
 {% endif %}
@@ -209,7 +207,6 @@ relay_domains =
 transport_maps =
   ${indexed}/transport
   pcre:${config_directory}/transport.pcre
-  #${indexed}/temporary_mailman_maps
 
 {% if postfix_patchwork_enabled %}
 patchwork_destination_recipient_limit = 1

roles/prometheus/defaults/main.yml

@@ -64,3 +64,4 @@ blackbox_targets:
   smtp_starttls:
     - mail.archlinux.org:25
     - mail.archlinux.org:587
+    - lists.archlinux.org:25

roles/prometheus_exporters/files/borg-textcollector.sh

@@ -28,6 +28,29 @@ if [[ -f /usr/local/bin/borg ]]; then
   echo "# HELP borg_hetzner_last_archive_timestamp timestamp of last backup in UTC" >> $TMP_FILE
   echo "# TYPE borg_hetzner_last_archive_timestamp counter" >> $TMP_FILE
   echo "borg_hetzner_last_archive_timestamp $LAST_ARCHIVE_TIMESTAMP" >> $TMP_FILE;
+
+  REPO_SIZE=$(/usr/local/bin/borg info --json | jq '.cache.stats.unique_csize')
+
+  echo "# HELP borg_hetzner_repo_size_bytes amount of data stored in the repo in bytes" >> $TMP_FILE
+  echo "# TYPE borg_hetzner_repo_size_bytes gauge" >> $TMP_FILE
+  echo "borg_hetzner_repo_size_bytes $REPO_SIZE" >> $TMP_FILE
+
+  STORAGE_BOX_DF=$(sftp -P23 u236610.your-storagebox.de <<<df 2>/dev/null | tail -1)
+  STORAGE_BOX_SIZE=$(( 1024 * $(awk '{print $1}' <<<$STORAGE_BOX_DF) )) # KiB -> bytes
+  STORAGE_BOX_USED=$(( 1024 * $(awk '{print $2}' <<<$STORAGE_BOX_DF) )) # KiB -> bytes
+  STORAGE_BOX_FREE=$(( 1024 * $(awk '{print $3}' <<<$STORAGE_BOX_DF) )) # KiB -> bytes
+
+  echo "# HELP hetzner_storage_box_size_bytes storage box size in bytes (excl. snapshots)" >> $TMP_FILE
+  echo "# TYPE hetzner_storage_box_size_bytes gauge" >> $TMP_FILE
+  echo "hetzner_storage_box_size_bytes $STORAGE_BOX_SIZE" >> $TMP_FILE
+
+  echo "# HELP hetzner_storage_box_used_bytes storage box used space in bytes" >> $TMP_FILE
+  echo "# TYPE hetzner_storage_box_used_bytes gauge" >> $TMP_FILE
+  echo "hetzner_storage_box_used_bytes $STORAGE_BOX_USED" >> $TMP_FILE
+
+  echo "# HELP hetzner_storage_box_free_bytes storage box free space in bytes" >> $TMP_FILE
+  echo "# TYPE hetzner_storage_box_free_bytes gauge" >> $TMP_FILE
+  echo "hetzner_storage_box_free_bytes $STORAGE_BOX_FREE" >> $TMP_FILE
 fi
 
 # rsync.net borg
@@ -40,6 +63,12 @@ if [[ -f /usr/local/bin/borg-offsite ]]; then
   echo "# HELP borg_offsite_last_archive_timestamp timestamp of last backup in UTC" >> $TMP_FILE
   echo "# TYPE borg_offsite_last_archive_timestamp counter" >> $TMP_FILE
   echo "borg_offsite_last_archive_timestamp $LAST_ARCHIVE_TIMESTAMP" >> $TMP_FILE;
+
+  REPO_SIZE=$(/usr/local/bin/borg-offsite info --json | jq '.cache.stats.unique_csize')
+
+  echo "# HELP borg_offsite_repo_size_bytes amount of data stored in the repo in bytes" >> $TMP_FILE
+  echo "# TYPE borg_offsite_repo_size_bytes gauge" >> $TMP_FILE
+  echo "borg_offsite_repo_size_bytes $REPO_SIZE" >> $TMP_FILE
 fi
 
 mv -f $TMP_FILE $PROM_FILE

roles/rspamd/defaults/main.yml

+rspamd_dkim_use_esld: true

roles/rspamd/files/lists.archlinux.org.dkim-ed25519.key

+$ANSIBLE_VAULT;1.1;AES256
+32643030336361333038616163383438386231643663316431643636363464303539353638376335
+3163626433353836356262333164346466383331613566640a613037623732353665613536316666
+30306166616463643363616437366535363039376536323335336539333061366430356138613336
+3762623135336466320a343866353630353264643964613737653866306634303938313633653530
+62373336653566346333383139376334623562613166333537366230376566643832393937633537
+61303262343864316232306666316562356663326264383634646639373865386262613165363839
+39313531373034646339356139303261376466633965666439396133333164663031646135616534
+62666533613364363537646166656531653964373333313432616338386338633366343862623936
+3263

roles/rspamd/files/lists.archlinux.org.dkim-rsa.key

+$ANSIBLE_VAULT;1.1;AES256
+35313134333837626139363833656361626361623239616539396131313434663662363330306234
+3063313365333233626662303865396236633235393432350a396236663430343362353933333062
+32303633653561303634653636363664333933636631373563303863356663663133313661633630
+6365326439343132340a633763303830326263393566623463356665386562363934643065616434
+66353334383738643063336638353439656263343330316339613364326162373763373265373161
+37623835383737326639613564396535633165663730313762316135363832656331376234376133
+37363663383139626665353965616538343039323235336234616531303536393335613630633139
+36646361376532636634313062366465393766636264663333613032316533626561656465623864
+39633131636234633266616139313664336566623863663130633831643965346538623665646432
+32326561636265353639326236323138396562333237346366383638346337366161356335633238
+66303338613035343863383934373231356534393632643032306663323532646334326134643236
+32336665613834303935343330393239613565333564633464616364366636373337346464393136
+64366237623933633134643031336164366435623934656436343661373964366136366138323132
+62366465356232386566653338613465373766383030313935363263643138366438343130643439
+65376437646266396165353937316434303238356537636632316638383539613666636634396436
+62636461626263616164616330666633663537666262313430633731316462626361343037323638
+36326534396364633330623934353932646564306561306633636566353062396332386537306361
+37643766336133373836346334303935303030626138656436363036356530343935366434396432
+39333237623434623363333261316362303632373466313538666139613132383331306165356436
+62663561326232633563323462653066383063613938316337633338653764313134343634643465
+35653535653666383666396637666364363631373362373262666661383164636535616365666564
+39353864383766653231633035356531316436353939316265386431393463666432336331653739
+37363066396661636331343134333462306231343366326539363733633031393532336430346239
+61303866393731333237373031346565366236616135373435396234366136333236636263313832
+66366130623435333665303030336231326166303132386461623732663761393361303338386334
+64626439343263653432646339303565356438336132393436666363316430646164343632366539
+36353937656638666264343930373133366336313364363339666161363534633139643539366164
+34393430656262396461343232303239306666313862363236666436383331623839343534313863
+65646437316165623830356464363931386631353033373465613961616132376238616530323566
+64366638356531316431313931636336613537616336326539353039323130356430623761386536
+64343732643835613832343165646230323865616365636235316537666335363230666632313363
+38623032366437653866383166373964363962386231353166653262393638313430616164323765
+65316665353162303663653863343962656661643739666564343130653131636337653437623363
+61633465346638663732336336373535313031303635613763376661656464373033623233343437
+34656564306463356433633366323339326465303734656633383663303561646231363864663165
+63623130363935613837353036306537333531326133626134643461666566616365633963396366
+65313561326231626330613637356166376330353461393866376466616635343235373461626635
+36643636623538303863636366306665653034633637356266393236333839356461663164663066
+65646539643863613762383966356262656234353733656661343762353237363934643739393434
+63303561376135366666666630333338363831343133326137323432306666353466613232656334
+39623066343535333665646130363462646539313038656230313461373535383862356131613033
+62373338373066306137613531383338303330636365363932333238346639663961613364633739
+37353133396364386232373861313236316130313038623233623238366230626266373461613736
+36643139363237626339656633373763366335663264613832373565663335353033633339393465
+31353932636133636134663437323664623237333561366434653565326338363236653262363366
+37333738663531373231613532626433326232343062373061326631373864643763643138306238
+66636465373335383061663263316462326130336438613462636461313466663838616565663235
+30613730383766353365336661616234376435376336663861306439343965343537643461353364
+32653135646130323534383938383466653934616437366566366639646161663230386662636332
+61313461373564313464623864316365373764643661663163373262383563613432613037653537
+37323930323730623562343233656139376431366661643231373463396136643463663738383063
+64663862316161343632316132643065393437626639326335303764393835646162633736656461
+35633865616365363135316132643635316633643866383834333032353933656565303362366362
+39383739363937373438636531366138663363326264623036653632616336386132386533363466
+37343461383532373766616337363163646632383662316538326631333530356166383437316435
+63643131376564636336313766666463363039646361666265633562343131336661326135346265
+32363863396665616264393738323137316636623932376533343263373362386661666562616362
+38396632656132626635366562333130353662373433303539333836363338616161373366613663
+33653031393532323364363163353065653731306234626265656535656231633961663434353864
+30613932383263383164376164353464663135613931626665386437353865376133386333353535
+61396362333731393633616165313934376561326235663937643838633362663831316261656338
+37646230316561323934316465343263303564623330613733396263313463626138303535613262
+65643332616232376337656138313662616130653566646265666438303538343830356664376637
+37646230363666316235346539326662636638643365353665613666623261333961323564316535
+63373533323730326266336635623232363565323530653834393766373935356430666365616531
+61323331316130633664343261653765303731336234636137373333373737356430353365316566
+35626535643964633839636634343233313461356163633261656362376331306238383736623631
+62333236383163346130303565653538393932346661363563653462393262336662333233373861
+66623536333835616162393462363462386562633034373334653962623137613562633638646437
+61316230383538343839333931646264306134313266656536623537383930613561656536393238
+38303731366638393936633565383530623561313061376666333139643663646462656463376137
+62323138663035373331386166323638356534313937616338646331376635346566343230326563
+62396162343962626637373938643962653430613062356537303966656132653662626331613333
+36626332383435326236663166353133633133346364663866663564366630356234623862373866
+35376337343066623465323562303262623164306133616133323232313939373337326230313630
+33613366666632373366663836623339386531623863393336376333393937386434303430343230
+34393037343032393034396132323531323066373265316332366232643863653531396561383664
+65383137383832613332626264363562363134306362643732316430663734323331313538353938
+34313036353332313832313435666139396332623434616230346361323532323536363862303033
+36316361323465333838653663646435643164396365653561333130393636366438303961303032
+66316463366463313736383834626532313266633466323030306261336332396564303964366266
+30636366333032616566336433373637373330383637303865353066636539303934616461653431
+31363031613863353534653366633133626230646136353036663436643239626335343138313634
+33613762323439393137366262393230616636373735623432616537363663356566323164313336
+35323036663765353562636335666337616333633865643637396632663531363432306239383931
+35303364333035306336623038626330353834626162346434623131313638343462346335623032
+64623165333466623134326438343735663330633933646239393065663762623139383338393563
+61303766376463663365643461663265383433363232623438323132356432396662626465653535
+33346330646133393436396236363163336533656632376139633232613832633938623937376534
+35336264323064333939383365346537613566373539653862323139303161653362353235366638
+30633832353433386630303836346636326662376365626435366633306263666437393431303634
+65333039323331343237383131363363633364623330653666663766643963363562393564363632
+62356332653730343532363461393831396636373263353830653864653638363065313065393533
+34636336303830636666356464393164636363653866323733323265306133613165323136366136
+30356336316363633439303064316132343333653966616530666636333066323261613836663261
+39373235656636643931393636623261306237626166666135396231653935356434653066323563
+63396665333232633339373964623035303762363132636334666337326631653661626431316665
+34643831346161643963396463353663313632666663303232383630376430323138363161636236
+64363962333337336530613730643934653438626533386265653236613162613438306430303164
+35623737393131623661616638323266653462303866613636383536333434613638393432636364
+30326636616266643062643135653238623061653561396439316636363037383761653138353166
+64313331663236396532326139383564326430633236366638646637623736336332636464393738
+39346162313839616133336166356165346231346538346530666362663733323964646438303137
+30306638396264333034313132346137653433376638313830313261343534613136643234336435
+64393236373365663963646566643366306563333665306538663162343262653865366130633538
+61383163646166633835376435623939666338366463313363326638306430353639663332373665
+66653536636464653032656433356137333734393363303962343562646636636532303562663834
+63623430623163373865663339393361616530373162356365613264336631333866313661366630
+38343731353335316632323463646431633566383532356638383435323133393030633462623863
+61316633366365343833383238356636626164393630613463643838386537653039333435353139
+65633436326266393961326163353630666237313962346362353063303465353332376663346238
+35333766356331643261643661383763336334396131396365656563643031316565326636393639
+33373864346363393331373535363935363033656165613762333761613165383863316264353361
+32373035373264646433666563306661336534363462376638633937336664326335393864643565
+30626533316436313237373661636636396134643864616364633065363238643061643064633633
+62363335356536356566303935323038383332376433323536643761353966633032343361643335
+63323432643833643635346165326534643936623862303837363736323133653464623963343730
+65383564653566393865346662626435633466323032326236353433356131653034336634333663
+32393831623139386431343466643731383166343230336266353563656630333730616563356565
+31613436303434373134633133633538646138393563653938306436653262386432663537613432
+63663333353735383638666637656438303564363838303932656632333935353531373662323936
+62303864626334323464323865636464613566303930613537643732633537623734373930626537
+32386434663566623465636564666139663031303439383666356236346531343832333235386533
+63313062656161636464616131393736313534363138303562616436373134356238623232356163
+65353130633461656464316238346363376438313966366538323034653835363734663835633830
+38623962303266386131373364363366346565303237643932363031653466656531343834393639
+32616233343637383733613235333939313130333765643762616230626533663437663136356233
+65353031616432303137363166336438333934633434633034363931613532636531643039643539
+64343835333533393236343237373466313662643336363833643830656466376562643434353132
+63663736356632333563623532323761333830316166313162613361363430373238666566376661
+34623836306231666564303634333936303534313539613939613831636438653266323262613731
+63333361616536353733353664356164633735383536383163316337333539393461643933383334
+37636664303833363634626164373937643231343833373031383264373231626535306365363164
+61316338306265343631636663613138373063353837313136363331313537343065613530323137
+31303961366333323836656561323136633139643233623530323263333561353362313833373666
+61326634653035383234373032303834383165373562653761613431343335386236323831326466
+38616539386538336535653637663932353338383231656634613238616436666565353231336437
+33633838386230366162643331623265373037313530353165623638626433383765643731643338
+39356564316135653032303736646135636531393339313239616263633838643730363765656465
+63326163316661663632666136316436356239316266373966346266326431393335333961383137
+37396537373139396665396438336165383832353332396632343134313564336231313035643536
+65373436663634316534383337356435626162366137643837396337636530373730623535363434
+64363332386430613530383131653635363233663732306331393439376666356363326438343366
+65313030383235386563626536653162393737633537343862323833363565663136643830343562
+37353066636531303530303866316262666339616635306363333934303561363761316431363734
+34343936376264666661373066316163356239373763663836383930656265383361653931386538
+35613266666130303835383335383034316438346630303736316438313830663864643261333033
+36616330623361643331616335373437616561326165346333353836623337383738643963626662
+30636234323938393461656138646234323062396364366433373062356536323566353035386664
+30366533663331633465356563313766646134343164353230626663396233343265643231393531
+65333962653339666638653832613835323936396532393562326530633039663337306239306234
+30336262663630663262353233653063396333336430663637623361373336303532656332346530
+34396463333263636137636639363236353864646134316265333761636566343161656335316535
+61393266313366343637626466653436303063636634623236353430663734306337383634663734
+39356435623565656131646164323366653961613438383961336562313033373261313765613964
+34613336663561643835653534633838373830636336313562386138363434636239323030616464
+63333738616537366235323334633738643062613130386339323031653038363166616261663861
+34373963386436376239373739653866363530383633633031376631396334396661613063326233
+33656438343732393332313763336534393465353333323631313339313965393165303965393338
+39353639356232386563663331633439396361306239343633323538356639346663656261306538
+38623834306365653937393735623030366666643264323632643064386135646365353635666533
+64386464323264393161373461333834323263366536633830323733353664373065353833616632
+33326133643938663962626635363839306136633165306538356233666533313865363864643766
+34613634666531323566663032336662616232346137383163343330633665666338316438393834
+35636662613664373434663961643662343439303133363966303730666333383636373638613634
+64396338666233316330393934333536616539656630393064646130366265356236326530653463
+63353131333666626239653833363935306238393962303138356466626436343664326538346364
+63613532333538633338

roles/rspamd/tasks/main.yml

@@ -7,6 +7,11 @@
   notify:
     - reload rspamd
 
+- name: install dkim_signing.conf
+  template: src=dkim_signing.conf.j2 dest=/etc/rspamd/local.d/dkim_signing.conf owner=root group=root mode=0644
+  notify:
+    - reload rspamd
+
 - name: create rspamd dkim directory
   file: path=/var/lib/rspamd/dkim state=directory owner=rspamd group=rspamd mode=0750
 
@@ -24,8 +29,8 @@
 - name: install DKIM keys
   copy: src={{ item }} dest=/var/lib/rspamd/dkim/ owner=rspamd group=rspamd mode=0600
   loop:
-    - archlinux.org.dkim-ed25519.key
-    - archlinux.org.dkim-rsa.key
+    - "{{ rspamd_dkim_domain }}.dkim-ed25519.key"
+    - "{{ rspamd_dkim_domain }}.dkim-rsa.key"
   notify:
     - reload rspamd
 

roles/rspamd/files/local.d/dkim_signing.conf → roles/rspamd/templates/dkim_signing.conf.j2

 domain {
-  archlinux.org {
+  {{ rspamd_dkim_domain }} {
     selectors [
       {
         selector = "dkim-ed25519";
-        path = "/var/lib/rspamd/dkim/archlinux.org.dkim-ed25519.key";
+        path = "/var/lib/rspamd/dkim/{{ rspamd_dkim_domain }}.dkim-ed25519.key";
       },
       {
         selector = "dkim-rsa";
-        path = "/var/lib/rspamd/dkim/archlinux.org.dkim-rsa.key";
+        path = "/var/lib/rspamd/dkim/{{ rspamd_dkim_domain }}.dkim-rsa.key";
       }
     ]
   }
@@ -20,4 +20,4 @@ allow_hdrfrom_mismatch_sign_networks = true;
 allow_username_mismatch = true;
 use_domain = "header";
 sign_authenticated = true;
-use_esld = true;
+use_esld = {{ 'true' if rspamd_dkim_use_esld else 'false' }};

roles/rsync_net/templates/authorized_keys.j2

@@ -13,5 +13,5 @@
 
 # Client machines keys
 {% for client_key in client_ssh_keys.results %}
-command="/usr/bin/borg serve --restrict-to-path {{ backup_dir }}/{{ client_key['item'] }}",no-pty,no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-user-rc {{ client_key['stdout'] }}
+command="borg serve --restrict-to-path {{ backup_dir }}/{{ client_key['item'] }}",restrict {{ client_key['stdout'] }}
 {% endfor %}

tf-stage1/archlinux.tf

@@ -81,6 +81,7 @@ locals {
     }
     "lists.archlinux.org" = {
       server_type = "cx11"
+      domain      = "lists"
     }
     "mail.archlinux.org" = {
       server_type = "cx11"
@@ -167,9 +168,11 @@ locals {
   # Example:
   # "_github-challenge-archlinux" = { ttl = 600, value = "824af4446e" }
   archlinux_org_txt = {
-    "luna._domainkey.lists"           = { ttl = 600, value = "v=DKIM1; k=rsa; s=email; \" \"p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvXrAPvtdX8Jrk4zmyk8w9T2zdAJGe7z0+4XHWWiuzH8Zse6S7oXiS9CVaPOsu0TZqHqhuclASU7qh0NXFwWyi2xRPyJOqH2Clu7vHS3j5F4TjURFOp4/EbA0iQu4rbItl4AU11z2pGSEj5SykUsrH+jjdqzNqAG9d4lNvkTs6RRzPF3KhhY+XljaeysEyDSS4ap4E0DYcduSIX\" \"oD1exFv4SEbXThD9PC1u81w4xusnmwmfHtR7aazeqPDP+S+FqDRy2woCaQb/VMbqMYVuWTVKJ2RxFyTKredOOV2c5kzih7GViwoetll/rTqO4aVbeir9K4f6YZg85dSQtVwEat7LV+zBnQwp3ivWkrIk8VEdSsCSaJlgattBiPHsfFFv1xw4qi3h+UvfCGgz35dtlnzd/noGhNARg0Z+kaMSTjy75V1mKx5sCH0o8nAX2XU8akJfLz58Vg\" \"kTx/sfealtwNA0gTy1t1jV8q0OF5RA0IeMRgCzeH2USOZI98W+EAUsGG5653Vzmp3FJRWp1tWJwRJ0M/aZ3ka/G1iTx3rNNcadVk+4q3gz3KnlAlun+m58y8pNWKjYuxmu9xkDRwM/33rv98j0R8HZO7HFL+1vjKkxSEuzmnTQ2O9F76/OsQoDPZ1Z6nJRvK8ts8PQr4ASKohby62+1F1M8U2Xn7u84dYLUCAwEAAQ==" }
-    "dkim-ed25519._domainkey"         = { ttl = 600, value = "v=DKIM1; k=ed25519; p=XOHB7b7V1puX+FryNIhsjXHYIFqk+q6JRu4XQ7Jc8MQ=" }
-    "dkim-rsa._domainkey"             = { ttl = 600, value = "v=DKIM1; k=rsa; \" \"p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA1GjGrEczq7iHZbvT7wa4ltJz2jwSndUGdRHgfEPnGBeevOXEAlEFr4zsdkfZEaNaQLIhZNpvKAt/A+kkyalkj4u9AnxqeNsNmZflFl6TKgvh0tWNEP3+XNxfdQ7zfml4WggL/YdAjXngg42oZEUsnS/6iozOFn7bNvzqBx5PFJ21pgyuR8DWyLaeOt+p55dVed7DCKnKi11Xjiu7k\" \"H68W8rose7g8Fv9fecBatEE4jwloOXsjh+tH0iab1NSSSpIq6EdgcPrpmrllN3/n2J/kCGK6ztISB6vR7xWgvgHSMjmEL0GPWzohGPrw2UQhZhrNV8dJpiLRYmfK+rXaKF0Kqag/F0e4C4jCKFX7NYFcYXYRlN5QlDFjZvUmOILlgnZ8w/SdZUKzpLObGuwnANLG+WSOjw42p9mXVGN6AfOQPu8OjRjS1MyhcdDIbUvZiQjbmiVJ5frpYZ39BTg\" \"CIzYLJJ5932+3gnwROu1OeljWkpBkfHZXPzADus80l3Vxsk91XZVB36rN8tyuMownR/M4HNC7ZE/EBwOnn1mGH7bLd6pva8u5Qy8Y6LrDdYea5Kk7aZ2WJSSRTV+nkPvOEIx+DfsIWNfmkVWzmuVky96fRvwOCuh38w8zpmlqzhDuGSQrBaLFXwAC7LYQ6kPDHzrjQhs99ScR0ix6YclrmpimMcCAwEAAQ==" }
+    "dkim-ed25519._domainkey.lists" = { ttl = 600, value = "v=DKIM1; k=ed25519;p=ongbdFgt5Vimg/VRRbbSVRU4lBCkcYNaPA4K3JS/DnY=" }
+    "dkim-rsa._domainkey.lists"     = { ttl = 600, value = "v=DKIM1; k=rsa; \" \"p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4M+y3ZeB9eI3GVgcrvMcI1SYOveH7P5TTRstaCHTlE/aRTiCzu5h6zKwwxEiK6NR5ugbHpBtfFnfnsl1eoaXVFBQfNdDNglHllJOZGVxTnyrFjRJUk9zN+PV/Haz73nAe1hOAENgV8NKnTok1ntaOYSH1AEj4yTswfQkuN23NPrQc1eyy3+hGC+lYpud3xAAl+oT4QE76PaLgk6Hz\" \"HOvZmAPGD3azJZRbobninZZXTAEvZFuPkfpWeUreDU9Hk9VX3zOmnqTN+YjIS5CdV6+Ghem3dCkmR9j3gOZBeBUYD7b+cinTYe/PZO2OG/LWCwN11EYyf1LSBGhBJCF9HPGiGIdhy5T62nKvwDQS0bj1HL+y6pXZdv2C7KgH+lAZ0idpOQ2TtV5e0tlVdryY4QXY9m7mSQ84WsoEdGDsetOhiTEKuqyGnDoYa0wYbM5477LL6EOzS0x3ZC/mbOg\" \"B+FSdzmLWCH/WjuzMNpw9WU+u4BucwVbYcnZ1vAxQQOEnA/Ku9drRHMFixBwodQuMA78j8ICCMJKlUiXmbbL7OFoXBArYJ7lgVs7mlaoEaqzDPCyqs1lJ9kOxdNoZj5zdxERcQhLm+Yo/948i6Js/nkWT0eAjNlHxZuCg3B4z7L4lRZpaGt+vHdcGUIeDKW34O0dWxPwIUmQA4CwmhUB0HWL9UcCAwEAAQ==" }
+    "dkim-ed25519._domainkey"       = { ttl = 600, value = "v=DKIM1; k=ed25519; p=XOHB7b7V1puX+FryNIhsjXHYIFqk+q6JRu4XQ7Jc8MQ=" }
+    "dkim-rsa._domainkey"           = { ttl = 600, value = "v=DKIM1; k=rsa; \" \"p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA1GjGrEczq7iHZbvT7wa4ltJz2jwSndUGdRHgfEPnGBeevOXEAlEFr4zsdkfZEaNaQLIhZNpvKAt/A+kkyalkj4u9AnxqeNsNmZflFl6TKgvh0tWNEP3+XNxfdQ7zfml4WggL/YdAjXngg42oZEUsnS/6iozOFn7bNvzqBx5PFJ21pgyuR8DWyLaeOt+p55dVed7DCKnKi11Xjiu7k\" \"H68W8rose7g8Fv9fecBatEE4jwloOXsjh+tH0iab1NSSSpIq6EdgcPrpmrllN3/n2J/kCGK6ztISB6vR7xWgvgHSMjmEL0GPWzohGPrw2UQhZhrNV8dJpiLRYmfK+rXaKF0Kqag/F0e4C4jCKFX7NYFcYXYRlN5QlDFjZvUmOILlgnZ8w/SdZUKzpLObGuwnANLG+WSOjw42p9mXVGN6AfOQPu8OjRjS1MyhcdDIbUvZiQjbmiVJ5frpYZ39BTg\" \"CIzYLJJ5932+3gnwROu1OeljWkpBkfHZXPzADus80l3Vxsk91XZVB36rN8tyuMownR/M4HNC7ZE/EBwOnn1mGH7bLd6pva8u5Qy8Y6LrDdYea5Kk7aZ2WJSSRTV+nkPvOEIx+DfsIWNfmkVWzmuVky96fRvwOCuh38w8zpmlqzhDuGSQrBaLFXwAC7LYQ6kPDHzrjQhs99ScR0ix6YclrmpimMcCAwEAAQ==" }
+
     "_dmarc"                          = { value = "v=DMARC1; p=none; rua=mailto:dmarc-reports@archlinux.org; ruf=mailto:dmarc-reports@archlinux.org;" }
     "_github-challenge-archlinux"     = { value = "824af4446e" }
     "_github-challenge-archlinux.www" = { value = "b53f311f86" }
@@ -185,8 +188,7 @@ locals {
     "mail"       = { value = "v=spf1 ip4:${hcloud_server.machine["mail.archlinux.org"].ipv4_address} ip6:${hcloud_server.machine["mail.archlinux.org"].ipv6_address} ~all", ttl = 600 }
     "aur"        = { value = "v=spf1 ip4:${hcloud_server.machine["mail.archlinux.org"].ipv4_address} ip6:${hcloud_server.machine["mail.archlinux.org"].ipv6_address} ~all", ttl = 600 }
     "master-key" = { value = "v=spf1 ip4:${hcloud_server.machine["mail.archlinux.org"].ipv4_address} ip6:${hcloud_server.machine["mail.archlinux.org"].ipv6_address} ~all", ttl = 600 }
-    lists        = { ttl = 600, value = "v=spf1 ip4:5.9.250.164 ip6:2a01:4f8:160:3033::2 ~all" }
-    luna         = { ttl = 600, value = "v=spf1 ip4:5.9.250.164 ip6:2a01:4f8:160:3033::2 ~all" }
+    lists        = { value = "v=spf1 ip4:${hcloud_server.machine["lists.archlinux.org"].ipv4_address} ip6:${hcloud_server.machine["lists.archlinux.org"].ipv6_address} ~all", ttl = 600 }
   }
 
   # This creates archlinux.org MX DNS entries
@@ -200,7 +202,7 @@ locals {
     "@"        = { mx = "mail", ttl = 600 }
     aur        = { mx = "mail", ttl = 600 }
     master-key = { mx = "mail", ttl = 600 }
-    lists      = { mx = "luna", ttl = 600 }
+    lists      = { mx = "lists", ttl = 600 }
   }
 
   # This creates archlinux.org A/AAAA DNS entries in addition to those already specified by the VPSes.
@@ -233,11 +235,6 @@ locals {
       ipv4_address = "49.12.124.107"
       ipv6_address = "2a01:4f8:242:5614::2"
     }
-    lists = {
-      ipv4_address = "5.9.250.164"
-      ipv6_address = "2a01:4f8:160:3033::2"
-      ttl          = 600
-    }
     luna = {
       ipv4_address = "5.9.250.164"
       ipv6_address = "2a01:4f8:160:3033::2"