linux-system-roles / postfix

An ansible role which configures postfix
https://linux-system-roles.github.io/postfix/
GNU General Public License v3.0
14 stars 20 forks source link

feat: Added postfix_files feature as a simple means to add extra files/maps to config #129

Closed Thulium-Drake closed 2 months ago

Thulium-Drake commented 3 months ago

Enhancement: Added a means to configure extra files for Postfix

Reason: Some config options require to pick up additional information from a file (e.g. with SASL credentials etc). This PR adds 'postfix_files', a simple means of creating these files and integrating them in the Postfix configuration.

Result:

Issue Tracker Tickets (Jira or BZ if any):

richm commented 3 months ago

please rebase on the latest main branch to pick up the fix for the ansible lint github action

richm commented 3 months ago

[citest]

Thulium-Drake commented 3 months ago

[citest]

Thulium-Drake commented 3 months ago

Rebase done! :)

richm commented 3 months ago

[citest]

richm commented 3 months ago

@Thulium-Drake https://github.com/Thulium-Drake/ansible-role-postfix/pull/1 to fix test failures and rebase to latest main branch

Thulium-Drake commented 3 months ago

This should do it then :-)

richm commented 3 months ago

This should do it then :-)

Unfortunately, the PR cannot be merged - This branch cannot be rebased due to conflicts

I tried to fix this locally and push to your branch to update the PR:

To github.com:Thulium-Drake/ansible-role-postfix.git
 ! [remote rejected] Thulium-Drake-postfix_files_feature -> Thulium-Drake-postfix_files_feature (permission denied)
error: failed to push some refs to 'github.com:Thulium-Drake/ansible-role-postfix.git'

I think you have to explicitly give permission for role maintainers to do this - see https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork

If you don't want to do this, then you'll need to rebase and squash - try this:

git checkout main
git pull
git checkout postfix_files_feature
git rebase main  # fix any rebase conflicts
git rebase -i main  # pick the first commit, then use `f` (fixup) for the rest of the commits.
Thulium-Drake commented 2 months ago

I tried the access route, but it didn't pan out. Thanks for the instructions on how to rebase (I don't do that too often :sweat_smile: )!

Should be good now (?)

:rocket:

richm commented 2 months ago

[citest]