From ccd6863590d1050f2f0fbb2c39f2f52dce11de48 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 1 Aug 2016 11:03:18 +0100
Subject: [PATCH] Handle signing key aliases for production environments.

---
 build.xml           | 5 -----
 preprod.properties  | 5 +++++
 prod-old.properties | 5 +++++
 prod.properties     | 5 +++++
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index f17b1410..cc142510 100644
--- a/build.xml
+++ b/build.xml
@@ -186,11 +186,6 @@
     -->
     <property name="mdaggr.stats" value="ukfederation-stats.html"/>
 
-    <!--
-        Signing keystore alias.
-    -->
-    <property name="sign.uk.keyAlias" value="ukfederation"/>
-
     <!--
         Verification keystore.
     -->
diff --git a/preprod.properties b/preprod.properties
index 6c7385c2..875707fe 100644
--- a/preprod.properties
+++ b/preprod.properties
@@ -13,3 +13,8 @@ sign.uk.keystoreProvider = sun.security.pkcs11.SunPKCS11
 # Location of the PKCS#11 configuration file for the Thales HSM.
 #
 sign.uk.pkcs11Config = /opt/xmlsectool/nshield.cfg
+
+#
+# Signing key alias within the keystore.
+#
+sign.uk.keyAlias = UKAMF_Signing_Key
diff --git a/prod-old.properties b/prod-old.properties
index 7622fbca..fdda3b0b 100644
--- a/prod-old.properties
+++ b/prod-old.properties
@@ -16,3 +16,8 @@ sign.uk.keystoreProvider = sun.security.pkcs11.SunPKCS11
 # Location of the PKCS#11 configuration file for an ACOS5 card.
 #
 sign.uk.pkcs11Config = C\:\\pkcs11\\sdk18\\acs.cfg
+
+#
+# Signing key alias within the keystore.
+#
+sign.uk.keyAlias = ukfederation
diff --git a/prod.properties b/prod.properties
index 04a57f67..844ba821 100644
--- a/prod.properties
+++ b/prod.properties
@@ -13,3 +13,8 @@ sign.uk.keystoreProvider = sun.security.pkcs11.SunPKCS11
 # Location of the PKCS#11 configuration file for the Thales HSM.
 #
 sign.uk.pkcs11Config = /opt/xmlsectool/nshield.cfg
+
+#
+# Signing key alias within the keystore.
+#
+sign.uk.keyAlias = UKAMF_Signing_Key