Skynet/nixos
6
1
Fork 0
Code Issues 43 Pull requests 2 Projects Releases Packages Wiki Activity Actions

dns.nix changed upstream DNS and fixed comments #99

Closed
pio wants to merge 0 commits from main into main
pull from: main
merge into: Skynet:main
Conversation 20 Commits - Files changed -
pio commented 2023-10-19 15:23:56 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

Cleaned up some of the comments (grammar/spelling)
Made suggested changes to the choices of upstream DNS servers

Cleaned up some of the comments (grammar/spelling) Made suggested changes to the choices of upstream DNS servers
silver commented 2023-10-19 23:17:34 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

Ye dont actually have to pop yer name in it, we can use git blame :D

Ye dont actually have to pop yer name in it, we can use ``git blame`` :D
silver commented 2023-10-19 23:19:24 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

Comments like this belong in teh commit message

Comments like this belong in teh commit message
silver commented 2023-10-19 23:36:27 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

Maybe try something like this?

        /*
        Name:     HEANet
        DNSSEC:
        Details:
        Notes:    ns.heanet.ie / auth-ns2.heanet.ie / auth-ns3.heanet.ie
        */
        "193.1.193.194"

        /*
        Name:     Quad9 - Filtered
        DNSSEC:   Yes
        Details:  https://quad9.net/service/service-addresses-and-features/
        Notes:
        */
        "9.9.9.9"

        /*
        Name:     Quad9 - unfiltered
        DNSSEC:   No
        Details:  https://quad9.net/service/service-addresses-and-features/
        Notes:
        */
        "9.9.9.10"
Maybe try something like this? ``` /* Name: HEANet DNSSEC: Details: Notes: ns.heanet.ie / auth-ns2.heanet.ie / auth-ns3.heanet.ie */ "193.1.193.194" /* Name: Quad9 - Filtered DNSSEC: Yes Details: https://quad9.net/service/service-addresses-and-features/ Notes: */ "9.9.9.9" /* Name: Quad9 - unfiltered DNSSEC: No Details: https://quad9.net/service/service-addresses-and-features/ Notes: */ "9.9.9.10" ```
silver commented 2023-10-19 23:39:05 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

Looks good, with a few minor changes (basically formatting) I would be happy to accept that.

Looks good, with a few minor changes (basically formatting) I would be happy to accept that.
silver commented 2023-10-19 23:39:13 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

requested review from @silver

requested review from @silver
pio commented 2023-10-22 16:20:44 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

changed this line in version 2 of the diff

