Merge remote-tracking branch 'origin/benvin/mail-edge-role' into benvin/mail-edge-dnsmasq
ci/woodpecker/pr/ruby-validate Pipeline was successful
ci/woodpecker/pr/puppet-lint Pipeline was successful
ci/woodpecker/pr/bolt-validate Pipeline was successful
ci/woodpecker/pr/yamllint Pipeline was successful
ci/woodpecker/pr/puppet-validate Pipeline was canceled
ci/woodpecker/pr/ruby-check Pipeline was canceled
ci/woodpecker/pr/erb-validate Pipeline was canceled
ci/woodpecker/pr/epp-validate Pipeline was canceled

# Conflicts:
#	hieradata/roles/infra/mail/gateway.yaml
#	site/roles/manifests/infra/mail/gateway.pp
This commit is contained in:
2026-10-13 21:23:52 +11:00
2 changed files with 4 additions and 0 deletions
@@ -1,2 +1,4 @@
---
profiles::postfix::gateway::myhostname: 'mta2.edge.unkin.net'
profiles::pki::vault::alt_names:
- mta2.edge.unkin.net
@@ -1,2 +1,4 @@
---
profiles::postfix::gateway::myhostname: 'mta1.edge.unkin.net'
profiles::pki::vault::alt_names:
- mta1.edge.unkin.net