sid/sid.ovh
1
0
Fork 0
Code Issues 3 Pull requests 2 Projects Releases Packages Wiki Activity Actions

add dns with ip blocklist #42

Open
sid wants to merge 2 commits from dns into develop
pull from: dns
merge into: sid:develop
Conversation 0 Commits 2 Files changed 2 +48 -12
sid commented 2026-05-04 16:40:18 +02:00
Owner
Copy link
No description provided.
sid added 1 commit 2026-05-04 16:40:19 +02:00
add dns with ip blocklist
Some checks failed
Flake check / flake-check (pull_request) Failing after 14s
Details
a59b0277c8
sid added 1 commit 2026-05-04 16:46:37 +02:00
fix tailnet ips
Some checks failed
Flake check / flake-check (pull_request) Failing after 1m30s
Details
bf28f2be49
Some checks failed
Flake check / flake-check (pull_request) Failing after 1m30s
Details
This pull request has changes conflicting with the target branch.
  • hosts/sid/services/coredns.nix
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin dns:dns
git checkout dns

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout develop
git merge --no-ff dns
git checkout dns
git rebase develop
git checkout develop
git merge --ff-only dns
git checkout dns
git rebase develop
git checkout develop
git merge --no-ff dns
git checkout develop
git merge --squash dns
git checkout develop
git merge --ff-only dns
git checkout develop
git merge dns
git push origin develop
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
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
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
1 participant
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: sid/sid.ovh#42
No description provided.
Delete branch "dns"

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?