nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

nixos/tests/matrix-synapse: resolve deprecation warning

+28 -32
+28 -32
nixos/tests/matrix/synapse.nix
··· 67 67 ... 68 68 }: 69 69 let 70 - mailserverIP = nodes.mailserver.config.networking.primaryIPAddress; 70 + mailserverIP = nodes.mailserver.networking.primaryIPAddress; 71 71 in 72 72 { 73 73 services.matrix-synapse = { ··· 169 169 }; 170 170 171 171 # test mail delivery 172 - mailserver = 173 - args: 174 - let 175 - in 176 - { 177 - security.pki.certificateFiles = [ 178 - mailerCerts.ca.cert 179 - ]; 172 + mailserver = args: { 173 + security.pki.certificateFiles = [ 174 + mailerCerts.ca.cert 175 + ]; 180 176 181 - networking.firewall.enable = false; 177 + networking.firewall.enable = false; 182 178 183 - services.postfix = { 184 - enable = true; 185 - enableSubmission = true; 179 + services.postfix = { 180 + enable = true; 181 + enableSubmission = true; 186 182 187 - # blackhole transport 188 - transport = "example.com discard:silently"; 183 + # blackhole transport 184 + transport = "example.com discard:silently"; 189 185 190 - settings.main = { 191 - myhostname = "${mailerDomain}"; 192 - # open relay for subnet 193 - mynetworks_style = "subnet"; 194 - debug_peer_level = "10"; 195 - smtpd_relay_restrictions = [ 196 - "permit_mynetworks" 197 - "reject_unauth_destination" 198 - ]; 186 + settings.main = { 187 + myhostname = "${mailerDomain}"; 188 + # open relay for subnet 189 + mynetworks_style = "subnet"; 190 + debug_peer_level = "10"; 191 + smtpd_relay_restrictions = [ 192 + "permit_mynetworks" 193 + "reject_unauth_destination" 194 + ]; 199 195 200 - # disable obsolete protocols, something old versions of twisted are still using 201 - smtpd_tls_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3"; 202 - smtpd_tls_mandatory_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3"; 203 - smtpd_tls_chain_files = [ 204 - "${mailerCerts.${mailerDomain}.key}" 205 - "${mailerCerts.${mailerDomain}.cert}" 206 - ]; 207 - }; 196 + # disable obsolete protocols, something old versions of twisted are still using 197 + smtpd_tls_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3"; 198 + smtpd_tls_mandatory_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3"; 199 + smtpd_tls_chain_files = [ 200 + "${mailerCerts.${mailerDomain}.key}" 201 + "${mailerCerts.${mailerDomain}.cert}" 202 + ]; 208 203 }; 209 204 }; 205 + }; 210 206 211 207 serversqlite = args: { 212 208 services.matrix-synapse = {