Fix merge master into nightly #45
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
hipposen
added a commit
that referenced
this pull request
Sep 28, 2023
* Site conf for nightly-builds * Update site.conf interne Server priorisieren 2.de.pool.ntp.org ist der pool für Deutschland alle anderen de-Pools haben keine IPv6 Adressen gesetzt * Site conf for v2016.1.6 * Build images to update from EU-specific firmware (TP-Link) * Update site-configuration for new packages and lede-base * Update site.conf to new mesh_vpn-format * Add site_seed needed in current version * Fix site.conf format * Rename site_seed to domain_seed * Add vxlan option, but disable it to allow lan-meshing with older nodes freifunk-gluon/gluon@1f7ed28 * Remove gluon-config-mode-core. Inserted implicitely starting with v2018.1... * add config_mode options for gluon 2018 * Fix file structure * Fix many description messages to fullfill GDPR * Merge pull request #10 from bobcanthelpyou/priority remove obsolete autoupdater probability setting and set PRIORITY * Merge pull request #10 from bobcanthelpyou/priority remove obsolete autoupdater probability setting and set PRIORITY Change PRIORITY and remove obsolete for nightly build * Changes for working with Gluon v2019.x.x * update documentation * Changes for working with Gluon v2019.x.x adding multidomain-site support * add gitlab buildserver support * adding .gitmodules for gitlab builder * adding gluon to build with gitlab buildserver * changes to vpn for batman v * fix ipv6 adress * change packages from batman_v branch and new weissensee ffwse * changes to run domain * added zram for tiny devices * change Batman algo to IV * added scheduled-domain-switch package * added gitignore and README.md * only ar71xx_generic as target * Changes to Batman: Batman IV -> Batman IV Legacy; Batman V -> Batman IV * added batman_adv_14 for Batman_14_LEGACY * ibss adhoc removed * changes to ffef_v1 -> remove vpn 4 * fix for incomplete-xml during save the config * take over the config of ffef_v1 to ffen_v1 ffgth_v1 and ffwsee_v1 * Change the ssid of eisenach * changes in domains, remove unecessary module - because it is default actived * correct conf for ffil * rename Domain names for new world * change vpns in domains" * Create manual.yml * Create docker-publish.yml * Create build_gluon.yml * Create install-dependencies.sh * Create run-build.sh * Create sources.list * Update build_gluon.yml * Update run-build.sh * Delete docker-publish.yml * Update build_gluon.yml * Update build_gluon.yml * Delete manual.yml * Update build_gluon.yml * Update build_gluon.yml * Update install-dependencies.sh * Update build_gluon.yml * Update build_gluon.yml * Update build_gluon.yml * Update build_gluon.yml * Update run-build.sh * Update run-build.sh * Update build_gluon.yml * Update run-build.sh * Update run-build.sh * Update build_gluon.yml * Update site.conf * Update build_gluon.yml * Update run-build.sh * Update site.conf * Create lint.yml * Update run-build.sh * Update site.conf * Delete lint.yml * Update build_gluon.yml * Update build_gluon.yml * Update build_gluon.yml * Update build_gluon.yml * Update build_gluon.yml * Update build_gluon.yml * Update build_gluon.yml * Update run-build.sh * Create error.log * Create dummy.txt * Update run-build.sh * Update run-build.sh * Update run-build.sh * Update run-build.sh * Update run-build.sh * Update run-build.sh * Delete error.log * Delete dummy.txt * Update run-build.sh * Update install-dependencies.sh * Update and rename build_gluon.yml to build_single.yml * Create build_gluon.yml * Update build_single.yml * Update run-build.sh * Update install-dependencies.sh * Update install-dependencies.sh * Update install-dependencies.sh * Update install-dependencies.sh * Update run-build.sh * Update run-build.sh * Update install-dependencies.sh * Update run-build.sh * Update site.conf site.conf error: prefix4 is allowed in domain configuration only * Update site.conf * Update run-build.sh * Update build_single.yml * Update build_single.yml * Update build_gluon.yml * Adding possibility to set admin password and set Date of scheduled domain switch * fix broken build * change version to 2019.1.3 * Adding possibility to set admin password and set Date of scheduled do… (#23) * Adding possibility to set admin password and set Date of scheduled domain switch * fix broken build * change version to 2019.1.3 * Fix for last Installation page * Nightly (#24) * Adding possibility to set admin password and set Date of scheduled domain switch * fix broken build * change version to 2019.1.3 * Fix for last Installation page * Update install-dependencies.sh * Update install-dependencies.sh * 'changes to zram' * delete unnecessary file * changes to novpn in language files * added thw domain * run-build.sh: workaround broken Github repository addresses (#33) (#34) * Update to Gluon v2020.2.x (#36) * Update config to Gluon v2020.1.4 * Remove domains with IBSS config * Set default domain to ffef_v1 * Remove legacy domains * Update domain names * Update README * Sync translation files with the Gluon site-example * Update config to Gluon v2020.2.3 * Update Github Actions use Ubuntu Jammy Jellyfish 22.04 * Update apt sources for Github actions (#37) * Update Gluon submodule to v2020.2.x (#38) * Update apt sources for Github actions (Ubuntu 20.04) (#40) * Update install-dependencies.sh * Update apt dependencies (#41) * Update build script and github actions (#42) * Update build script and github workflows (#43) * Fix vpn mail address (#44) * Fix merge master into nightly (#45) --------- Co-authored-by: Marcel Pennewiss <[email protected]> Co-authored-by: txt.file <[email protected]> Co-authored-by: koleesch <[email protected]> Co-authored-by: Martin <[email protected]> Co-authored-by: koleesch <[email protected]> Co-authored-by: Stefan Kornemann <[email protected]> Co-authored-by: hipposen <[email protected]>
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.
Resolving the merge conflicts of #35 pulled some duplicate or obsolete code in.
Remove the duplicate and obsolete code again.