DGNum/infrastructure
10
5
Fork 3
Code Issues 34 Pull requests 24 Projects 1 Releases Packages Activity Actions

feat(dns): IPv4 for rescue01 #80

Merged
mdebray merged 1 commit from dns_for_rescue01 into main 2024-04-03 21:20:56 +02:00
Conversation 5 Commits 1 Files changed 3 +28 -6
mdebray commented 2024-03-29 11:42:40 +01:00
Owner
Copy link

TODO check that it builds

TODO check that it builds
mdebray force-pushed dns_for_rescue01 from 0c280179e9 to 6a77307db3 2024-03-29 11:46:10 +01:00 Compare
thubrecht reviewed 2024-03-29 13:41:13 +01:00
meta/dns.nix Outdated
@ -11,3 +11,3 @@
mkCNAME = host: { CNAME = [ host ]; };
mkHosted = server: mapSingleFuse (_: mkCNAME "${server}.${meta.nodes.${server}.site}.infra");
getLastDomain = d: lib.last (lib.splitString "." d);
thubrecht commented 2024-03-29 13:41:13 +01:00
Owner
Copy link

J'avoue que je vois pas l'intérêt de getLastDomain puisque c'est utilisé uniquement dans mkHosted qui n'est utilisé que sur hosted, si tu gardes juste rescue01 = [ "status" ] à la place de "web.rescue01" = [ "status" ] ça fait exactement pareil

J'avoue que je vois pas l'intérêt de `getLastDomain` puisque c'est utilisé uniquement dans `mkHosted` qui n'est utilisé que sur `hosted`, si tu gardes juste `rescue01 = [ "status" ]` à la place de `"web.rescue01" = [ "status" ]` ça fait exactement pareil
mdebray commented 2024-03-29 16:21:51 +01:00
Author
Owner
Copy link

Il me semble que non parce que là j'ai

web.rescue01.hyp01.infra IN A
web.rescue01.hyp01.infra IN AAAA
rescue01.hyp01.infra IN AAAA

alors que ce que tu proposes

rescue01.hyp01.infra IN A
rescue01.hyp01.infra IN AAAA

Mon design permet de dissocier les trucs qui seront du HTTP (donc accessible en v4) des protocoles non http (SSH par ex) qui sont v6 only

Il me semble que non parce que là j'ai ``` web.rescue01.hyp01.infra IN A web.rescue01.hyp01.infra IN AAAA rescue01.hyp01.infra IN AAAA ``` alors que ce que tu proposes ``` rescue01.hyp01.infra IN A rescue01.hyp01.infra IN AAAA ``` Mon design permet de dissocier les trucs qui seront du HTTP (donc accessible en v4) des protocoles non http (SSH par ex) qui sont v6 only
thubrecht reviewed 2024-03-29 13:50:37 +01:00
thubrecht left a comment
Owner
Copy link

Après, est-ce que c'est mieux d'aliaser rawRecords et additionalInfra ou de les inline et mettre un commentaire ?

(D'ailleurs je préfère extraInfra perso ^^)

Après, est-ce que c'est mieux d'aliaser `rawRecords` et `additionalInfra` ou de les inline et mettre un commentaire ? (D'ailleurs je préfère `extraInfra` perso ^^)
thubrecht reviewed 2024-03-29 14:40:59 +01:00
meta/dns.nix Outdated
@ -93,0 +107,4 @@
additionalInfra = {
"web.rescue01.${meta.nodes.rescue01.site}" = {
A = [ "82.67.34.230" ];
AAAA = [ meta.network.rescue01.addresses.ipv6 ];
thubrecht commented 2024-03-29 14:40:59 +01:00
Owner
Copy link

Du coup ça c'est invalide parce que meta...ipv6 est déjà une liste

Du coup ça c'est invalide parce que meta...ipv6 est déjà une liste
mdebray marked this conversation as resolved
mdebray force-pushed dns_for_rescue01 from 6a77307db3 to 7aa850238a 2024-03-29 16:22:37 +01:00 Compare
mdebray commented 2024-03-29 16:42:01 +01:00
Author
Owner
Copy link

Après, est-ce que c'est mieux d'aliaser rawRecords et additionalInfra ou de les inline et mettre un commentaire ?

(D'ailleurs je préfère extraInfra perso ^^)

J'ai pas d'avis tranché dis-moi ce que tu penses le mieux

> Après, est-ce que c'est mieux d'aliaser `rawRecords` et `additionalInfra` ou de les inline et mettre un commentaire ? > > (D'ailleurs je préfère `extraInfra` perso ^^) J'ai pas d'avis tranché dis-moi ce que tu penses le mieux
mdebray force-pushed dns_for_rescue01 from 7aa850238a to 38cfd526e5 2024-03-29 18:21:44 +01:00 Compare
thubrecht reviewed 2024-04-02 10:59:08 +02:00
meta/dns.nix Outdated
@ -14,0 +22,4 @@
}${server}.${meta.nodes.${server}.site}.infra"
);
in
lib.concatMapAttrs (proto: (mkCNAMEs (if proto == "dual" then "" else proto)));
thubrecht commented 2024-04-02 10:59:08 +02:00
Owner
Copy link

Je pense que cette version est plus lisible

  mkHosted =
    server:
    {
      dual ? [ ],
      v4 ? [ ],
      v6 ? [ ],
    }:
    let
      base = "${server}.${meta.nodes.${server}.site}.infra";
      mkHost = host: mapSingleFuse (_: mkCNAME host);
    in
    fuseAttrs [
      (mkHost base dual)
      (mkHost "v4.${base}" v4)
      (mkHost "v6.${base}" v6)
    ];
Je pense que cette version est plus lisible ``` mkHosted = server: { dual ? [ ], v4 ? [ ], v6 ? [ ], }: let base = "${server}.${meta.nodes.${server}.site}.infra"; mkHost = host: mapSingleFuse (_: mkCNAME host); in fuseAttrs [ (mkHost base dual) (mkHost "v4.${base}" v4) (mkHost "v6.${base}" v6) ]; ```
mdebray marked this conversation as resolved
mdebray force-pushed dns_for_rescue01 from 38cfd526e5 to bb04e6a88c 2024-04-03 18:05:13 +02:00 Compare
mdebray force-pushed dns_for_rescue01 from bb04e6a88c to 92c2ff4521 2024-04-03 21:19:50 +02:00 Compare
mdebray deleted branch dns_for_rescue01 2024-04-03 21:20:56 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
awaiting
awaiting-author
Awaiting for the author interaction (e.g. QA/confirmation/final merge)

  
awaiting
awaiting-reviewer
Awaiting for a privileged reviewer to approve this PR

  
bot

Pull Request opened by a bot

  
deployed

This PR is currently deployed on the infra

  
Silenced alert

This is a known and silenced alert.

  
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
awaiting
awaiting-author
awaiting
awaiting-reviewer
bot
deployed
Silenced alert
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
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: DGNum/infrastructure#80
No description provided.
Delete branch "dns_for_rescue01"

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?