summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2015-06-11 17:48:05 -0400
committerEndi S. Dewata <edewata@redhat.com>2015-06-11 21:15:56 -0400
commit3b54cb0a675bbdf345e3fd5c914886483d98a821 (patch)
tree4a223162e579b6ea927dc7f34f6168a89ec14b0e
parent8da79f75c9041b6391f7e100b690e4297c356d0a (diff)
downloadpki-3b54cb0a675bbdf345e3fd5c914886483d98a821.tar.gz
pki-3b54cb0a675bbdf345e3fd5c914886483d98a821.tar.xz
pki-3b54cb0a675bbdf345e3fd5c914886483d98a821.zip
Cleaned up links in main page.
The ROOT's index.jsp has been modified to show the links to all subsystems installed on the instance. When opened, it will show the services provided by the subsystem. The pkispawn output has been modified to show the subsystem URL more consistently: https://<hostname>:<port>/<subsystem> In all subsystems except TPS the page will redirect to: https://<hostname>:<port>/<subsystem>/services
Diffstat
-rw-r--r--base/ca/shared/webapps/ca/index.html3
-rw-r--r--base/kra/shared/webapps/kra/index.html3
-rw-r--r--base/ocsp/shared/webapps/ocsp/index.html3
-rw-r--r--base/server/python/pki/server/deployment/pkimessages.py3
-rwxr-xr-xbase/server/sbin/pkispawn11
-rw-r--r--base/server/share/webapps/ROOT/index.jsp129
-rw-r--r--base/tks/shared/webapps/tks/index.html3
7 files changed, 20 insertions, 135 deletions
diff --git a/base/ca/shared/webapps/ca/index.html b/base/ca/shared/webapps/ca/index.html
index 30662d47a..81d6c7a5a 100644
--- a/base/ca/shared/webapps/ca/index.html
+++ b/base/ca/shared/webapps/ca/index.html
@@ -17,7 +17,6 @@
--- END COPYRIGHT BLOCK --- -->
<html>
<script lang="javascript">
- // redirect to 'ROOT'
- window.location = "/";
+ window.location = '/ca/services';
</script>
</html>
diff --git a/base/kra/shared/webapps/kra/index.html b/base/kra/shared/webapps/kra/index.html
index 30662d47a..11897c49f 100644
--- a/base/kra/shared/webapps/kra/index.html
+++ b/base/kra/shared/webapps/kra/index.html
@@ -17,7 +17,6 @@
--- END COPYRIGHT BLOCK --- -->
<html>
<script lang="javascript">
- // redirect to 'ROOT'
- window.location = "/";
+ window.location = '/kra/services';
</script>
</html>
diff --git a/base/ocsp/shared/webapps/ocsp/index.html b/base/ocsp/shared/webapps/ocsp/index.html
index 30662d47a..8fe876ff3 100644
--- a/base/ocsp/shared/webapps/ocsp/index.html
+++ b/base/ocsp/shared/webapps/ocsp/index.html
@@ -17,7 +17,6 @@
--- END COPYRIGHT BLOCK --- -->
<html>
<script lang="javascript">
- // redirect to 'ROOT'
- window.location = "/";
+ window.location = '/ocsp/services';
</script>
</html>
diff --git a/base/server/python/pki/server/deployment/pkimessages.py b/base/server/python/pki/server/deployment/pkimessages.py
index 0e7d143dd..5d357dd7f 100644
--- a/base/server/python/pki/server/deployment/pkimessages.py
+++ b/base/server/python/pki/server/deployment/pkimessages.py
@@ -371,9 +371,6 @@ PKI_CHECK_STATUS_MESSAGE = '''
systemctl status pki-tomcatd@%s.service'''
PKI_ACCESS_URL = '''
The URL for the subsystem is:
- https://%s:%s/%s/services'''
-PKI_ACCESS_TPS_URL = '''
- The URL for the subsystem is:
https://%s:%s/%s'''
PKI_INSTANCE_RESTART_MESSAGE = '''
To restart the subsystem:
diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn
index d4cfe05d7..d153c031d 100755
--- a/base/server/sbin/pkispawn
+++ b/base/server/sbin/pkispawn
@@ -639,14 +639,9 @@ def print_install_information(mdict):
# Stand-alone PKI KRA/OCSP (External CA Step 1)
print log.PKI_CONFIGURATION_STANDALONE_1 % config.pki_subsystem
else:
- if (config.pki_subsystem == "TPS"):
- print log.PKI_ACCESS_TPS_URL % (mdict['pki_hostname'],
- mdict['pki_https_port'],
- config.pki_subsystem.lower())
- else:
- print log.PKI_ACCESS_URL % (mdict['pki_hostname'],
- mdict['pki_https_port'],
- config.pki_subsystem.lower())
+ print log.PKI_ACCESS_URL % (mdict['pki_hostname'],
+ mdict['pki_https_port'],
+ config.pki_subsystem.lower())
if not config.str2bool(mdict['pki_enable_on_system_boot']):
print log.PKI_SYSTEM_BOOT_STATUS_MESSAGE % "disabled"
else:
diff --git a/base/server/share/webapps/ROOT/index.jsp b/base/server/share/webapps/ROOT/index.jsp
index 648a3470f..38e95e467 100644
--- a/base/server/share/webapps/ROOT/index.jsp
+++ b/base/server/share/webapps/ROOT/index.jsp
@@ -87,6 +87,11 @@ $(function() {
<center>
+<br>
+
+<table border="0" cellspacing="0" cellpadding="0">
+<tr valign="TOP">
+ <td>
<%
ServletContext caContext = getServletContext().getContext("/ca");
if (caContext != null) {
@@ -94,41 +99,8 @@ $(function() {
String caPath = caContext.getContextPath();
if (!"".equals(caPath)) {
%>
-<p>
-<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-<%= caName %>
-</font>
-</p>
-
-<table border="0" cellspacing="0" cellpadding="0">
-<tr valign="TOP">
- <td>
- <li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
- <a href="/ca/ee/ca">End Users Services</a></font>
- </td>
-</tr>
-<%
- if (request.isSecure()) {
-%>
-<tr valign="TOP">
- <td>
<li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
- <a href="/ca/agent/ca">Agent Services</a></font>
- </td>
-</tr>
-<tr valign="TOP">
- <td>
- <li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
- <a href="/ca/services">Admin Services</a></font>
- </td>
-</tr>
-<%
- }
-%>
-</table>
-
-<br>
-
+ <a href="/ca"><%= caName %></a></font>
<%
}
}
@@ -139,29 +111,8 @@ $(function() {
String kraPath = kraContext.getContextPath();
if (!"".equals(kraPath) && request.isSecure()) {
%>
-<p>
-<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-<%= kraName %>
-</font>
-</p>
-
-<table border="0" cellspacing="0" cellpadding="0">
-<tr valign="TOP">
- <td>
- <li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
- <a href="/kra/agent/kra">Agent Services</a></font>
- </td>
-</tr>
-<tr valign="TOP">
- <td>
<li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
- <a href="/kra/services">Admin Services</a></font>
- </td>
-</tr>
-</table>
-
-<br>
-
+ <a href="/kra"><%= kraName %></a></font>
<%
}
}
@@ -172,29 +123,8 @@ $(function() {
String ocspPath = ocspContext.getContextPath();
if (!"".equals(ocspPath) && request.isSecure()) {
%>
-<p>
-<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-<%= ocspName %>
-</font>
-</p>
-
-<table border="0" cellspacing="0" cellpadding="0">
-<tr valign="TOP">
- <td>
<li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
- <a href="/ocsp/agent/ocsp">Agent Services</a></font>
- </td>
-</tr>
-<tr valign="TOP">
- <td>
- <li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
- <a href="/ocsp/services">Admin Services</a></font>
- </td>
-</tr>
-</table>
-
-<br>
-
+ <a href="/ocsp"><%= ocspName %></a></font>
<%
}
}
@@ -205,29 +135,8 @@ $(function() {
String tksPath = tksContext.getContextPath();
if (!"".equals(tksPath) && request.isSecure()) {
%>
-<p>
-<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-<%= tksName %>
-</font>
-</p>
-
-<table border="0" cellspacing="0" cellpadding="0">
-<tr valign="TOP">
- <td>
- <li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
- <a href="/tks/agent/tks">Agent Services</a></font>
- </td>
-</tr>
-<tr valign="TOP">
- <td>
<li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
- <a href="/tks/services">Admin Services</a></font>
- </td>
-</tr>
-</table>
-
-<br>
-
+ <a href="/tks"><%= tksName %></a></font>
<%
}
}
@@ -238,27 +147,15 @@ $(function() {
String tpsPath = tpsContext.getContextPath();
if (!"".equals(tpsPath) && request.isSecure()) {
%>
-<p>
-<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
-<%= tpsName %>
-</font>
-</p>
-
-<table border="0" cellspacing="0" cellpadding="0">
-<tr valign="TOP">
- <td>
<li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
- <a href="/tps/">Agent and Admin Services</a></font>
- </td>
-</tr>
-</table>
-
-<br>
-
+ <a href="/tps/"><%= tpsName %></a></font>
<%
}
}
%>
+ </td>
+</tr>
+</table>
</center>
diff --git a/base/tks/shared/webapps/tks/index.html b/base/tks/shared/webapps/tks/index.html
index 30662d47a..a11324352 100644
--- a/base/tks/shared/webapps/tks/index.html
+++ b/base/tks/shared/webapps/tks/index.html
@@ -17,7 +17,6 @@
--- END COPYRIGHT BLOCK --- -->
<html>
<script lang="javascript">
- // redirect to 'ROOT'
- window.location = "/";
+ window.location = '/tks/services';
</script>
</html>
generated by cgit (git 2.34.1) at 2024-06-06 20:16:50 +0000