Without good justification, this looks like something @georglauterbach already added support for with rspamd integration. You can provide these configs yourself rather than upstream into DMS for everyone.

I don't have much opinion on rspamd config, so I'll leave this up to @georglauterbach to decide if the configuration being contributed is really appropriate (not just the rspamd feature itself).

Generally this is something we defer to as a docs contribution, and if there is enough interest from DMS users we look into bringing it into DMS. A PR that just provides a static config preset isn't really something I care much for.

The neural module itself is still documented as experimental and has WIP tags.

I actually asked for a PR in the corresponding issue #3816. This PR need more work, though: we need a ENV RSPAMD_ENABLE_NEURAL that conditionally enabled this feature. The configs seem okay; when RSPAMD_ENABLE_NEURAL=0 we can just rm them. @hanscees how well are you versed in Bash? This requires not a very elaborate Bash knowledge, because I can help.

I actually asked for a PR in the corresponding issue #3816. This PR need more work, though: we need a ENV RSPAMD_ENABLE_NEURAL that conditionally enabled this feature. The configs seem okay; when RSPAMD_ENABLE_NEURAL=0 we can just rm them. @hanscees how well are you versed in Bash? This requires not a very elaborate Bash knowledge, because I can help.

I have adjusted the files

vi scripts/startup/variables-stack.sh

vi scripts/startup/setup.d/security/rspamd.sh

vi mailserver.env

But do I know make a completely new PR? Hmm, I think the changes are already added. Can you check ?
I have mentioned a new help neural.html page that does not exist yet by the way

Okay, last tasks @hanscees:

• "copy" the information from mailserver.env to our documentation, specifically docs/content/config/environment.md.
• Add an entry to CHANGELOG.md

I have applied my latest review feedback myself, so you'll need to pull before working on the branch again.

Then we can update this branch and merge.

Okay, last tasks @hanscees:

• "copy" the information from mailserver.env to our documentation, specifically docs/content/config/environment.md.
• Add an entry to CHANGELOG.md

I have applied my latest review feedback myself, so you'll need to pull before working on the branch again.

Then we can update this branch and merge.

done. Please check for errors.

Okay, last tasks @hanscees:

• "copy" the information from mailserver.env to our documentation, specifically docs/content/config/environment.md.
• Add an entry to CHANGELOG.md

I have applied my latest review feedback myself, so you'll need to pull before working on the branch again.
Then we can update this branch and merge.

done. Please check for errors.

I don't see the corresponding changes here on GitHub. Did you push the changes?

I have no idea what to do. The base branch keeps changing (ie your branch).

then I do locally
git fetch upstream
git merge upstream/master

I commit and it says
git push origin master

To https://github.com/hanscees/docker-mailserver
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'https://github.com/hanscees/docker-mailserver'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

No clue what to do now. Teh code changes are sitting nicely on my disk and refuse to move ...

After some fiddling with rebase no and what not it seems to work now ..........

I have no idea what to do. The base branch keeps changing (ie your branch).

Just for future reference, it's usually best to have your master branch unmodified, just sync it with ours, then branch off that when you're making a contribution and send a PR of that branch.

No merging or rebasing is needed with us, we can update the branch from Github here and we merge PRs via squash commit so we're not that concerned with commit history in a PR. We just review it until we're happy with the final diff.

I am forgetful with the git CLI personally and find it much easier to manage operations via software like GitKraken. I rewrite history with interactive rebase feature there, manage my branches, commit messages and merge conflicts all through that. It avoids a lot of the headaches I had when using only CLI.

Current test failure:

not ok 81 [Rspamd] (full) service log exist and contains proper content in 340ms
# (from function `assert_success' in file test/test_helper/bats-assert/src/assert_success.bash, line 42,
#  from function `_service_log_should_contain_string' in file test/helper/log_and_filtering.bash, line 50,
#  in test file test/tests/parallel/set1/spam_virus/rspamd_full.bats, line 111)
#   `_service_log_should_contain_string 'rspamd' 'lua module neural is disabled in the configuration'' failed
#
# -- command failed --
# status : 1
# output :
# --
#

I have no idea what to do. The base branch keeps changing (ie your branch).

then I do locally git fetch upstream git merge upstream/master

I commit and it says git push origin master

To https://github.com/hanscees/docker-mailserver ! [rejected] master -> master (fetch first) error: failed to push some refs to 'https://github.com/hanscees/docker-mailserver' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate the remote changes hint: (e.g., 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.

No clue what to do now. Teh code changes are sitting nicely on my disk and refuse to move ...

After some fiddling with rebase no and what not it seems to work now ..........

I'd strongly advise checking out another branch before working on features (as it makes syncing to upstream way easier). This is my workflow:

[master] $ git pull
[master] $ git checkout -b feature-branch
[feature-branch] $ # do some work
[feature-branch] $ git commit ...
[feature-branch] $ git push -u origin feature-branch
# then create a PR

# later, when changes / suggestions were applied
[feature-branch] $ git pull
[feature-branch] $ # do some work
[feature-branch] $ git commit ...

# in case you already commited something and forgot to pull earlier, try
[feature-branch] $ # do some work
[feature-branch] $ git commit ...
[feature-branch] $ git pull --rebase

For feature branches on forked repositories, we can manage syncing with our upstream master here on GitHub, so you need not worry about this.

Okay, so I am not 100% sure why the test did not fail earlier. One last change needs to happen:

1. Apply my last suggestion and then make sure to git pull on your local branch
2. In target/scripts/startup/setup.d/security/rspamd.sh, you need to remove neural in line 190 (I hope) (on your branch) from the array called DISABLE_MODULES inside the function __rspamd__setup_default_modules. Just remove the line.

We have a ton of changes now that warrant v14 IMO. This PR should go into v14, though. @casperklein @polarathene what are your thoughts on going for a release PR and a feature freeze after this PR has been merged?

@polarathene what are your thoughts on going for a release PR and a feature freeze after this PR has been merged?

I have a docs PR to complete that I'd like to get in for v14. A week freeze should be enough time to get that in. Other than that I'm fine with a release 👍

I have no idea what to do. The base branch keeps changing (ie your branch).

Just for future reference, it's usually best to have your master branch unmodified, just sync it with ours, then branch off that when you're making a contribution and send a PR of that branch.

No merging or rebasing is needed with us, we can update the branch from Github here and we merge PRs via squash commit so we're not that concerned with commit history in a PR. We just review it until we're happy with the final diff.

I am forgetful with the git CLI personally and find it much easier to manage operations via software like GitKraken. I rewrite history with interactive rebase feature there, manage my branches, commit messages and merge conflicts all through that. It avoids a lot of the headaches I had when using only CLI.

As I said, this git stuff PR is first time for me. I didnt know offbranching existed until 2 minutes ago. Will try that for sure :).

Documentation preview for this PR is ready! 🎉

Built with commit: b89c4a7

thanks for all your help! Great to see this fly!

Thanks for the contribution 🚀 Always nice to see community contributions!