36.diff (6723B)
1 diff --git a/config/midnightthoughts.space.yaml b/config/midnightthoughts.space.yaml 2 index 39a6407..a13c8d3 100644 3 --- a/config/midnightthoughts.space.yaml 4 +++ b/config/midnightthoughts.space.yaml 5 @@ -92,15 +92,7 @@ kubernetes_ingress: &kubernetes 6 #- '2a01:4f8:c012:492::1' 7 #- '2a01:4f9:c012:54d3::1' 8 - '2a01:4f9:c010:9436::2' 9 -sliding.matrix: *kubernetes 10 -weave: *kubernetes 11 -webhook.kubernetes: *kubernetes 12 zammad: *kubernetes 13 -fleet: *kubernetes 14 -hookshot: *kubernetes 15 -keycloak: *kubernetes 16 -users: *kubernetes 17 -admin.users: *kubernetes 18 19 vault: &new_cluster 20 - type: A 21 @@ -115,67 +107,15 @@ matrix: *new_cluster 22 dashboard.kubernetes: *new_cluster 23 auth: *new_cluster 24 25 -nordgedanken.lg: 26 - ttl: 1800 27 - type: A 28 - value: 10.0.1.2 29 notes: 30 ttl: 1800 31 type: CNAME 32 value: cname.vercel-dns.com. 33 -pbx: 34 - - ttl: 1800 35 - type: A 36 - value: 49.13.24.105 37 postgres.internal: 38 ttl: 60 39 type: A 40 value: 10.0.3.1 41 -redmine: *kubernetes 42 -rspamd: 43 - - ttl: 1800 44 - type: A 45 - value: 65.21.116.74 46 - - ttl: 1800 47 - type: AAAA 48 - value: 2a01:4f9:4a:451c:2::2 49 status.draupnir: 50 ttl: 1800 51 type: CNAME 52 value: the-draupnir-project.github.io. 53 -worker-1.lg: 54 - ttl: 1800 55 - type: A 56 - value: 10.0.2.3 57 -worker-2.lg: 58 - ttl: 1800 59 - type: A 60 - value: 10.0.2.2 61 -znc: 62 - - ttl: 1800 63 - type: A 64 - value: 49.13.24.105 65 -soju: 66 - - ttl: 1800 67 - type: A 68 - value: 37.27.5.79 69 -search: 70 - - ttl: 1800 71 - type: A 72 - value: "37.27.5.79" 73 - - ttl: 1800 74 - type: AAAA 75 - value: "2a01:4f9:c012:54d3::" 76 -# Personal discourse store 77 -personal: 78 - - ttl: 1800 79 - type: A 80 - value: 37.27.5.79 81 - - ttl: 1800 82 - type: AAAA 83 - value: "2a01:4f9:c012:54d3::" 84 - 85 -_acme-challenge: 86 - ttl: 15 87 - type: TXT 88 - value: Mb0--1OsXaW3G2ugkX8VmsVBJ2ijCg8gf301rxfqK0E 89 diff --git a/config/miki.community.yaml b/config/miki.community.yaml 90 index 759ecd3..f8ebfde 100644 91 --- a/config/miki.community.yaml 92 +++ b/config/miki.community.yaml 93 @@ -12,84 +12,9 @@ 94 - flags: 0 95 tag: issue 96 value: letsencrypt.org; validationmethods=tls-alpn-01,dns-01,http-01 97 - - ttl: 1800 98 - type: MX 99 - value: 100 - exchange: mail.nordgedanken.dev. 101 - preference: 10 102 - - ttl: 600 103 - type: NS 104 - values: 105 - - ns1.nordgedanken.dev. 106 - - ns2.nordgedanken.dev. 107 - - ns3.nordgedanken.dev. 108 - ttl: 1800 109 type: TXT 110 value: google-site-verification=tcGRl_gNRBdFRI8-tNAPj6x-8FbmGihFNcYn9_xS7tc 111 -_acme-challenge.rdf: 112 - ttl: 120 113 - type: TXT 114 - value: AUaffkyUCUuKALNYlNg3EjcyqgeUb1fVAchTD1YCsYg 115 -_autodiscover._tcp: 116 - ttl: 1800 117 - type: SRV 118 - value: 119 - port: 443 120 - priority: 10 121 - target: mail.nordgedanken.dev. 122 - weight: 1 123 -_imap._tcp: 124 - ttl: 1800 125 - type: SRV 126 - value: 127 - port: 143 128 - priority: 20 129 - target: mail.nordgedanken.dev. 130 - weight: 1 131 -_imaps._tcp: 132 - ttl: 1800 133 - type: SRV 134 - value: 135 - port: 993 136 - priority: 10 137 - target: mail.nordgedanken.dev. 138 - weight: 1 139 -_pop3._tcp: 140 - ttl: 1800 141 - type: SRV 142 - value: 143 - port: 110 144 - priority: 20 145 - target: mail.nordgedanken.dev. 146 - weight: 1 147 -_pop3s._tcp: 148 - ttl: 1800 149 - type: SRV 150 - value: 151 - port: 995 152 - priority: 10 153 - target: mail.nordgedanken.dev. 154 - weight: 1 155 -_submission._tcp: 156 - ttl: 1800 157 - type: SRV 158 - value: 159 - port: 587 160 - priority: 20 161 - target: mail.nordgedanken.dev. 162 - weight: 1 163 -_submissions._tcp: 164 - ttl: 1800 165 - type: SRV 166 - value: 167 - port: 465 168 - priority: 10 169 - target: mail.nordgedanken.dev. 170 - weight: 1 171 -autoconfig: 172 - ttl: 1800 173 - type: CNAME 174 - value: mail.nordgedanken.dev. 175 data: 176 ttl: 1800 177 type: A 178 @@ -102,7 +27,3 @@ forum: 179 ttl: 1800 180 type: A 181 value: 49.13.24.105 182 -rdf: 183 - ttl: 1800 184 - type: A 185 - value: 65.21.116.74 186 diff --git a/config/nordgedanken.dev.yaml b/config/nordgedanken.dev.yaml 187 index 86b4840..e6c39ef 100644 188 --- a/config/nordgedanken.dev.yaml 189 +++ b/config/nordgedanken.dev.yaml 190 @@ -149,25 +149,7 @@ kubernetes: &kubernetes 191 #- '2a01:4f8:c012:492::1' 192 #- '2a01:4f9:c012:54d3::1' 193 - '2a01:4f9:c010:9436::2' 194 -auth: *kubernetes 195 -git: *kubernetes 196 -github-hook: *kubernetes 197 netbox: *kubernetes 198 -paperless: *kubernetes 199 -search: *kubernetes 200 -zuul: *kubernetes 201 -piwigo: *kubernetes 202 -umami: *kubernetes 203 -chaos: *kubernetes 204 - 205 -# Others 206 -mastodon: 207 - - ttl: 1800 208 - type: A 209 - value: 37.27.5.79 210 - - ttl: 1800 211 - type: AAAA 212 - value: '2a01:4f9:c012:54d3::' 213 214 # Local Homenet 215 local: 216 @@ -177,8 +159,3 @@ local: 217 - ttl: 60 218 type: AAAA 219 value: 2a01:4f9:c010:9436::1 220 - 221 -_acme-challenge: 222 - ttl: 15 223 - type: TXT 224 - value: NuK9J23OlRSzjLcGG4XYvecym6YhFCcgLtZdLCCnaVA 225 diff --git a/config/production.yaml b/config/production.yaml 226 index d00ef7a..0158ebb 100644 227 --- a/config/production.yaml 228 +++ b/config/production.yaml 229 @@ -39,36 +39,6 @@ providers: 230 # A different limit for (non-)enterprise zone applies. 231 # See: https://developers.cloudflare.com/dns/manage-dns-records/reference/ttl 232 #min_ttl: 120 233 - powerdns_ns1: 234 - class: octodns_powerdns.PowerDnsProvider 235 - # The host on which PowerDNS api is listening (required) 236 - host: 65.21.116.72 237 - # The port on whih PowerDNS api is listening (optional, default 8081) 238 - port: 8082 239 - # The api key that grans access (required, example is using an env var) 240 - api_key: env/POWERDNS_API_KEY_NS1 241 - # Send DNS NOTIFY to secondary servers after change (optional, default false) 242 - # notify: false 243 - powerdns_ns2: 244 - class: octodns_powerdns.PowerDnsProvider 245 - # The host on which PowerDNS api is listening (required) 246 - host: 37.27.5.79 247 - # The port on whih PowerDNS api is listening (optional, default 8081) 248 - port: 8081 249 - # The api key that grans access (required, example is using an env var) 250 - api_key: env/POWERDNS_API_KEY_NS2 251 - # Send DNS NOTIFY to secondary servers after change (optional, default false) 252 - # notify: false 253 - powerdns_ns3_v2: 254 - class: octodns_powerdns.PowerDnsProvider 255 - # The host on which PowerDNS api is listening (required) 256 - host: 49.13.24.105 257 - # The port on whih PowerDNS api is listening (optional, default 8081) 258 - port: 8081 259 - # The api key that grans access (required, example is using an env var) 260 - api_key: env/POWERDNS_API_KEY_NS3 261 - # Send DNS NOTIFY to secondary servers after change (optional, default false) 262 - # notify: false 263 zones: 264 midnightthoughts.space.: 265 sources: [config] 266 @@ -78,8 +48,7 @@ zones: 267 sources: [config] 268 processors: [spf] 269 targets: [cloudflare] 270 - miki.community.: &default 271 + miki.community.: 272 sources: [config] 273 processors: [spf] 274 - targets: [powerdns_ns1, powerdns_ns2, powerdns_ns3_v2] 275 - #targets: [powerdns_ns2, powerdns_ns3_v2] 276 + targets: [cloudflare]