From 9067dedcc2245671de0e96f150d6eaf1c54e54b6 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 21 Jan 2016 13:34:45 +0000
Subject: [PATCH] tweak family key explanatory text and file name
---
apps/routerconsole/jsp/configfamily.jsp | 5 +++--
apps/routerconsole/jsp/exportfamily.jsp | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/apps/routerconsole/jsp/configfamily.jsp b/apps/routerconsole/jsp/configfamily.jsp
index 1646e86173..7a4ddb03d9 100644
--- a/apps/routerconsole/jsp/configfamily.jsp
+++ b/apps/routerconsole/jsp/configfamily.jsp
@@ -44,7 +44,8 @@
<form action="" method="POST" enctype="multipart/form-data" accept-charset="UTF-8">
<input type="hidden" name="nonce" value="<%=pageNonce%>" >
<h3><%=intl._t("Join Router Family")%></h3>
-<p><%=intl._t("Select private key file")%> :
+<p><%=intl._t("Import the secret family key that you exported from an existing router in the family.")%>
+<p><%=intl._t("Select secret key file")%> :
<input name="file" type="file" value="" />
</p>
<div class="formaction">
@@ -60,7 +61,7 @@
<div class="configure">
<form action="/exportfamily" method="GET">
<h3><%=intl._t("Export Family Key")%></h3>
-<p><%=intl._t("Create a family key certificate to be imported into other routers you control.")%>
+<p><%=intl._t("Export the secret family key to be imported into other routers you control.")%>
</p>
<div class="formaction">
<input type="submit" name="action" class="go" value="<%=intl._t("Export Family Key")%>" />
diff --git a/apps/routerconsole/jsp/exportfamily.jsp b/apps/routerconsole/jsp/exportfamily.jsp
index e271b600b5..00ce9dc556 100644
--- a/apps/routerconsole/jsp/exportfamily.jsp
+++ b/apps/routerconsole/jsp/exportfamily.jsp
@@ -12,7 +12,7 @@ try {
response.setDateHeader("Expires", 0);
response.addHeader("Cache-Control", "no-store, max-age=0, no-cache, must-revalidate");
response.addHeader("Pragma", "no-cache");
- String name = "family-" + family + ".crt";
+ String name = "family-" + family + "-secret.crt";
response.setContentType("application/x-x509-ca-cert; name=\"" + name + '"');
response.addHeader("Content-Disposition", "attachment; filename=\"" + name + '"');
java.io.File ks = new java.io.File(ctx.getConfigDir(), "keystore");
--
GitLab