scripts: touchups for v12.0.0

[georglauterbach]

Description

Touchups for the upcoming v12.0.0 release. Each commit resolved a small nitpick. Feel free to add yours as well! Should be easily reviewable commit-by-commit. Only small changes allowed 😉

Fixes #

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 own 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

[georglauterbach]

Test failure is expected; waiting for #3134 to get merged.

[polarathene]

LGTM 👍

Small suggestion that might make sense with ONE_DIR=1

[polarathene]

I haven't looked into it, but since ONE_DIR=1 is default, if the only usage is here now, perhaps variables.sh should default to ONE_DIR=0 if ENV is unset, and only change it to ONE_DIR=1 if /var/mail-state exists?

[georglauterbach]

Did I miss something here? ONE_DIR is used above in conjunction with && [[ -d ${STATE_DIR} ]] - this is an elif case, not an if case 🙂

[polarathene]

Did I miss something here?

The warning would always be output with variables.sh setting ONE_DIR=1 as default? (unless there is an explicit opt-out with ONE_DIR=0).

EDIT: For UX you can ignore the below content. Your decision here is the right way to go 👍 (opt-out of warning via explicit ONE_DIR=0)

---

I think I had another comment in this thread that didn't seem to get added during review 😬

I was proposing variables.sh to set ONE_DIR=1 if /var/mail-state existed, so that the warning here would not show up by default.

• The test suite doesn't run with a /var/mail-state volume in any tests, so we technically use ONE_DIR=0.
• It used to be opt-in ENV until the default was changed. Since we expect it at /var/mail-state anyway, we could just derive it that way.
• ONE_DIR is not used anywhere else in our scripts, just special handling in mail_state.sh.
• The warning then becomes redundant, opt-in via existence of /var/mail-state.

Then again, if there is no explicit opt-out with ONE_DIR=0, for new users especially it probably does make sense to display a warning 👍

[casperklein]

The error message is not triggerd, when ENABLE_SRS=1 and ONE_DIR=1 is set and no volume is mounted, because the directory is created in the setup process here:

docker-mailserver/target/scripts/startup/setup.d/postfix.sh

Line 173 in 4e9ffbf

install -d -m 0775 "${POSTSRSD_STATE_DIR}"

[georglauterbach]

Any idea how to solve that?

[casperklein]

SRS seems pretty broken to me. For example, SRS stores stuff in ${POSTSRSD_STATE_DIR}, however there is no symlink pointing to it..
I will take a closer look later.

[casperklein]

Fixed in #3158