[https] Mold 포트변경 및 https로 전환

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<String> 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<String> ApiServletPath = new ConfigKey<String>("Advanced", String.class, "endpoint.url", "http://localhost:8080/client/api",
+    public static final ConfigKey<String> ApiServletPath = new ConfigKey<String>("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<Long> DefaultUIPageSize = new ConfigKey<Long>("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);
@@ -29,13 +29,13 @@ public class ApiServiceConfiguration implements Configurable {public static fina
     public static final ConfigKey<String> MonitoringWallPortalProtocol = new ConfigKey<String>("Advanced", String.class, "monitoring.wall.portal.protocol",
             "https", "Monitoring Service Wall Portal Protocol.(ex: http or https)", true);
     public static final ConfigKey<String> MonitoringWallPortalDomain = new ConfigKey<String>("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<String> 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<String> ApiAllowedSourceCidr = new ConfigKey<String>("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<String> MonitoringWallPortalPort = new ConfigKey<String>("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<String> MonitoringWallPortalVmUri = new ConfigKey<String>("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<String> MonitoringWallPortalHostUri = new ConfigKey<String>("Advanced", String.class, "monitoring.wall.portal.host.uri",

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

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));

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<String> 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<String> WALL_API_TOKEN =

plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2AuthManager.java

@@ -43,13 +43,13 @@ public interface SAML2AuthManager extends PluggableAPIAuthenticator, PluggableSe
     ConfigKey<String> SAMLServiceProviderOrgUrl = new ConfigKey<String>("Advanced", String.class, "saml2.sp.org.url", "http://cloudstack.apache.org",
             "SAML2 Service Provider Organization URL", true);
 
-    ConfigKey<String> SAMLServiceProviderSingleSignOnURL = new ConfigKey<String>("Advanced", String.class, "saml2.sp.sso.url", "http://localhost:8080/client/api?command=samlSso",
+    ConfigKey<String> SAMLServiceProviderSingleSignOnURL = new ConfigKey<String>("Advanced", String.class, "saml2.sp.sso.url", "https://localhost:443/client/api?command=samlSso",
             "SAML2 CloudStack Service Provider Single Sign On URL", true);
 
-    ConfigKey<String> SAMLServiceProviderSingleLogOutURL = new ConfigKey<String>("Advanced", String.class, "saml2.sp.slo.url", "http://localhost:8080/client/",
+    ConfigKey<String> SAMLServiceProviderSingleLogOutURL = new ConfigKey<String>("Advanced", String.class, "saml2.sp.slo.url", "https://localhost:443/client/",
             "SAML2 CloudStack Service Provider Single Log Out URL", true);
 
-    ConfigKey<String> SAMLCloudStackRedirectionUrl = new ConfigKey<String>("Advanced", String.class, "saml2.redirect.url", "http://localhost:8080/client",
+    ConfigKey<String> SAMLCloudStackRedirectionUrl = new ConfigKey<String>("Advanced", String.class, "saml2.redirect.url", "https://localhost:443/client",
             "The CloudStack UI url the SSO should redirected to when successful", true);
 
     ConfigKey<String> SAMLUserAttributeName = new ConfigKey<String>("Advanced", String.class, "saml2.user.attribute", "uid",
@@ -79,7 +79,7 @@ public interface SAML2AuthManager extends PluggableAPIAuthenticator, PluggableSe
     ConfigKey<String> SAMLUserSessionKeyPathAttribute = new ConfigKey<String>("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<String> SAMLFailedLoginRedirectUrl = new ConfigKey<String>("Advanced", String.class, "saml2.failed.login.redirect.url", "http://localhost:8080/client/#/user/login?ssoLogin=false",
+    ConfigKey<String> SAMLFailedLoginRedirectUrl = new ConfigKey<String>("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();

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(