update.sh: delete dns_blocklists.cf if old format #6154
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
This was
linked to
issues
Nov 11, 2024
DerLinkman
added a commit
that referenced
this pull request
Nov 12, 2024
* update.sh: precaution ask for deletion of dns_blocklists.cf if old format (#6154) * [Web] Updated lang.zh-cn.json (#6151) [Web] Updated lang.zh-cn.json Co-authored-by: Easton Man <me@eastonman.com> * compose: bump sogo version to include 5.11.2 (#6156) * php: use correct php image + workaround of #6149 (#6159) * compose: bump php-fpm container to correctly use patched c-ares * [Web] check $containers_info contains required fields --------- Co-authored-by: FreddleSpl0it <patschul@posteo.de> --------- Co-authored-by: milkmaker <milkmaker@mailcow.de> Co-authored-by: Easton Man <me@eastonman.com> Co-authored-by: FreddleSpl0it <patschul@posteo.de>
DerLinkman
added a commit
that referenced
this pull request
Nov 15, 2024
FreddleSpl0it
pushed a commit
that referenced
this pull request
Nov 19, 2024
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.
Contribution Guidelines
What does this PR include?
Short Description
This PR fixes:
Affected Containers
Did you run tests?
What did you tested?
I've tested this on my development instance with the old config style and the new one + with the forced mode of update.sh.
What were the final results? (Awaited, got)
update.sh is searching correctly for the old string of
# Autogenerated by mailcowwhen it detects it, the script asks the user to remove this file in order to recreate it correctly.