changed this line in [version 2 of the diff](/compsoc1/skynet/nixos/-/merge_requests/14/diffs?diff_id=267&start_sha=1718aebf6f78e8dacb17a9661895ccbce7732b5f#423d0af8c0859a2aa69a7d1cfe1ccffaa30da9f3_393_393)
pio commented 2023-10-22 16:20:45 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

changed this line in version 2 of the diff

changed this line in [version 2 of the diff](/compsoc1/skynet/nixos/-/merge_requests/14/diffs?diff_id=267&start_sha=1718aebf6f78e8dacb17a9661895ccbce7732b5f#423d0af8c0859a2aa69a7d1cfe1ccffaa30da9f3_394_393)
pio commented 2023-10-22 16:20:45 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

changed this line in version 2 of the diff

changed this line in [version 2 of the diff](/compsoc1/skynet/nixos/-/merge_requests/14/diffs?diff_id=267&start_sha=1718aebf6f78e8dacb17a9661895ccbce7732b5f#423d0af8c0859a2aa69a7d1cfe1ccffaa30da9f3_412_421)
pio commented 2023-10-22 16:20:45 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

resolved all threads

resolved all threads
pio commented 2023-10-22 16:20:45 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

added 1 commit

  • dd122729 - Changes to upstream DNS - using HEANet and Quad9-unfiltered. primaries and secondaries both.

Compare with previous version

added 1 commit <ul><li>dd122729 - Changes to upstream DNS - using HEANet and Quad9-unfiltered. primaries and secondaries both.</li></ul> [Compare with previous version](/compsoc1/skynet/nixos/-/merge_requests/14/diffs?diff_id=267&start_sha=1718aebf6f78e8dacb17a9661895ccbce7732b5f)
silver commented 2023-10-22 17:39:20 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

; is not valid for comments

``;`` is not valid for comments
silver commented 2023-10-22 17:40:07 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

Secondly add line spaces between teh different resolvers, a block of text like that is harder to read.

Secondly add line spaces between teh different resolvers, a block of text like that is harder to read.
pio commented 2023-10-22 21:57:45 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

added 1 commit

  • bbe81fcd - Fixing the semicolon comment delimiters to octothorpe comment delimiters, and...

Compare with previous version

added 1 commit <ul><li>bbe81fcd - Fixing the semicolon comment delimiters to octothorpe comment delimiters, and...</li></ul> [Compare with previous version](/compsoc1/skynet/nixos/-/merge_requests/14/diffs?diff_id=277&start_sha=dd122729bb5484ac781e3c9343d72e2ab764e4d0)
pio commented 2023-10-22 22:07:59 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

added 1 commit

  • 38e0eada - Reverting the ";" near the first half of the file that end up in the DNS...

Compare with previous version

added 1 commit <ul><li>38e0eada - Reverting the &quot;;&quot; near the first half of the file that end up in the DNS...</li></ul> [Compare with previous version](/compsoc1/skynet/nixos/-/merge_requests/14/diffs?diff_id=279&start_sha=bbe81fcd3e31570715549d46cfd3207a335975f8)
pio commented 2023-10-22 22:10:20 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

Formatting updates for readability, removed superfluous comments, clarified details for DNS providers. Should satisfy, I hope!

Formatting updates for readability, removed superfluous comments, clarified details for DNS providers. Should satisfy, I hope!
pio commented 2023-10-22 22:10:58 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

Should be cleaner to read now.

Should be cleaner to read now.
pio commented 2023-10-22 22:10:59 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

resolved all threads

resolved all threads
pio commented 2023-10-23 20:23:40 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

added 1 commit

  • fa3d68d7 - Added comment lines for readability

Compare with previous version

added 1 commit <ul><li>fa3d68d7 - Added comment lines for readability</li></ul> [Compare with previous version](/compsoc1/skynet/nixos/-/merge_requests/14/diffs?diff_id=291&start_sha=38e0eada72e2acb2527eef285db866b8b1140cac)
silver commented 2023-10-23 20:52:48 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

I think ye added too many lines (and ended up reducing readability), you only needed to add them to forwarders.
It is now an even bigger block of text which is harder for me to read.

For my sanity could you please take another look at what I suggested (you can see a pre-existing example in cacheNetworks), notably how blank lines are used to segment things off.
Of the ~50 lines in forwarders only 4 are actual code, the rest are comments, that is far too much of an imbalance.

If ye want to add a good chunk of text I'd recommend that you make a dns.md (alongside the dns.nix) and put all the extra info in there, keep the actual config relatively clean.

I do think diversifying our upstream revolvers is important and adds good value to skynet.

I think ye added too many lines (and ended up reducing readability), you only needed to add them to ``forwarders``. It is now an even bigger block of text which is harder for me to read. For my sanity could you please take another look at what I suggested (you can see a pre-existing example in ``cacheNetworks``), notably how blank lines are used to segment things off. Of the ~50 lines in ``forwarders`` only 4 are actual code, the rest are comments, that is far too much of an imbalance. If ye want to add a good chunk of text I'd recommend that you make a ``dns.md`` (alongside the ``dns.nix``) and put all the extra info in there, keep the actual config relatively clean. I do think diversifying our upstream revolvers is important and adds good value to skynet.
silver force-pushed main from 6f1856549a to 729b8742a0 2024-08-07 10:18:28 +00:00 Compare
silver force-pushed main from 48114f24ba to 9a65a2e980 2024-08-07 10:32:39 +00:00 Compare
silver force-pushed main from 755f5e3ed1 to 9d4a6605d3 2024-08-07 10:34:09 +00:00 Compare
silver force-pushed main from 9d4a6605d3 to 25adce22b9 2024-08-07 10:39:06 +00:00 Compare
silver force-pushed main from 25adce22b9 to 41036466d4 2024-08-07 10:40:05 +00:00 Compare
silver force-pushed main from db6dc69f4d to 778fcdaf11 2024-08-07 10:49:20 +00:00 Compare
silver force-pushed main from 87e4d39db9 to 90af7eeb72 2024-08-07 11:18:50 +00:00 Compare
silver force-pushed main from 255b2395f7 to 86e0c091fb 2024-08-07 21:18:44 +00:00 Compare
silver commented 2024-08-07 23:11:56 +00:00
Owner
Copy link

Gonna close this for now, seems some stuff broke in the (partial) migration

Gonna close this for now, seems some stuff broke in the (partial) migration
silver closed this pull request 2024-08-07 23:11:56 +00:00
All checks were successful
Build_Deploy / linter (push) Successful in 6s
Details
Build_Deploy / build (push) Successful in 3m35s
Details
Build_Deploy / deploy_dns (push) Successful in 44s
Details
Build_Deploy / deploy_active (active) (push) Successful in 51s
Details
Build_Deploy / deploy_active (active-core) (push) Successful in 1m16s
Details
Build_Deploy / deploy_active (active-ext) (push) Successful in 29s
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Draft

   
ITD Ticket

   
Improvement

   
Logging

   
Trainee

   
bugfix
No labels
Draft
ITD Ticket
Improvement
Logging
Trainee
bugfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
4 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: Skynet/nixos#99
No description provided.
Delete branch "main"

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?