-
Notifications
You must be signed in to change notification settings - Fork 29
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upstream vpn package again #38
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Updated: checkout action
ffka-gluon-web-usb-wan-hotplug: i18n/de.po: fix typo (#13) ffmuc-gluon-mesh-vpn-wireguard-vxlan: add package (#6) Co-authored-by: Annika Wickert <[email protected]> Co-authored-by: krombel <[email protected]> Co-authored-by: Martin Weinelt <[email protected]> Co-authored-by: lqb <[email protected]> Co-authored-by: lqb <[email protected]> Co-authored-by: Julian Labus <[email protected]> Co-authored-by: Tristan Helmich <[email protected]> Co-authored-by: goligo <[email protected]> Update Makefile
Renamed ffmuc-gluon-mesh-vpn-wireguard-vxlan to ffmuc-mesh-vpn-wireguard-vxlan
For each reconnection checkuplink was adding an additional entry to the INPUT chain in ip6tables. In case a node does not have WAN connection, but accidentally enabled mesh over VPN, this adding 1440 rules per day or about 40k rules within a month.
In OpenWrt 22.03 the output of nslookup as a colon after "Address", so it was not matched correctly by our regular expression.
Gluon v2022.1 has been refactored in a way, that a mesh-vpn interface is no longer in the network configuration and no longer added to BATMAN automatically, so we now add it explicitly in our script.
This reverts commit fd5f1c7.
Revert "Add mesh-vpn to BATMAN, as Gluon does not do it anymore"
Required by recent upstream changes: freifunk-gluon/gluon@7c81897
Fix mesh-vpn issues for Gluon v2022.1
This fixes the broken grep to find the batctl gw
Fix broken grep
maurerle
approved these changes
Sep 9, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, thank you!
Should we squash this while merging?
All these merge commits are not needed.
Otherwise one of you could rebase the changes with proper commit messages..?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge our changes into upstream again.