Change the server port and server https properties.

#1697
NCEAS · Nov 30, 2023 · c2bcd55 · c2bcd55
1 parent 7ce7bb6
commit c2bcd55
Show file tree

Hide file tree

Showing 3 changed files with 605 additions and 657 deletions.
diff --git a/docs/user/metacat/source/metacat-properties.rst b/docs/user/metacat/source/metacat-properties.rst
@@ -23,19 +23,19 @@ More information on each is included below.
 |                           |                                                                                          |                        |
 |                           | Default Value: localhost                                                                 |                        |
 +---------------------------+------------------------------------------------------------------------------------------+------------------------+
-| .. _server-httpPort:      |                                                                                          |                        |
+| .. _server-port:          |                                                                                          |                        |
 |                           |                                                                                          |                        |
-| server.httpPort           | The network port used to access Metacat for non-secure (standard) connections.           | 80                     |
-|                           | This is usually 80 if Apache Web server is running, and 8080 if Tomcat is running alone. |                        |
+| server.port               | The network port used to access Metacat for connections.                                 | 443                    |
+|                           | This can be either an https port, such as 443, or an http port, such as 80.              |                        |
 |                           |                                                                                          |                        |
-|                           | Default Value: 80                                                                        |                        |
+|                           | Default Value: 443                                                                       |                        |
 +---------------------------+------------------------------------------------------------------------------------------+------------------------+
-| .. _server-httpSSLPort:   |                                                                                          |                        |
+| .. _server-https:         |                                                                                          |                        |
 |                           |                                                                                          |                        |
-| server.httpSSLPort        | The network port used to access Metacat for secure connections. This is usually          | 443                    |
-|                           | 443 if Apache Web server is running, and 8443 if Tomcat is running alone.                |                        |
+| server.https              | To indicate the server port is an https one or an http one.                              | true                   |
+|                           | True means an https port; false means an http port.                                      |                        |
 |                           |                                                                                          |                        |
-|                           | Default Value: 443                                                                       |                        |
+|                           | Default Value: true                                                                      |                        |
 +---------------------------+------------------------------------------------------------------------------------------+------------------------+
 | .. _server-internalName:  |                                                                                          |                        |
 |                           |                                                                                          |                        |

diff --git a/lib/metacat.properties b/lib/metacat.properties
@@ -25,8 +25,8 @@ configutil.upgrade.solr.status=
 ############### Server Values #################
 
 server.name=localhost
-server.httpPort=80
-server.httpSSLPort=443
+server.port=443
+server.https=true
 server.internalName=localhost
 server.internalPort=80