Repository: stratos Updated Branches: refs/heads/master cca8e64e1 -> 3da25af49
Updating stratos-installer artifacts to the latest : STRATOS-1392 Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3da25af4 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3da25af4 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3da25af4 Branch: refs/heads/master Commit: 3da25af49119ae1f439cb2506b42d767fe87a99f Parents: cca8e64 Author: lasinducharith <[email protected]> Authored: Tue May 12 12:14:38 2015 +0530 Committer: lasinducharith <[email protected]> Committed: Tue May 12 12:14:38 2015 +0530 ---------------------------------------------------------------------- .../config/all/repository/conf/autoscaler.xml | 12 ++++++------ .../all/repository/conf/cartridge-config.properties | 1 + .../config/all/repository/conf/identity.xml | 7 +++++++ 3 files changed, 14 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/3da25af4/tools/stratos-installer/config/all/repository/conf/autoscaler.xml ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/all/repository/conf/autoscaler.xml b/tools/stratos-installer/config/all/repository/conf/autoscaler.xml index 694f150..fb3ab09 100755 --- a/tools/stratos-installer/config/all/repository/conf/autoscaler.xml +++ b/tools/stratos-installer/config/all/repository/conf/autoscaler.xml @@ -21,9 +21,9 @@ <autoscaler> <cloudController> <hostname>CC_HOSTNAME</hostname> - <port>CC_LISTEN_PORT</port> - <!-->CC client timout in ms<--> - <clientTimeout>300000</clientTimeout> + <port>CC_LISTEN_PORT</port> + <!-->CC client timout in ms<--> + <clientTimeout>300000</clientTimeout> </cloudController> <stratosManager> <hostname>SM_HOSTNAME</hostname> @@ -32,8 +32,8 @@ <clientTimeout>300000</clientTimeout> </stratosManager> <identity> - <hostname>localhost</hostname> - <port>9443</port> + <hostname>SM_HOSTNAME</hostname> + <port>SM_LISTEN_PORT</port> <clientTimeout>300000</clientTimeout> </identity> <member> @@ -46,7 +46,7 @@ </member> <cluster> <!-- cluster monitoring interval (ms) --> - <monitorInterval>1800000</monitorInterval> + <monitorInterval>90000</monitorInterval> </cluster> <threadpool> <identifier>Autoscaler</identifier> http://git-wip-us.apache.org/repos/asf/stratos/blob/3da25af4/tools/stratos-installer/config/all/repository/conf/cartridge-config.properties ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/all/repository/conf/cartridge-config.properties b/tools/stratos-installer/config/all/repository/conf/cartridge-config.properties index 8d4b730..fb11f48 100644 --- a/tools/stratos-installer/config/all/repository/conf/cartridge-config.properties +++ b/tools/stratos-installer/config/all/repository/conf/cartridge-config.properties @@ -26,4 +26,5 @@ stratos.manager.service.url=https://localhost:9443/services/StratosManagerServic cloud.controller.service.url=https://CC_HOSTNAME:CC_HTTPS_PORT/services/CloudControllerService/ puppet.ip=PUPPET_IP puppet.hostname=PUPPET_HOSTNAME +puppet.dns.available=false puppet.environment=PUPPET_ENV http://git-wip-us.apache.org/repos/asf/stratos/blob/3da25af4/tools/stratos-installer/config/all/repository/conf/identity.xml ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/all/repository/conf/identity.xml b/tools/stratos-installer/config/all/repository/conf/identity.xml index 42bd801..b4b3c41 100755 --- a/tools/stratos-installer/config/all/repository/conf/identity.xml +++ b/tools/stratos-installer/config/all/repository/conf/identity.xml @@ -195,6 +195,7 @@ </MultifactorAuthentication> <SSOService> + <EntityId>localhost</EntityId> <IdentityProviderURL>https://localhost:9443/samlsso</IdentityProviderURL> <SingleLogoutRetryCount>5</SingleLogoutRetryCount> <SingleLogoutRetryInterval>60000</SingleLogoutRetryInterval> <!-- in milli seconds --> @@ -205,8 +206,14 @@ <AttributesClaimDialect>http://wso2.org/claims</AttributesClaimDialect> <AcceptOpenIDLogin>false</AcceptOpenIDLogin> <ClaimsRetrieverImplClass>org.wso2.carbon.identity.sso.saml.builders.claims.DefaultClaimsRetriever</ClaimsRetrieverImplClass> + <SAMLSSOEncrypter>org.wso2.carbon.identity.sso.saml.builders.encryption.DefaultSSOEncrypter</SAMLSSOEncrypter> + <SAMLSSOSigner>org.wso2.carbon.identity.sso.saml.builders.signature.DefaultSSOSigner</SAMLSSOSigner> + <SAML2HTTPRedirectSignatureValidator>org.wso2.carbon.identity.sso.saml.validators.SAML2HTTPRedirectDeflateSignatureValidator</SAML2HTTPRedirectSignatureValidator> + <!--SAMLSSOResponseBuilder>org.wso2.carbon.identity.sso.saml.builders.DefaultResponseBuilder</SAMLSSOResponseBuilder--> + <!-- SAML Token validity period in minutes --> <SAMLResponseValidityPeriod>5</SAMLResponseValidityPeriod> + <UseAuthenticatedUserDomain>false</UseAuthenticatedUserDomain> </SSOService> <EntitlementSettings>
