3.diff (6950B)
1 diff --git a/config/nordgedanken.dev.yaml b/config/nordgedanken.dev.yaml 2 index 73650c2..6b8607c 100644 3 --- a/config/nordgedanken.dev.yaml 4 +++ b/config/nordgedanken.dev.yaml 5 @@ -31,6 +31,8 @@ 6 values: 7 - google-site-verification=SkIjIdwvyBPvaivZFa5KgLX22pwSJdINdaTf0XAi5Qc 8 - v=spf1 mx a:mail.nordgedanken.dev ip4:65.21.116.72 ~all 9 + 10 +# Email 11 _autodiscover._tcp: 12 ttl: 1800 13 type: SRV 14 @@ -39,25 +41,13 @@ _autodiscover._tcp: 15 priority: 10 16 target: mail.nordgedanken.dev. 17 weight: 1 18 -_dmarc: 19 +_dmarc: &dmarc 20 ttl: 1800 21 type: TXT 22 value: v=DMARC1\; p=reject\; adkim=s\; aspf=s\; rua=mailto:postmaster@mail.nordgedanken.dev\; 23 ruf=mailto:postmaster@mail.nordgedanken.dev 24 -_dmarc.mail: 25 - ttl: 1800 26 - type: TXT 27 - value: v=DMARC1\; p=reject\; adkim=s\; aspf=s\; rua=mailto:postmaster@mail.nordgedanken.dev\; 28 - ruf=mailto:postmaster@mail.nordgedanken.dev 29 -_imap._tcp: 30 - ttl: 1800 31 - type: SRV 32 - value: 33 - port: 143 34 - priority: 20 35 - target: mail.nordgedanken.dev. 36 - weight: 1 37 -_imap._tcp.mail: 38 +_dmarc.mail: *dmarc 39 +_imap._tcp: &imap_tcp 40 ttl: 1800 41 type: SRV 42 value: 43 @@ -65,15 +55,8 @@ _imap._tcp.mail: 44 priority: 20 45 target: mail.nordgedanken.dev. 46 weight: 1 47 -_imaps._tcp: 48 - ttl: 1800 49 - type: SRV 50 - value: 51 - port: 993 52 - priority: 10 53 - target: mail.nordgedanken.dev. 54 - weight: 1 55 -_imaps._tcp.mail: 56 +_imap._tcp.mail: *imap_tcp 57 +_imaps._tcp: &imaps_tcp 58 ttl: 1800 59 type: SRV 60 value: 61 @@ -81,7 +64,8 @@ _imaps._tcp.mail: 62 priority: 10 63 target: mail.nordgedanken.dev. 64 weight: 1 65 -_pop3._tcp: 66 +_imaps._tcp.mail: *imaps_tcp 67 +_pop3._tcp: &pop3_tcp 68 ttl: 1800 69 type: SRV 70 value: 71 @@ -89,15 +73,8 @@ _pop3._tcp: 72 priority: 20 73 target: mail.nordgedanken.dev. 74 weight: 1 75 -_pop3._tcp.mail: 76 - ttl: 1800 77 - type: SRV 78 - value: 79 - port: 110 80 - priority: 20 81 - target: mail.nordgedanken.dev. 82 - weight: 1 83 -_pop3s._tcp: 84 +_pop3._tcp.mail: *pop3_tcp 85 +_pop3s._tcp: &pop3s_tcp 86 ttl: 1800 87 type: SRV 88 value: 89 @@ -105,23 +82,8 @@ _pop3s._tcp: 90 priority: 10 91 target: mail.nordgedanken.dev. 92 weight: 1 93 -_pop3s._tcp.mail: 94 - ttl: 1800 95 - type: SRV 96 - value: 97 - port: 995 98 - priority: 10 99 - target: mail.nordgedanken.dev. 100 - weight: 1 101 -_submission._tcp: 102 - ttl: 1800 103 - type: SRV 104 - value: 105 - port: 587 106 - priority: 20 107 - target: mail.nordgedanken.dev. 108 - weight: 1 109 -_submission._tcp.mail: 110 +_pop3s._tcp.mail: *pop3s_tcp 111 +_submission._tcp: &submission_tcp 112 ttl: 1800 113 type: SRV 114 value: 115 @@ -129,7 +91,8 @@ _submission._tcp.mail: 116 priority: 20 117 target: mail.nordgedanken.dev. 118 weight: 1 119 -_submissions._tcp: 120 +_submission._tcp.mail: *submission_tcp 121 +_submissions._tcp: &submissions_tcp 122 ttl: 1800 123 type: SRV 124 value: 125 @@ -137,38 +100,12 @@ _submissions._tcp: 126 priority: 10 127 target: mail.nordgedanken.dev. 128 weight: 1 129 -_submissions._tcp.mail: 130 - ttl: 1800 131 - type: SRV 132 - value: 133 - port: 465 134 - priority: 10 135 - target: mail.nordgedanken.dev. 136 - weight: 1 137 -auth: 138 - ttl: 1800 139 - type: A 140 - value: 65.21.116.72 141 +_submissions._tcp.mail: *submissions_tcp 142 autoconfig: 143 ttl: 1800 144 type: CNAME 145 value: mail.nordgedanken.dev. 146 -barcodebuddy: 147 - ttl: 1800 148 - type: A 149 - value: 65.21.116.72 150 -ci: 151 - ttl: 1800 152 - type: A 153 - value: 65.21.116.72 154 -cloud: 155 - ttl: 1800 156 - type: A 157 - value: 65.21.116.72 158 -console.s3.stream: 159 - ttl: 1800 160 - type: A 161 - value: 65.21.116.72 162 + 163 dkim._domainkey: 164 ttl: 1800 165 type: TXT 166 @@ -177,26 +114,11 @@ dkim._domainkey.mail: 167 ttl: 1800 168 type: TXT 169 value: v=DKIM1\; k=rsa\; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzq73h8EUXEpSzIMWppGWr08k0OpPJDZ6ohrTHlTGfELjxfLoY0ZKM1OsWhpTrFimRWWSoXCUQCfshSDw6KWEgF1TeTh/+jhBoyJwUH37phC/jrXBV7Zqs6iAcwCw1gznV2wWs/uBcJcamD8RRq2wwBN9cIZksca7J/Tkm3WzcxqriX8PpSm4cbYl1MjDl5K8JWTIxNWlRXKyDW8H4II7NPnwOK8keExYEIh7AkE4suegtu73dxEwSz7Ct9a+Ch8mNZsG3WI2JldlKRkvUJB3CdFYHXIjRV4ibghoZEFzYQN8LIz3l6BRxFgvLDVXYj0v21fMXa3nxes+2ou2/qfrGwIDAQAB 170 -git: 171 - ttl: 1800 172 - type: A 173 - value: 65.21.116.72 174 -github-hook: 175 - ttl: 1800 176 - type: A 177 - value: 65.21.116.72 178 -gitlab: 179 - ttl: 1800 180 - type: A 181 - value: 65.21.116.72 182 -grocy: 183 - ttl: 1800 184 - type: A 185 - value: 65.21.116.72 186 -kas: 187 +mail.nordgedanken.dev._report._dmarc.mail: 188 ttl: 1800 189 - type: A 190 - value: 65.21.116.72 191 + type: TXT 192 + value: v=DMARC1 193 + 194 mail: 195 - ttl: 1800 196 type: A 197 @@ -209,14 +131,35 @@ mail: 198 - ttl: 1800 199 type: TXT 200 value: v=spf1 mx a:mail.nordgedanken.dev ip4:65.21.116.72 ~all 201 -mail.k8s: 202 + 203 +mta-sts: 204 + ttl: 1800 205 + type: CNAME 206 + value: mail.nordgedanken.dev. 207 +mta-sts.mail.k8s: 208 ttl: 1800 209 type: A 210 value: 65.21.116.72 211 -mail.nordgedanken.dev._report._dmarc.mail: 212 + 213 +nordgedanken.dev._report._dmarc.mail: 214 ttl: 1800 215 type: TXT 216 value: v=DMARC1 217 + 218 +# Kubernetes 219 +kubernetes: &kubernetes 220 + ttl: 1800 221 + type: A 222 + value: 65.21.116.72 223 +auth: *kubernetes 224 +git: *kubernetes 225 +github-hook: *kubernetes 226 +mail.k8s: *kubernetes 227 +netbox: *kubernetes 228 +paperless: *kubernetes 229 +search: *kubernetes 230 + 231 +# Others 232 mastodon: 233 - ttl: 1800 234 type: A 235 @@ -224,14 +167,6 @@ mastodon: 236 - ttl: 1800 237 type: AAAA 238 value: 2a01:4f9:4a:451c:2::2 239 -minio: 240 - ttl: 1800 241 - type: A 242 - value: 65.21.116.72 243 -miounne: 244 - ttl: 1800 245 - type: CNAME 246 - value: nordgedanken.dev. 247 moderation_widget: 248 - ttl: 1800 249 type: A 250 @@ -239,33 +174,15 @@ moderation_widget: 251 - ttl: 1800 252 type: AAAA 253 value: 2a01:4f9:4a:451c:2::2 254 -morg: 255 - ttl: 1800 256 - type: CNAME 257 - value: mtrnord.github.io. 258 -mta-sts: 259 - ttl: 1800 260 - type: CNAME 261 - value: mail.nordgedanken.dev. 262 -mta-sts.mail.k8s: 263 - ttl: 1800 264 - type: A 265 - value: 65.21.116.72 266 -netbird: 267 +stats: 268 - ttl: 1800 269 type: A 270 - value: 65.21.116.74 271 + value: 116.202.1.213 272 - ttl: 1800 273 type: AAAA 274 value: 2a01:4f9:4a:451c:2::2 275 -netbox: 276 - ttl: 1800 277 - type: A 278 - value: 65.21.116.72 279 -nordgedanken.dev._report._dmarc.mail: 280 - ttl: 1800 281 - type: TXT 282 - value: v=DMARC1 283 + 284 +# Nameserver 285 ns1: 286 - ttl: 1800 287 type: A 288 @@ -287,62 +204,3 @@ ns3: 289 - ttl: 1800 290 type: AAAA 291 value: 2a01:4f9:c012:3124::1 292 -pages: 293 - ttl: 1800 294 - type: A 295 - value: 65.21.116.73 296 -paperless: 297 - ttl: 1800 298 - type: A 299 - value: 65.21.116.72 300 -registry: 301 - ttl: 1800 302 - type: A 303 - value: 65.21.116.72 304 -s3.stream: 305 - ttl: 1800 306 - type: A 307 - value: 65.21.116.72 308 -search: 309 - ttl: 1800 310 - type: A 311 - value: 65.21.116.72 312 -social: 313 - ttl: 1800 314 - type: A 315 - value: 65.21.116.72 316 -stats: 317 - - ttl: 1800 318 - type: A 319 - value: 116.202.1.213 320 - - ttl: 1800 321 - type: AAAA 322 - value: 2a01:4f9:4a:451c:2::2 323 -status: 324 - ttl: 1800 325 - type: CNAME 326 - value: mtrnord.github.io. 327 -stream: 328 - ttl: 1800 329 - type: A 330 - value: 65.21.116.72 331 -support: 332 - ttl: 1800 333 - type: A 334 - value: 65.21.116.72 335 -time: 336 - ttl: 1800 337 - type: A 338 - value: 65.21.116.72 339 -trans: 340 - ttl: 1800 341 - type: A 342 - value: 65.21.116.72 343 -vault: 344 - ttl: 1800 345 - type: A 346 - value: 65.21.116.72 347 -www: 348 - ttl: 1800 349 - type: CNAME 350 - value: nordgedanken.dev.