diff --git a/roles/bodhi2/base/templates/celeryconfig.py.j2 b/roles/bodhi2/base/templates/celeryconfig.py.j2 index 7b8749d916..e17907c659 100644 --- a/roles/bodhi2/base/templates/celeryconfig.py.j2 +++ b/roles/bodhi2/base/templates/celeryconfig.py.j2 @@ -1,22 +1,18 @@ # # Celery configuration file -# See: docs.celeryproject.org/en/latest/userguide/configuration.html +# See: http://docs.celeryproject.org/en/latest/userguide/configuration.html # -# Broker URL -# This might be more appropriate in prod: -# broker_url = amqps://user:password@hostname:port//vhost -# broker_use_ssl = -# keyfile=/var/ssl/private/worker-key.pem -# certfile=/var/ssl/amqp-server-cert.pem -# ca_certs=/var/ssl/myca.pem -# cert_reqs=ssl.CERT_REQUIRED +# Broker settings + +import ssl broker_url = "amqps://bodhi{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org//bodhi" -broker_use_ssl = - ca_certs=/etc/pki/fedora-messaging/cacert.pem - keyfile=/etc/pki/fedora-messaging/bodhi-key.pem - certfile=/etc/pki/fedora-messaging/bodhi-cert.pem - cert_reqs=ssl.CERT_REQUIRED +broker_use_ssl = { + "ca_certs": "/etc/pki/fedora-messaging/cacert.pem", + "keyfile": "/etc/pki/fedora-messaging/bodhi-key.pem", + "certfile": "/etc/pki/fedora-messaging/bodhi-cert.pem", + "cert_reqs": ssl.CERT_REQUIRED, +} # Where the tasks are defined imports = "bodhi.server.tasks"