Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename dovecot config file generated be renew hook to ensure it gets after default froxlor config file #1233

Merged
merged 1 commit into from
Jan 29, 2024

Conversation

z-e-r-0-t
Copy link
Contributor

Description

Currently generated file names by Froxlor for Dovecot using Debian Bookworm:

  • /etc/dovecot/conf.d/99-froxlor.conf (from service config)
  • /etc/dovecot/conf.d/99-froxlor-ssl.conf (from renew hook)

Dovecot includes all conf.d/*.conf files like this dovecot.conf:

The filenames are first sorted by their ASCII value and parsed in that order.

. == 0x2e
- == 0x2d

Thats why 99-froxlor-ssl.conf gets parsed before 99-froxlor.conf and the TLS values from renew hook might get overwritten.

Solution

Choose filename for file generated by rename hook that gets parsed after default Froxlor config file.

Type of change

  • Bug fix (non-breaking change which fixes an issue)

Test Configuration:

  • Distribution: Gentoo
  • Dovecot: 2.3.20

Checklist:

  • I have performed a self-review of my own code
  • My changes generate no new warnings

@d00p
Copy link
Member

d00p commented Jan 29, 2024

Thanks for the contribution, although as stated in the code, it's not even final this way, as this might to be a setting (at least for the path). Just to be totally sure - would using 999-froxlor... ensure it's read in last?

@z-e-r-0-t
Copy link
Contributor Author

Yes you are right, using 999-froxlor... works. Just verified this.
Just depends if we want to break the 2 digit style that is used until now.

@d00p
Copy link
Member

d00p commented Jan 29, 2024

We could also use 99-zzz-froxlor but I think that's looks crappy :p

@z-e-r-0-t
Copy link
Contributor Author

Yeah whatever ^^. I just tripped over this while testing and this PR is a quick (and dirty) workaround.
As long as it is fixed in the final release (maybe with a setting for path), feel free to drop this PR.

@d00p
Copy link
Member

d00p commented Jan 29, 2024

na i'll take it for now as it fixes the correct include order, thanks again :)

@d00p d00p merged commit 9d4bc94 into froxlor:main Jan 29, 2024
9 checks passed
@z-e-r-0-t z-e-r-0-t deleted the dovecot_tls_renew branch January 29, 2024 19:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants