Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

bodhi: use fqdn for bastion/smtp host

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2025-07-07 09:04:11 -07:00
parent bd65adc71d
commit 21f6b5acf8
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/bodhi2/base/templates/fedora-messaging.toml.j2
View file

@ -72,7 +72,7 @@ class = "logging.handlers.SMTPHandler"
formatter = "simple" formatter = "simple"
level = "ERROR" level = "ERROR"
filters = ["rate_limit"] filters = ["rate_limit"]
mailhost = "bastion" mailhost = "bastion.fedoraproject.org"
{% if env == "staging" %} {% if env == "staging" %}
fromaddr = "updates@stg.fedoraproject.org" fromaddr = "updates@stg.fedoraproject.org"
{% else %} {% else %}

2
roles/bodhi2/base/templates/logging.yaml.j2
View file

@ -22,7 +22,7 @@ handlers:
level: ERROR level: ERROR
formatter: generic formatter: generic
filters: [rate_limit] filters: [rate_limit]
mailhost: "bastion" mailhost: "bastion.fedoraproject.org"
{% if env == "production" %} {% if env == "production" %}
fromaddr: "updates@fedoraproject.org" fromaddr: "updates@fedoraproject.org"
{% else %} {% else %}

4
roles/bodhi2/base/templates/production.ini.j2
View file

@ -298,7 +298,7 @@ fedora_40_primary_arches = aarch64 x86_64
# The hostname of an SMTP server Bodhi can use to deliver e-mail. # The hostname of an SMTP server Bodhi can use to deliver e-mail.
# smtp_server = # smtp_server =
{% if env == "production" %} {% if env == "production" %}
smtp_server = bastion smtp_server = bastion.fedoraproject.org
{% endif %} {% endif %}
# The updates system itself. This e-mail address is used as the From address for e-mails that Bodhi # The updates system itself. This e-mail address is used as the From address for e-mails that Bodhi
@ -821,7 +821,7 @@ formatter = generic
[handler_smtp] [handler_smtp]
class = logging.handlers.SMTPHandler class = logging.handlers.SMTPHandler
kwargs = {'mailhost':'bastion', 'fromaddr':'updates@stg.fedoraproject.org', 'toaddrs':['bodhiadmin-members@fedoraproject.org'], 'subject':'Bodhi error'} kwargs = {'mailhost':'bastion.fedoraproject.org', 'fromaddr':'updates@stg.fedoraproject.org', 'toaddrs':['bodhiadmin-members@fedoraproject.org'], 'subject':'Bodhi error'}
level = ERROR level = ERROR
formatter = generic formatter = generic