From 861898270e69851e4c87721436ac4560456ea3fc Mon Sep 17 00:00:00 2001 From: stardom3645 Date: Thu, 2 Apr 2026 09:52:08 +0900 Subject: [PATCH 1/3] =?UTF-8?q?mold=20=ED=8F=AC=ED=8A=B8=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=20=EB=B0=8F=20https=EB=A1=9C=20=EC=A0=84=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apache/cloudstack/config/ApiServiceConfiguration.java | 2 +- client/conf/server.properties.in | 8 ++++---- .../src/main/java/org/apache/cloudstack/ServerDaemon.java | 4 ++-- .../java/org/apache/cloudstack/saml/SAML2AuthManager.java | 8 ++++---- server/src/main/java/com/cloud/configuration/Config.java | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/api/src/main/java/org/apache/cloudstack/config/ApiServiceConfiguration.java b/api/src/main/java/org/apache/cloudstack/config/ApiServiceConfiguration.java index 27bee77b4c8c..54e6c23b774d 100644 --- a/api/src/main/java/org/apache/cloudstack/config/ApiServiceConfiguration.java +++ b/api/src/main/java/org/apache/cloudstack/config/ApiServiceConfiguration.java @@ -20,7 +20,7 @@ import org.apache.cloudstack.framework.config.Configurable; public class ApiServiceConfiguration implements Configurable {public static final ConfigKey ManagementServerAddresses = new ConfigKey<>(String.class, "host", "Advanced", "localhost", "The ip address of management server. This can also accept comma separated addresses.", true, ConfigKey.Scope.Global, null, null, null, null, null, ConfigKey.Kind.CSV, null); - public static final ConfigKey ApiServletPath = new ConfigKey("Advanced", String.class, "endpoint.url", "http://localhost:8080/client/api", + public static final ConfigKey ApiServletPath = new ConfigKey("Advanced", String.class, "endpoint.url", "https://localhost:443/client/api", "API end point. Can be used by CS components/services deployed remotely, for sending CS API requests", true); public static final ConfigKey DefaultUIPageSize = new ConfigKey("Advanced", Long.class, "default.ui.page.size", "20", "The default pagesize to be used by UI and other clients when making list* API calls", true, ConfigKey.Scope.Global); diff --git a/client/conf/server.properties.in b/client/conf/server.properties.in index ddfcb3afe97a..1f3623362b63 100644 --- a/client/conf/server.properties.in +++ b/client/conf/server.properties.in @@ -23,7 +23,7 @@ context.path=/client # The HTTP port to be used by the management server -http.enable=true +http.enable=false http.port=8080 # Max inactivity time in minutes for the session @@ -36,11 +36,11 @@ request.content.size=1048576 # # For the management server to pick up these configuration settings, the configured # keystore file should exist and be readable by the management server. -https.enable=false -https.port=8443 +https.enable=true +https.port=443 # The keystore and manager passwords are assumed to be same. -https.keystore=/etc/cloudstack/management/cloud.jks +https.keystore=/etc/cloudstack/management/keystore # If you want to encrypt the password itself, follow the steps mentioned at: http://docs.cloudstack.apache.org/en/latest/adminguide/management.html?highlight=jasypt#changing-the-database-password https.keystore.password=vmops.com diff --git a/client/src/main/java/org/apache/cloudstack/ServerDaemon.java b/client/src/main/java/org/apache/cloudstack/ServerDaemon.java index a003a36a793d..6be32e344add 100644 --- a/client/src/main/java/org/apache/cloudstack/ServerDaemon.java +++ b/client/src/main/java/org/apache/cloudstack/ServerDaemon.java @@ -91,7 +91,7 @@ public class ServerDaemon implements Daemon { private boolean httpEnable = true; private int httpPort = 8080; - private int httpsPort = 8443; + private int httpsPort = 443; private int sessionTimeout = 10; private int maxFormContentSize = DEFAULT_REQUEST_CONTENT_SIZE; private boolean httpsEnable = false; @@ -134,7 +134,7 @@ public void init(final DaemonContext context) { setHttpEnable(Boolean.valueOf(properties.getProperty(HTTP_ENABLE, "true"))); setHttpPort(Integer.valueOf(properties.getProperty(HTTP_PORT, "8080"))); setHttpsEnable(Boolean.valueOf(properties.getProperty(HTTPS_ENABLE, "false"))); - setHttpsPort(Integer.valueOf(properties.getProperty(HTTPS_PORT, "8443"))); + setHttpsPort(Integer.valueOf(properties.getProperty(HTTPS_PORT, "443"))); setKeystoreFile(properties.getProperty(KEYSTORE_FILE)); setKeystorePassword(properties.getProperty(KEYSTORE_PASSWORD)); setWebAppLocation(properties.getProperty(WEBAPP_DIR)); diff --git a/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2AuthManager.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2AuthManager.java index 69f97fb401b5..90b6053635e5 100644 --- a/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2AuthManager.java +++ b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2AuthManager.java @@ -43,13 +43,13 @@ public interface SAML2AuthManager extends PluggableAPIAuthenticator, PluggableSe ConfigKey SAMLServiceProviderOrgUrl = new ConfigKey("Advanced", String.class, "saml2.sp.org.url", "http://cloudstack.apache.org", "SAML2 Service Provider Organization URL", true); - ConfigKey SAMLServiceProviderSingleSignOnURL = new ConfigKey("Advanced", String.class, "saml2.sp.sso.url", "http://localhost:8080/client/api?command=samlSso", + ConfigKey SAMLServiceProviderSingleSignOnURL = new ConfigKey("Advanced", String.class, "saml2.sp.sso.url", "https://localhost:443/client/api?command=samlSso", "SAML2 CloudStack Service Provider Single Sign On URL", true); - ConfigKey SAMLServiceProviderSingleLogOutURL = new ConfigKey("Advanced", String.class, "saml2.sp.slo.url", "http://localhost:8080/client/", + ConfigKey SAMLServiceProviderSingleLogOutURL = new ConfigKey("Advanced", String.class, "saml2.sp.slo.url", "https://localhost:443/client/", "SAML2 CloudStack Service Provider Single Log Out URL", true); - ConfigKey SAMLCloudStackRedirectionUrl = new ConfigKey("Advanced", String.class, "saml2.redirect.url", "http://localhost:8080/client", + ConfigKey SAMLCloudStackRedirectionUrl = new ConfigKey("Advanced", String.class, "saml2.redirect.url", "https://localhost:443/client", "The CloudStack UI url the SSO should redirected to when successful", true); ConfigKey SAMLUserAttributeName = new ConfigKey("Advanced", String.class, "saml2.user.attribute", "uid", @@ -79,7 +79,7 @@ public interface SAML2AuthManager extends PluggableAPIAuthenticator, PluggableSe ConfigKey SAMLUserSessionKeyPathAttribute = new ConfigKey("Advanced", String.class, "saml2.user.sessionkey.path", "", "The Path attribute of sessionkey cookie when SAML users have logged in. If not set, it will be set to the path of SAML redirection URL (saml2.redirect.url).", true); - ConfigKey SAMLFailedLoginRedirectUrl = new ConfigKey("Advanced", String.class, "saml2.failed.login.redirect.url", "http://localhost:8080/client/#/user/login?ssoLogin=false", + ConfigKey SAMLFailedLoginRedirectUrl = new ConfigKey("Advanced", String.class, "saml2.failed.login.redirect.url", "https://localhost:443/client/#/user/login?ssoLogin=false", "The URL to redirect the SAML2 login failed message.", true); SAMLProviderMetadata getSPMetadata(); diff --git a/server/src/main/java/com/cloud/configuration/Config.java b/server/src/main/java/com/cloud/configuration/Config.java index c4c180b4215d..f96c645463c9 100644 --- a/server/src/main/java/com/cloud/configuration/Config.java +++ b/server/src/main/java/com/cloud/configuration/Config.java @@ -1686,7 +1686,7 @@ public enum Config { ManagementServer.class, Integer.class, "baremetal.provision.done.notification.port", - "8080", + "433", "the port that listens baremetal provision done notification. Should be the same to port management server listening on for now. Please change it to management server port if it's not default 8080", null), ExternalBaremetalSystemUrl( From 88eebfd3978932dea0018abe48abda12a69f0449 Mon Sep 17 00:00:00 2001 From: stardom3645 Date: Thu, 2 Apr 2026 13:28:00 +0900 Subject: [PATCH 2/3] =?UTF-8?q?mold=20=ED=8F=AC=ED=8A=B8=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=20=EB=B0=8F=20https=EB=A1=9C=20=EC=A0=84=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/apache/cloudstack/config/ApiServiceConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/org/apache/cloudstack/config/ApiServiceConfiguration.java b/api/src/main/java/org/apache/cloudstack/config/ApiServiceConfiguration.java index 54e6c23b774d..687609d18285 100644 --- a/api/src/main/java/org/apache/cloudstack/config/ApiServiceConfiguration.java +++ b/api/src/main/java/org/apache/cloudstack/config/ApiServiceConfiguration.java @@ -29,13 +29,13 @@ public class ApiServiceConfiguration implements Configurable {public static fina public static final ConfigKey MonitoringWallPortalProtocol = new ConfigKey("Advanced", String.class, "monitoring.wall.portal.protocol", "https", "Monitoring Service Wall Portal Protocol.(ex: http or https)", true); public static final ConfigKey MonitoringWallPortalDomain = new ConfigKey("Advanced", String.class, "monitoring.wall.portal.domain", - "", "Monitoring Service Wall Portal Domain.(ex: id or domain)", true); + "ccvm", "Monitoring Service Wall Portal Domain.(ex: id or domain)", true); public static final ConfigKey ApiAllowedSourceIp = new ConfigKey<>(String.class, "api.allowed.source.ip", "Advanced", "0.0.0.0", "Comma separated list of IPv4/IPv6 CIDRs from which API calls can be performed. Can be set on Global and Account levels.", true, ConfigKey.Scope.Account, null, null, null, null, null, ConfigKey.Kind.CSV, null); public static final ConfigKey ApiAllowedSourceCidr = new ConfigKey("Advanced", String.class, "api.allowed.source.cidr", "0", "A cidr setting that allows you to make api calls.", true, ConfigKey.Scope.Account); public static final ConfigKey MonitoringWallPortalPort = new ConfigKey("Advanced", String.class, "monitoring.wall.portal.port", - "8081", "Monitoring Service Wall Portal Port.(ex:3000)", true); + "19400", "Monitoring Service Wall Portal Port.(ex:3000)", true); public static final ConfigKey MonitoringWallPortalVmUri = new ConfigKey("Advanced", String.class, "monitoring.wall.portal.vm.uri", "/d/uservm?kiosk", "Monitoring Service Wall Portal VM Uri.(ex:/d/uservm?kiosk)", true); public static final ConfigKey MonitoringWallPortalHostUri = new ConfigKey("Advanced", String.class, "monitoring.wall.portal.host.uri", From 00035ee531f0183a9e289283d7c0647730e7c9ea Mon Sep 17 00:00:00 2001 From: stardom3645 Date: Thu, 2 Apr 2026 17:11:51 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EA=B8=80=EB=A1=9C=EB=B2=8C=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=EC=9D=98=20wall=20=ED=8F=AC=ED=8A=B8=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=EA=B0=92=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/apache/cloudstack/wallAlerts/config/WallConfigKeys.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/integrations/wall-alerts/src/main/java/org/apache/cloudstack/wallAlerts/config/WallConfigKeys.java b/plugins/integrations/wall-alerts/src/main/java/org/apache/cloudstack/wallAlerts/config/WallConfigKeys.java index 9f4975c7cf0b..060563bdb9ad 100644 --- a/plugins/integrations/wall-alerts/src/main/java/org/apache/cloudstack/wallAlerts/config/WallConfigKeys.java +++ b/plugins/integrations/wall-alerts/src/main/java/org/apache/cloudstack/wallAlerts/config/WallConfigKeys.java @@ -10,7 +10,7 @@ private WallConfigKeys() {} "Enable Wall alerts integration.", false); public static final ConfigKey WALL_BASE_URL = - new ConfigKey<>("Advanced", String.class, "wall.base.url", "https://localhost:8081", + new ConfigKey<>("Advanced", String.class, "wall.base.url", "https://localhost:19400", "Base URL of Wall.", false, WALL_ALERT_ENABLED.key()); public static final ConfigKey WALL_API_TOKEN =