the-distro/infra
8
0
Fork 3
Code Issues 35 Pull requests 4 Packages Projects 1 Releases Wiki Activity

terraform/gandi: more sniproxying for bagel-box,meta-01 #67

Merged
raito merged 1 commit from ckie/moarr-v4 into main 2024-07-14 18:44:25 +00:00
Conversation 3 Commits 1 Files changed 1 +26 -20
ckiee commented 2024-07-14 17:47:54 +00:00
Member
Copy link
No description provided.
ckiee added 1 commit 2024-07-14 17:47:58 +00:00
ckiee added 1 commit 2024-07-14 18:06:59 +00:00
ckiee commented 2024-07-14 18:07:45 +00:00
Author
Member
Copy link
207a208,216
>       "forkos_org_A_bagel-box_infra": {
>         "name": "bagel-box.infra",
>         "ttl": 3600,
>         "type": "A",
>         "values": [
>           "163.172.69.160"
>         ],
>         "zone": "${resource.gandi_livedns_domain.forkos_org.id}"
>       },
218a228,254
>         "ttl": 3600,
>         "type": "A",
>         "values": [
>           "163.172.69.160"
>         ],
>         "zone": "${resource.gandi_livedns_domain.forkos_org.id}"
>       },
>       "forkos_org_A_fodwatch_infra": {
>         "name": "fodwatch.infra",
>         "ttl": 3600,
>         "type": "A",
>         "values": [
>           "163.172.69.160"
>         ],
>         "zone": "${resource.gandi_livedns_domain.forkos_org.id}"
>       },
>       "forkos_org_A_gerrit01_infra": {
>         "name": "gerrit01.infra",
>         "ttl": 3600,
>         "type": "A",
>         "values": [
>           "163.172.69.160"
>         ],
>         "zone": "${resource.gandi_livedns_domain.forkos_org.id}"
>       },
>       "forkos_org_A_meta01_infra": {
>         "name": "meta01.infra",
```diff 207a208,216 > "forkos_org_A_bagel-box_infra": { > "name": "bagel-box.infra", > "ttl": 3600, > "type": "A", > "values": [ > "163.172.69.160" > ], > "zone": "${resource.gandi_livedns_domain.forkos_org.id}" > }, 218a228,254 > "ttl": 3600, > "type": "A", > "values": [ > "163.172.69.160" > ], > "zone": "${resource.gandi_livedns_domain.forkos_org.id}" > }, > "forkos_org_A_fodwatch_infra": { > "name": "fodwatch.infra", > "ttl": 3600, > "type": "A", > "values": [ > "163.172.69.160" > ], > "zone": "${resource.gandi_livedns_domain.forkos_org.id}" > }, > "forkos_org_A_gerrit01_infra": { > "name": "gerrit01.infra", > "ttl": 3600, > "type": "A", > "values": [ > "163.172.69.160" > ], > "zone": "${resource.gandi_livedns_domain.forkos_org.id}" > }, > "forkos_org_A_meta01_infra": { > "name": "meta01.infra",
raito requested changes 2024-07-14 18:11:34 +00:00
Dismissed
terraform/gandi.nix Outdated
@ -61,2 +62,2 @@
(record "fodwatch.infra" 3600 "AAAA" ["2001:bc8:38ee:100:1000::30"])
(record "meta01.infra" 3600 "AAAA" ["2001:bc8:38ee:100:1000::20"])
(proxyRecords "bagel-box.infra" 3600 "AAAA" ["2001:bc8:38ee:100:100::1"])
(proxyRecords "gerrit01.infra" 3600 "AAAA" ["2001:bc8:38ee:100:1000::10"])
raito commented 2024-07-14 18:11:31 +00:00
Owner
Copy link

nope those records should not be proxy, they are used for ssh, so they should not have an IPv4 to avoid weird issues SSHing to the proxy endpoint.

nope those records should not be proxy, they are used for ssh, so they should not have an IPv4 to avoid weird issues SSHing to the proxy endpoint.
raito commented 2024-07-14 18:11:46 +00:00
Owner
Copy link

(all the *.infra ones I mean)

(all the `*.infra` ones I mean)
ckiee marked this conversation as resolved
ckiee force-pushed ckie/moarr-v4 from d00da13459 to c48dc21431 2024-07-14 18:15:54 +00:00 Compare
ckiee commented 2024-07-14 18:16:07 +00:00
Author
Member
Copy link
ckie@cookiemonster ~/git/distro-infra -> diff {bef,aft}.diff
28,29c28,29
<       "forkos_org_AAAA_bagel-box_infra": {
<         "name": "bagel-box.infra",
---
>       "forkos_org_AAAA_bagel-box_infra_p": {
>         "name": "bagel-box.infra.p",
163,164c163,164
<       "forkos_org_AAAA_fodwatch_infra": {
<         "name": "fodwatch.infra",
---
>       "forkos_org_AAAA_fodwatch_infra_p": {
>         "name": "fodwatch.infra.p",
172,173c172,173
<       "forkos_org_AAAA_gerrit01_infra": {
<         "name": "gerrit01.infra",
---
>       "forkos_org_AAAA_gerrit01_infra_p": {
>         "name": "gerrit01.infra.p",
181,182c181,182
<       "forkos_org_AAAA_meta01_infra": {
<         "name": "meta01.infra",
---
>       "forkos_org_AAAA_meta01_infra_p": {
>         "name": "meta01.infra.p",
207a208,216
>       "forkos_org_A_bagel-box_infra_p": {
>         "name": "bagel-box.infra.p",
>         "ttl": 3600,
>         "type": "A",
>         "values": [
>           "163.172.69.160"
>         ],
>         "zone": "${resource.gandi_livedns_domain.forkos_org.id}"
>       },
225a235,261
>       "forkos_org_A_fodwatch_infra_p": {
>         "name": "fodwatch.infra.p",
>         "ttl": 3600,
>         "type": "A",
>         "values": [
>           "163.172.69.160"
>         ],
>         "zone": "${resource.gandi_livedns_domain.forkos_org.id}"
>       },
>       "forkos_org_A_gerrit01_infra_p": {
>         "name": "gerrit01.infra.p",
>         "ttl": 3600,
>         "type": "A",
>         "values": [
>           "163.172.69.160"
>         ],
>         "zone": "${resource.gandi_livedns_domain.forkos_org.id}"
>       },
>       "forkos_org_A_meta01_infra_p": {
>         "name": "meta01.infra.p",
>         "ttl": 3600,
>         "type": "A",
>         "values": [
>           "163.172.69.160"
>         ],
>         "zone": "${resource.gandi_livedns_domain.forkos_org.id}"
>       },
240c276
<           "bagel-box.infra"
---
>           "bagel-box.infra.p"
249c285
<           "meta01.infra"
---
>           "meta01.infra.p"
258c294
<           "bagel-box.infra"
---
>           "bagel-box.infra.p"
267c303
<           "meta01.infra"
---
>           "meta01.infra.p"
276c312
<           "meta01.infra"
---
>           "meta01.infra.p"
285c321
<           "meta01.infra"
---
>           "meta01.infra.p"
```diff ckie@cookiemonster ~/git/distro-infra -> diff {bef,aft}.diff 28,29c28,29 < "forkos_org_AAAA_bagel-box_infra": { < "name": "bagel-box.infra", --- > "forkos_org_AAAA_bagel-box_infra_p": { > "name": "bagel-box.infra.p", 163,164c163,164 < "forkos_org_AAAA_fodwatch_infra": { < "name": "fodwatch.infra", --- > "forkos_org_AAAA_fodwatch_infra_p": { > "name": "fodwatch.infra.p", 172,173c172,173 < "forkos_org_AAAA_gerrit01_infra": { < "name": "gerrit01.infra", --- > "forkos_org_AAAA_gerrit01_infra_p": { > "name": "gerrit01.infra.p", 181,182c181,182 < "forkos_org_AAAA_meta01_infra": { < "name": "meta01.infra", --- > "forkos_org_AAAA_meta01_infra_p": { > "name": "meta01.infra.p", 207a208,216 > "forkos_org_A_bagel-box_infra_p": { > "name": "bagel-box.infra.p", > "ttl": 3600, > "type": "A", > "values": [ > "163.172.69.160" > ], > "zone": "${resource.gandi_livedns_domain.forkos_org.id}" > }, 225a235,261 > "forkos_org_A_fodwatch_infra_p": { > "name": "fodwatch.infra.p", > "ttl": 3600, > "type": "A", > "values": [ > "163.172.69.160" > ], > "zone": "${resource.gandi_livedns_domain.forkos_org.id}" > }, > "forkos_org_A_gerrit01_infra_p": { > "name": "gerrit01.infra.p", > "ttl": 3600, > "type": "A", > "values": [ > "163.172.69.160" > ], > "zone": "${resource.gandi_livedns_domain.forkos_org.id}" > }, > "forkos_org_A_meta01_infra_p": { > "name": "meta01.infra.p", > "ttl": 3600, > "type": "A", > "values": [ > "163.172.69.160" > ], > "zone": "${resource.gandi_livedns_domain.forkos_org.id}" > }, 240c276 < "bagel-box.infra" --- > "bagel-box.infra.p" 249c285 < "meta01.infra" --- > "meta01.infra.p" 258c294 < "bagel-box.infra" --- > "bagel-box.infra.p" 267c303 < "meta01.infra" --- > "meta01.infra.p" 276c312 < "meta01.infra" --- > "meta01.infra.p" 285c321 < "meta01.infra" --- > "meta01.infra.p"
raito reviewed 2024-07-14 18:20:09 +00:00
terraform/gandi.nix Outdated
@ -67,3 +67,1 @@
(record "loki" 3600 "CNAME" ["meta01.infra"])
(record "mimir" 3600 "CNAME" ["meta01.infra"])
(record "matrix" 3600 "CNAME" ["meta01.infra"])
(proxyRecords "amqp" 3600 "CNAME" ["bagel-box.infra"])
raito commented 2024-07-14 18:20:09 +00:00
Owner
Copy link

I don't think you can do a CNAME and an A, that's a DNS spec violation I imagine

I don't think you can do a CNAME and an A, that's a DNS spec violation I imagine
ckiee force-pushed ckie/moarr-v4 from c48dc21431 to d51c5e54ef 2024-07-14 18:28:40 +00:00 Compare
ckiee force-pushed ckie/moarr-v4 from d51c5e54ef to 2763fb8bfb 2024-07-14 18:33:18 +00:00 Compare
ckiee commented 2024-07-14 18:34:15 +00:00
Author
Member
Copy link
36a37,45
>       "forkos_org_AAAA_bagel-box_infra_p": {
>         "name": "bagel-box.infra.p",
>         "ttl": 3600,
>         "type": "AAAA",
>         "values": [
>           "2001:bc8:38ee:100:100::1"
>         ],
>         "zone": "${resource.gandi_livedns_domain.forkos_org.id}"
>       },
171a181,189
>       "forkos_org_AAAA_fodwatch_infra_p": {
>         "name": "fodwatch.infra.p",
>         "ttl": 3600,
>         "type": "AAAA",
>         "values": [
>           "2001:bc8:38ee:100:1000::30"
>         ],
>         "zone": "${resource.gandi_livedns_domain.forkos_org.id}"
>       },
180a199,207
>       "forkos_org_AAAA_gerrit01_infra_p": {
>         "name": "gerrit01.infra.p",
>         "ttl": 3600,
>         "type": "AAAA",
>         "values": [
>           "2001:bc8:38ee:100:1000::10"
>         ],
>         "zone": "${resource.gandi_livedns_domain.forkos_org.id}"
>       },
189a217,225
>       "forkos_org_AAAA_meta01_infra_p": {
>         "name": "meta01.infra.p",
>         "ttl": 3600,
>         "type": "AAAA",
>         "values": [
>           "2001:bc8:38ee:100:1000::20"
>         ],
>         "zone": "${resource.gandi_livedns_domain.forkos_org.id}"
>       },
207a244,252
>       "forkos_org_A_bagel-box_infra_p": {
>         "name": "bagel-box.infra.p",
>         "ttl": 3600,
>         "type": "A",
>         "values": [
>           "163.172.69.160"
>         ],
>         "zone": "${resource.gandi_livedns_domain.forkos_org.id}"
>       },
225a271,297
>       "forkos_org_A_fodwatch_infra_p": {
>         "name": "fodwatch.infra.p",
>         "ttl": 3600,
>         "type": "A",
>         "values": [
>           "163.172.69.160"
>         ],
>         "zone": "${resource.gandi_livedns_domain.forkos_org.id}"
>       },
>       "forkos_org_A_gerrit01_infra_p": {
>         "name": "gerrit01.infra.p",
>         "ttl": 3600,
>         "type": "A",
>         "values": [
>           "163.172.69.160"
>         ],
>         "zone": "${resource.gandi_livedns_domain.forkos_org.id}"
>       },
>       "forkos_org_A_meta01_infra_p": {
>         "name": "meta01.infra.p",
>         "ttl": 3600,
>         "type": "A",
>         "values": [
>           "163.172.69.160"
>         ],
>         "zone": "${resource.gandi_livedns_domain.forkos_org.id}"
>       },
240c312
<           "bagel-box.infra"
---
>           "bagel-box.infra.p"
249c321
<           "meta01.infra"
---
>           "meta01.infra.p"
258c330
<           "bagel-box.infra"
---
>           "bagel-box.infra.p"
267c339
<           "meta01.infra"
---
>           "meta01.infra.p"
276c348
<           "meta01.infra"
---
>           "meta01.infra.p"
285c357
<           "meta01.infra"
---
>           "meta01.infra.p"
```diff 36a37,45 > "forkos_org_AAAA_bagel-box_infra_p": { > "name": "bagel-box.infra.p", > "ttl": 3600, > "type": "AAAA", > "values": [ > "2001:bc8:38ee:100:100::1" > ], > "zone": "${resource.gandi_livedns_domain.forkos_org.id}" > }, 171a181,189 > "forkos_org_AAAA_fodwatch_infra_p": { > "name": "fodwatch.infra.p", > "ttl": 3600, > "type": "AAAA", > "values": [ > "2001:bc8:38ee:100:1000::30" > ], > "zone": "${resource.gandi_livedns_domain.forkos_org.id}" > }, 180a199,207 > "forkos_org_AAAA_gerrit01_infra_p": { > "name": "gerrit01.infra.p", > "ttl": 3600, > "type": "AAAA", > "values": [ > "2001:bc8:38ee:100:1000::10" > ], > "zone": "${resource.gandi_livedns_domain.forkos_org.id}" > }, 189a217,225 > "forkos_org_AAAA_meta01_infra_p": { > "name": "meta01.infra.p", > "ttl": 3600, > "type": "AAAA", > "values": [ > "2001:bc8:38ee:100:1000::20" > ], > "zone": "${resource.gandi_livedns_domain.forkos_org.id}" > }, 207a244,252 > "forkos_org_A_bagel-box_infra_p": { > "name": "bagel-box.infra.p", > "ttl": 3600, > "type": "A", > "values": [ > "163.172.69.160" > ], > "zone": "${resource.gandi_livedns_domain.forkos_org.id}" > }, 225a271,297 > "forkos_org_A_fodwatch_infra_p": { > "name": "fodwatch.infra.p", > "ttl": 3600, > "type": "A", > "values": [ > "163.172.69.160" > ], > "zone": "${resource.gandi_livedns_domain.forkos_org.id}" > }, > "forkos_org_A_gerrit01_infra_p": { > "name": "gerrit01.infra.p", > "ttl": 3600, > "type": "A", > "values": [ > "163.172.69.160" > ], > "zone": "${resource.gandi_livedns_domain.forkos_org.id}" > }, > "forkos_org_A_meta01_infra_p": { > "name": "meta01.infra.p", > "ttl": 3600, > "type": "A", > "values": [ > "163.172.69.160" > ], > "zone": "${resource.gandi_livedns_domain.forkos_org.id}" > }, 240c312 < "bagel-box.infra" --- > "bagel-box.infra.p" 249c321 < "meta01.infra" --- > "meta01.infra.p" 258c330 < "bagel-box.infra" --- > "bagel-box.infra.p" 267c339 < "meta01.infra" --- > "meta01.infra.p" 276c348 < "meta01.infra" --- > "meta01.infra.p" 285c357 < "meta01.infra" --- > "meta01.infra.p"
ckiee force-pushed ckie/moarr-v4 from 2763fb8bfb to 3c2691d9e2 2024-07-14 18:42:40 +00:00 Compare
raito approved these changes 2024-07-14 18:43:35 +00:00
raito merged commit 0723b7de42 into main 2024-07-14 18:44:25 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
raito
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: the-distro/infra#67
No description provided.
Delete branch "ckie/moarr-v4"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?