Commit 6d13c908 authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger

[JM-1241] Added hostname to admin interface.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@9821 b35dd754-fafc-0310-a699-88a17e54d16e
parent 72247686
...@@ -285,6 +285,7 @@ ...@@ -285,6 +285,7 @@
## Added key: 'muc.room.occupants.kick' ## Added key: 'muc.room.occupants.kick'
## Added key: 'muc.room.occupants.kicked' ## Added key: 'muc.room.occupants.kicked'
## Added key: 'muc.room.occupants.kickfailed' ## Added key: 'muc.room.occupants.kickfailed'
## Added key: 'index.host_name'
# Openfire # Openfire
...@@ -807,6 +808,7 @@ index.home=Server Directory: ...@@ -807,6 +808,7 @@ index.home=Server Directory:
index.certificate-warning=Found RSA certificate that is not valid for the server domain. index.certificate-warning=Found RSA certificate that is not valid for the server domain.
index.certificate-error=Unable to access certificate store. The keystore may be corrupt. index.certificate-error=Unable to access certificate store. The keystore may be corrupt.
index.server_name=Server Name: index.server_name=Server Name:
index.host_name=Host Name:
index.server_port=Server Ports index.server_port=Server Ports
index.server_ip=IP:Port, Security: index.server_ip=IP:Port, Security:
index.port_type=NORMAL index.port_type=NORMAL
......
...@@ -247,13 +247,13 @@ ...@@ -247,13 +247,13 @@
</td> </td>
<td class="c2"> <td class="c2">
<% try { %> <% try { %>
<% if (!CertificateManager.isRSACertificate(SSLConfig.getKeyStore(), XMPPServer.getInstance().getServerInfo().getName())) {%> <% if (!CertificateManager.isRSACertificate(SSLConfig.getKeyStore(), XMPPServer.getInstance().getServerInfo().getXmppDomain())) {%>
<img src="images/warning-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="index.certificate-warning" />" title="<fmt:message key="index.certificate-warning" />">&nbsp; <img src="images/warning-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="index.certificate-warning" />" title="<fmt:message key="index.certificate-warning" />">&nbsp;
<% } %> <% } %>
<% } catch (Exception e) { %> <% } catch (Exception e) { %>
<img src="images/error-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="index.certificate-error" />" title="<fmt:message key="index.certificate-error" />">&nbsp; <img src="images/error-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="index.certificate-error" />" title="<fmt:message key="index.certificate-error" />">&nbsp;
<% } %> <% } %>
${webManager.serverInfo.name} ${webManager.serverInfo.xmppDomain}
</td> </td>
</tr> </tr>
<tr><td>&nbsp;</td></tr> <tr><td>&nbsp;</td></tr>
...@@ -285,6 +285,14 @@ ...@@ -285,6 +285,14 @@
<%= application.getServerInfo() %> <%= application.getServerInfo() %>
</td> </td>
</tr> </tr>
<tr>
<td class="c1">
<fmt:message key="index.host_name" />
</td>
<td class="c2">
${webManager.serverInfo.hostname}
</td>
</tr>
<tr> <tr>
<td class="c1"><fmt:message key="index.os" /></td> <td class="c1"><fmt:message key="index.os" /></td>
<td class="c2"> <td class="c2">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment