From d90a53d4db171ae90a17f795f1fd18b53e68538e Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Tue, 22 Apr 2014 20:34:23 +0000
Subject: [PATCH] Update keyserver ssl certs.

---
 files/keyserver/sks.conf |  6 +++---
 tasks/keyserver.yml      | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/files/keyserver/sks.conf b/files/keyserver/sks.conf
index 2b87b46b55..e91dfd764b 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 9cf3e2ca60..3ed3dff007 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