Merge branch 'master' of /git/ansible

2014-05-27 20:00:04 +00:00 · 2014-05-27 20:00:04 +00:00 · a04e4bd839
commit a04e4bd839
parent d7c1a29e0a 8322306912
1 changed files with 5 additions and 0 deletions
--- a/roles/fedmsg/base/templates/ssl.py.j2
+++ b/roles/fedmsg/base/templates/ssl.py.j2
@ -27,7 +27,12 @@ config = dict(
    validate_signatures=True,
    ssldir="/etc/pki/fedmsg",

+    {% if env == 'staging' %}
+    # In staging, we use the internal IP of proxy01 without ssl.
+    crl_location="http://10.5.126.88/fedmsg/crl.pem",
+    {% else %}
    crl_location="https://fedoraproject.org/fedmsg/crl.pem",
+    {% endif %}
    crl_cache="/var/run/fedmsg/crl.pem",
    crl_cache_expiry=86400,  # Daily