Deuxfleurs/nixcfg
17
6
Fork 2
Code Issues 15 Pull requests 2 Projects Releases Wiki Activity

Fix ports conflicts #37

Open
baptiste wants to merge 2 commits from fix_ports_conflicts into main
pull from: fix_ports_conflicts
merge into: Deuxfleurs:main
Conversation 0 Commits 2 Files changed 4 +6 -3
baptiste commented 2024-10-16 23:13:37 +00:00
Owner
Copy link

Fix two TCP port conflicts.

Remaining conflict: port 8080 is used in sogo and jitsi. This is harder to fix, because port 8080 is hardcoded in sogo's container. The conflict arises only if both services run on the same node, because diplonat is not used for sogo (port 8080 is only used internally and is behind Tricot)

Fix two TCP port conflicts. Remaining conflict: port 8080 is used in sogo and jitsi. This is harder to fix, because port 8080 is hardcoded in sogo's container. The conflict arises only if both services run on the same node, because diplonat is not used for sogo (port 8080 is only used internally and is behind Tricot)
baptiste added 2 commits 2024-10-16 23:13:37 +00:00
This pull request has changes conflicting with the target branch.
  • cluster/prod/app/email/deploy/email.hcl
View command line instructions

Checkout

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

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 main
git merge --no-ff fix_ports_conflicts
git checkout fix_ports_conflicts
git rebase main
git checkout main
git merge --ff-only fix_ports_conflicts
git checkout fix_ports_conflicts
git rebase main
git checkout main
git merge --no-ff fix_ports_conflicts
git checkout main
git merge --squash fix_ports_conflicts
git checkout main
git merge --ff-only fix_ports_conflicts
git checkout main
git merge fix_ports_conflicts
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
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
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: Deuxfleurs/nixcfg#37
No description provided.
Delete branch "fix_ports_conflicts"

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?