Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@georglauterbach
Copy link
Member

@georglauterbach georglauterbach commented Mar 16, 2025

Description

Include *.conf files when checking for changes in the Rspamd configuration.

Fixes #4397

Type of change

  • Improvement (non-breaking change that does improve existing functionality)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation (README.md or the documentation under docs/)
  • If necessary, I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • I have added information about changes made in this PR to CHANGELOG.md

@georglauterbach georglauterbach added area/scripts kind/improvement Improve an existing feature, configuration file or the documentation area/configuration (file) service/security/rspamd labels Mar 16, 2025
@georglauterbach georglauterbach added this to the v15.0.1 milestone Mar 16, 2025
@georglauterbach georglauterbach self-assigned this Mar 16, 2025
# Check whether Rspamd is used and if so, monitor it's changes as well
if [[ ${ENABLE_RSPAMD} -eq 1 ]] && [[ -d ${RSPAMD_DMS_D} ]]; then
readarray -d '' STAGING_FILES_RSPAMD < <(find "${RSPAMD_DMS_D}" -type f -name "*.sh" -print0)
readarray -d '' STAGING_FILES_RSPAMD < <(find "${RSPAMD_DMS_D}" -type f \( -name '*.sh' -or -name '*.conf' \) -print0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What .sh files are be monitored? Nothing stood out from the docs or related check-for-changes.sh rspamd section.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's only *.conf files, really. I don't even know why we started off with *.sh in the first place?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't even know why we started off with *.sh in the first place?

You're the one who contributed it 😆 (the specific commit, and linked comment reference don't provide context to the .sh relevance)

This was back in Oct 2023 (for DMS v13 in Nov 2023), I don't think @casperklein or myself were particularly thorough with reviews for rspamd beyond basics there as you were iterating through initial Rspamd support (introduced since DMS v12 in April 2023).

If you're sure that there was some mistake with .sh there, or some change where we no longer rely upon it, perhaps it can be dropped for 15.0.1 release too 🤔 It is just change detection support for something that shouldn't realistically be changing much once deployed in production, so I think it'd be safe to drop it even if you're not sure why you added it.

@georglauterbach georglauterbach changed the title chore: include *.conf files in change detection of Rspamd chore: include all files in change detection of Rspamd Mar 17, 2025
@polarathene
Copy link
Member

Chore or fix? 🤔

@georglauterbach georglauterbach changed the title chore: include all files in change detection of Rspamd fix: include all files in change detection of Rspamd Mar 17, 2025
@georglauterbach georglauterbach merged commit 0362fa6 into master Mar 17, 2025
7 checks passed
@georglauterbach georglauterbach deleted the gl/rspamd-changes branch March 17, 2025 23:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/configuration (file) area/scripts kind/improvement Improve an existing feature, configuration file or the documentation service/security/rspamd

Projects

None yet

Development

Successfully merging this pull request may close these issues.

bug report: [DOC] Rspamd DKIM signing: missing information about the need to restart DMS

3 participants