Merge pull request #2215 from nordic-institute/XRDDEV-2665

fix: XRDDEV-2665 Remove old signer port 5558
nordic-institute · Jul 9, 2024 · d6ca09c · d6ca09c
2 parents 55594da + 01ab5ca
commit d6ca09c
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 20 deletions.
diff --git a/src/common/common-core/src/main/java/ee/ria/xroad/common/PortNumbers.java b/src/common/common-core/src/main/java/ee/ria/xroad/common/PortNumbers.java
@@ -49,9 +49,6 @@ public final class PortNumbers {
     /** Admin port for proxy. */
     public static final int ADMIN_PORT = 5566;
 
-    /** Signer listens for HTTP queries. */
-    public static final int SIGNER_PORT = 5558;
-
     /** Signer Admin port. */
     public static final int SIGNER_ADMIN_PORT = 5559;
 

diff --git a/src/common/common-core/src/main/java/ee/ria/xroad/common/SystemProperties.java b/src/common/common-core/src/main/java/ee/ria/xroad/common/SystemProperties.java
@@ -395,10 +395,6 @@ private SystemProperties() {
     public static final String DEVICE_CONFIGURATION_FILE =
             PREFIX + "signer.device-configuration-file";
 
-    /** Property name of the Signer's port number. */
-    public static final String SIGNER_PORT =
-            PREFIX + "signer.port";
-
     /** Property name of the Signer's admin port number. */
     public static final String SIGNER_ADMIN_PORT =
             PREFIX + "signer.admin-port";
@@ -983,13 +979,6 @@ public static String getServerProxyListenAddress() {
         return System.getProperty(PROXY_SERVER_LISTEN_ADDRESS, DEFAULT_CONNECTOR_HOST);
     }
 
-    /**
-     * @return the HTTP port on which the signer listens for signing requests, '5558' by default.
-     */
-    public static int getSignerPort() {
-        return Integer.parseInt(System.getProperty(SIGNER_PORT, Integer.toString(PortNumbers.SIGNER_PORT)));
-    }
-
     /**
      * @return the port on which the signer admin listens for requests
      */

diff --git a/src/packages/src/xroad/default-configuration/signer.ini b/src/packages/src/xroad/default-configuration/signer.ini
@@ -11,9 +11,6 @@ key-configuration-file=/etc/xroad/signer/keyconf.xml
 ; Timeout in milliseconds of the signer client
 client-timeout=50000
 
-; Port number of Signer
-port=5558
-
 ; Full class name of module instance provider
 ;module-instance-provider=com.foo.barImpl
 

diff --git a/src/signer-console/src/main/java/ee/ria/xroad/signer/console/SignerCLI.java b/src/signer-console/src/main/java/ee/ria/xroad/signer/console/SignerCLI.java
@@ -814,7 +814,7 @@ public static void main(String[] args) throws Exception {
     }
 
     private static void startCommandLoop() throws IOException {
-        String prompt = "signer@" + SystemProperties.getSignerPort();
+        String prompt = "signer@" + SystemProperties.getGrpcSignerPort();
 
         String description = "Enter '?list' to get list of available commands\n"
                 + "Enter '?help <command>' to get command description\n"

diff --git a/src/signer/src/main/java/ee/ria/xroad/signer/SignerMain.java b/src/signer/src/main/java/ee/ria/xroad/signer/SignerMain.java
@@ -78,8 +78,8 @@ public static void main(String[] args) {
     private static void startup() {
         long start = System.currentTimeMillis();
         Version.outputVersionInfo(APP_NAME);
-        int signerPort = SystemProperties.getSignerPort();
-        log.info("Starting Signer on port {}...", signerPort);
+        int grpcSignerPort = SystemProperties.getGrpcSignerPort();
+        log.info("Starting Signer on port {}...", grpcSignerPort);
 
         springCtx = new AnnotationConfigApplicationContext(SignerConfig.class);
         springCtx.registerShutdownHook();