diff options
| author | Kevin Fenzi <kevin@scrye.com> | 2014-04-22 20:34:23 +0000 |
|---|---|---|
| committer | Kevin Fenzi <kevin@scrye.com> | 2014-04-22 20:34:23 +0000 |
| commit | d90a53d4db171ae90a17f795f1fd18b53e68538e (patch) | |
| tree | 86df8bc6687b326d2ee5c46e92e1940107245f5f | |
| parent | 90ddd2da30044ab6129515e5c5c86dd4e096212c (diff) | |
| download | ansible-d90a53d4db171ae90a17f795f1fd18b53e68538e.tar.gz ansible-d90a53d4db171ae90a17f795f1fd18b53e68538e.tar.xz ansible-d90a53d4db171ae90a17f795f1fd18b53e68538e.zip | |
Update keyserver ssl certs.
| -rw-r--r-- | files/keyserver/sks.conf | 6 | ||||
| -rw-r--r-- | tasks/keyserver.yml | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/files/keyserver/sks.conf b/files/keyserver/sks.conf index 2b87b46b5..e91dfd764 100644 --- a/files/keyserver/sks.conf +++ b/files/keyserver/sks.conf @@ -51,9 +51,9 @@ NameVirtualHost *:443 ServerAlias keys01.fedoraproject.org SSLEngine on - SSLCertificateFile /etc/pki/tls/wildcard-2013.fedoraproject.org.cert - SSLCertificateChainFile /etc/pki/tls/wildcard-2013.fedoraproject.org.intermediate.cert - SSLCertificateKeyFile /etc/pki/tls/wildcard-2013.fedoraproject.org.key + SSLCertificateFile /etc/pki/tls/wildcard-2014.fedoraproject.org.cert + SSLCertificateChainFile /etc/pki/tls/wildcard-2014.fedoraproject.org.intermediate.cert + SSLCertificateKeyFile /etc/pki/tls/wildcard-2014.fedoraproject.org.key ProxyPass / http://localhost:11371/ ProxyPassReverse / http://localhost:11371/ SetEnv proxy-nokeepalive 1 diff --git a/tasks/keyserver.yml b/tasks/keyserver.yml index 9cf3e2ca6..3ed3dff00 100644 --- a/tasks/keyserver.yml +++ b/tasks/keyserver.yml @@ -51,18 +51,18 @@ tags: - config -- name: /etc/pki/tls/wildcard-2013.fedoraproject.org.cert - copy: src="{{ puppet_private }}/httpd/wildcard-2013.fedoraproject.org.cert" dest=/etc/pki/tls/wildcard-2013.fedoraproject.org.cert owner=root group=root mode=0600 +- name: /etc/pki/tls/wildcard-2014.fedoraproject.org.cert + copy: src="{{ puppet_private }}/httpd/wildcard-2014.fedoraproject.org.cert" dest=/etc/pki/tls/wildcard-2014.fedoraproject.org.cert owner=root group=root mode=0600 tags: - config -- name: /etc/pki/tls/wildcard-2013.fedoraproject.org.key - copy: src="{{ puppet_private }}/httpd/wildcard-2013.fedoraproject.org.key" dest=/etc/pki/tls/wildcard-2013.fedoraproject.org.key owner=root group=root mode=0600 +- name: /etc/pki/tls/wildcard-2014.fedoraproject.org.key + copy: src="{{ puppet_private }}/httpd/wildcard-2014.fedoraproject.org.key" dest=/etc/pki/tls/wildcard-2014.fedoraproject.org.key owner=root group=root mode=0600 tags: - config -- name: /etc/pki/tls/wildcard-2013.fedoraproject.org.intermediate.cert - copy: src="{{ puppet_private }}/httpd/wildcard-2013.fedoraproject.org.intermediate.cert" dest=/etc/pki/tls/wildcard-2013.fedoraproject.org.intermediate.cert owner=root group=root mode=0600 +- name: /etc/pki/tls/wildcard-2014.fedoraproject.org.intermediate.cert + copy: src="{{ puppet_private }}/httpd/wildcard-2014.fedoraproject.org.intermediate.cert" dest=/etc/pki/tls/wildcard-2014.fedoraproject.org.intermediate.cert owner=root group=root mode=0600 tags: - config |