Refactoring stratos-installer files : STRATOS-1393
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4c8ba95d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4c8ba95d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4c8ba95d Branch: refs/heads/master Commit: 4c8ba95d1a50970c0d71f5427d583e9276f67706 Parents: e615fb8 Author: lasinducharith <[email protected]> Authored: Tue May 12 19:28:37 2015 +0530 Committer: lasinducharith <[email protected]> Committed: Tue May 12 19:28:37 2015 +0530 ---------------------------------------------------------------------- tools/stratos-installer/conf/setup.conf | 2 +- .../repository/conf/activemq/jndi.properties | 29 --- .../config/all/repository/conf/autoscaler.xml | 56 ----- .../repository/conf/cartridge-config.properties | 30 --- .../all/repository/conf/cloud-controller.xml | 104 -------- .../conf/datasources/master-datasources.xml | 129 ---------- .../conf/datasources/stratos-datasources.xml | 51 ---- .../config/all/repository/conf/identity.xml | 252 ------------------- .../config/all/repository/conf/jndi.properties | 33 --- .../all/repository/conf/metadataservice.xml | 37 --- .../security/application-authentication.xml | 123 --------- .../all/repository/conf/wso2mb/jndi.properties | 20 -- tools/stratos-installer/setup.sh | 12 +- .../templates/activemq/jndi.properties | 29 +++ .../stratos-installer/templates/autoscaler.xml | 56 +++++ .../templates/cartridge-config.properties | 30 +++ .../templates/cloud-controller.xml | 104 ++++++++ .../datasources/master-datasources.xml | 129 ++++++++++ .../datasources/stratos-datasources.xml | 51 ++++ tools/stratos-installer/templates/identity.xml | 252 +++++++++++++++++++ .../stratos-installer/templates/jndi.properties | 33 +++ .../security/application-authentication.xml | 123 +++++++++ .../templates/wso2mb/jndi.properties | 20 ++ 23 files changed, 834 insertions(+), 871 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/4c8ba95d/tools/stratos-installer/conf/setup.conf ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf index 66ebd88..be2c867 100644 --- a/tools/stratos-installer/conf/setup.conf +++ b/tools/stratos-installer/conf/setup.conf @@ -61,7 +61,7 @@ export stratos_pack_zip=$stratos_packs/$stratos_pack_zip_name export activemq_pack=$stratos_packs/"apache-activemq-5.9.1-bin.tar.gz" export activemq_path=$stratos_path/"apache-activemq-5.9.1" -export jndi_template_path=$setup_path/"config/all/repository/conf/activemq/jndi.properties" +export jndi_template_path=$setup_path/"templates/activemq/jndi.properties" export resource_path=$setup_path/resources http://git-wip-us.apache.org/repos/asf/stratos/blob/4c8ba95d/tools/stratos-installer/config/all/repository/conf/activemq/jndi.properties ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/all/repository/conf/activemq/jndi.properties b/tools/stratos-installer/config/all/repository/conf/activemq/jndi.properties deleted file mode 100644 index 8ce5c13..0000000 --- a/tools/stratos-installer/config/all/repository/conf/activemq/jndi.properties +++ /dev/null @@ -1,29 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -# register some connection factories -# connectionfactory.[jndiname]=[ConnectionURL] - -connectionfactoryName=TopicConnectionFactory -java.naming.provider.url=tcp://MB_HOSTNAME:MB_LISTEN_PORT -java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory - -# register some topics in JNDI using the form -# topic.[jndiName]=[physicalName] -topic.lb-stats=lb-stats -topic.instance-stats=instance-stats -topic.summarized-health-stats=summarized-health-stats http://git-wip-us.apache.org/repos/asf/stratos/blob/4c8ba95d/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 deleted file mode 100755 index fb3ab09..0000000 --- a/tools/stratos-installer/config/all/repository/conf/autoscaler.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<configuration> - <autoscaler> - <cloudController> - <hostname>CC_HOSTNAME</hostname> - <port>CC_LISTEN_PORT</port> - <!-->CC client timout in ms<--> - <clientTimeout>300000</clientTimeout> - </cloudController> - <stratosManager> - <hostname>SM_HOSTNAME</hostname> - <port>SM_LISTEN_PORT</port> - <!--SM client timeout in ms--> - <clientTimeout>300000</clientTimeout> - </stratosManager> - <identity> - <hostname>SM_HOSTNAME</hostname> - <port>SM_LISTEN_PORT</port> - <clientTimeout>300000</clientTimeout> - </identity> - <member> - <!-- this is the maximum time(ms) a member can be in pending member state --> - <pendingMemberExpiryTimeout>900000</pendingMemberExpiryTimeout> - <!-- this is the maximum time(ms) a member can be in obsoleted member state --> - <obsoletedMemberExpiryTimeout>86400000</obsoletedMemberExpiryTimeout> - <!-- this is the maximum time(ms) a member can be in pending termination member state --> - <pendingTerminationMemberExpiryTimeout>1800000</pendingTerminationMemberExpiryTimeout> - </member> - <cluster> - <!-- cluster monitoring interval (ms) --> - <monitorInterval>90000</monitorInterval> - </cluster> - <threadpool> - <identifier>Autoscaler</identifier> - <threadPoolSize>10</threadPoolSize> - </threadpool> - </autoscaler> -</configuration> http://git-wip-us.apache.org/repos/asf/stratos/blob/4c8ba95d/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 deleted file mode 100644 index fb11f48..0000000 --- a/tools/stratos-installer/config/all/repository/conf/cartridge-config.properties +++ /dev/null @@ -1,30 +0,0 @@ -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# - -# Configuration properties - -autoscaler.service.url=https://AS_HOSTNAME:AS_HTTPS_PORT/services/AutoscalerService/ -stratos.manager.service.url=https://localhost:9443/services/StratosManagerService/ -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/4c8ba95d/tools/stratos-installer/config/all/repository/conf/cloud-controller.xml ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/all/repository/conf/cloud-controller.xml b/tools/stratos-installer/config/all/repository/conf/cloud-controller.xml deleted file mode 100644 index b4548e0..0000000 --- a/tools/stratos-installer/config/all/repository/conf/cloud-controller.xml +++ /dev/null @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - # Licensed to the Apache Software Foundation (ASF) under one - # or more contributor license agreements. See the NOTICE file - # distributed with this work for additional information - # regarding copyright ownership. The ASF licenses this file - # to you under the Apache License, Version 2.0 (the - # "License"); you may not use this file except in compliance - # with the License. You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, - # software distributed under the License is distributed on an - # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - # KIND, either express or implied. See the License for the - # specific language governing permissions and limitations - # under the License. - --> -<cloudController xmlns:svns="http://org.wso2.securevault/configuration";> - - <svns:secureVault - provider="org.wso2.securevault.secret.handler.SecretManagerSecretCallbackHandler" /> - - <dataPublisher enable="false"> - <!-- BAM Server Info - default values are 'admin' and 'admin' - Optional element. --> - <bamServer> - <!-- BAM server URL should be specified in carbon.xml --> - <adminUserName>admin</adminUserName> - <adminPassword svns:secretAlias="cloud.controller.bam.server.admin.password">admin</adminPassword> - </bamServer> - <!-- Default cron expression is '1 * * * * ? *' meaning 'first second of every minute'. - Optional element. --> - <cron>1 * * * * ? *</cron> - <!-- Cassandra cluster related info --> - <!--cassandraInfo> - <connectionUrl>localhost:9160</connectionUrl> - <userName>admin</userName> - <password svns:secretAlias="cloud.controller.cassandra.server.password">admin</password> - </cassandraInfo--> - </dataPublisher> - - <topologySync enable="true"> - <property name="cron" value="1 * * * * ? *" /> - </topologySync> - - <!-- Specify the properties that are common to an IaaS here. This element - is not necessary [0..1]. But you can use this section to avoid specifying - same property over and over again. --> - <iaasProviders> - <EC2_PROVIDER_STARTiaasProvider type="ec2" name="ec2 specific details"> - <className>org.apache.stratos.cloud.controller.iaases.ec2.EC2Iaas</className> - <provider>aws-ec2</provider> - <identity svns:secretAlias="cloud.controller.ec2.identity">EC2_IDENTITY</identity> - <credential svns:secretAlias="cloud.controller.ec2.credential">EC2_CREDENTIAL</credential> - <property name="jclouds.ec2.ami-query" value="owner-id=EC2_OWNER_ID;state=available;image-type=machine"/> - <property name="availabilityZone" value="EC2_AVAILABILITY_ZONE"/> - <property name="securityGroups" value="EC2_SECURITY_GROUPS"/> - <property name="autoAssignIp" value="true" /> - <property name="keyPair" value="EC2_KEYPAIR"/> - </iaasProviderEC2_PROVIDER_END> - <OPENSTACK_PROVIDER_STARTiaasProvider type="openstack" name="openstack specific details"> - <className>org.apache.stratos.cloud.controller.iaases.openstack.OpenstackIaas</className> - <provider>openstack-nova</provider> - <identity svns:secretAlias="cloud.controller.openstack.identity">OPENSTACK_IDENTITY</identity> - <credential svns:secretAlias="cloud.controller.openstack.credential">OPENSTACK_CREDENTIAL</credential> - <property name="jclouds.endpoint" value="OPENSTACK_ENDPOINT" /> - <property name="jclouds.openstack-nova.auto-create-floating-ips" value="false"/> - <property name="jclouds.api-version" value="2.0/" /> - <property name="openstack.networking.provider" value="OPENSTACK_NETWORKING_PROVIDER" /> - <property name="X" value="x" /> - <property name="Y" value="y" /> - <property name="securityGroups" value="OPENSTACK_SECURITY_GROUPS"/> - <property name="keyPair" value="OPENSTACK_KEYPAIR"/> - </iaasProviderOPENSTACK_PROVIDER_END> - <VCLOUD_PROVIDER_STARTiaasProvider type="vcloud" name="VMware vCloud specific details"> - <className>org.apache.stratos.cloud.controller.iaases.vcloud.VCloudIaas</className> - <provider>vcloud</provider> - <identity svns:secretAlias="cloud.controller.vcloud.identity">VCLOUD_IDENTITY</identity> - <credential svns:secretAlias="cloud.controller.vcloud.credential">VCLOUD_CREDENTIAL</credential> - <property name="jclouds.endpoint" value="VCLOUD_ENDPOINT" /> - <property name="jclouds.vcloud.version.schema" value="1.5" /> - <property name="jclouds.api-version" value="1.5" /> - <property name="autoAssignIp" value="true" /> - <property name="X" value="x" /> - <property name="Y" value="y" /> - </iaasProviderVCLOUD_PROVIDER_END> - <GCE_PROVIDER_STARTiaasProvider type="gce" name="GCE specific details"> - <className>org.apache.stratos.cloud.controller.iaases.gce.GCEIaas</className> - <provider>google-compute-engine</provider> - <identity svns:secretAlias="cloud.controller.gce.identity">GCE_IDENTITY</identity> - <credential svns:secretAlias="cloud.controller.gce.credential">GCE_CREDENTIAL</credential> - <property name="projectName" value="GCE_PROJECTNAME" />> - <property name="autoAssignIp" value="true" /> - </iaasProviderGCE_PROVIDER_END> - <KUBERNETES_PROVIDER_STARTiaasProvider type="kubernetes" name="KUBERNETES specific details"> - <className>org.apache.stratos.cloud.controller.iaases.kubernetes.KubernetesIaas</className> - <provider>kubernetes</provider> - <identity svns:secretAlias="cloud.controller.kubernetes.identity">identity</identity> - <credential svns:secretAlias="cloud.controller.kubernetes.credential">credential</credential> - </iaasProviderKUBERNETES_PROVIDER_END> - </iaasProviders> -</cloudController> http://git-wip-us.apache.org/repos/asf/stratos/blob/4c8ba95d/tools/stratos-installer/config/all/repository/conf/datasources/master-datasources.xml ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/all/repository/conf/datasources/master-datasources.xml b/tools/stratos-installer/config/all/repository/conf/datasources/master-datasources.xml deleted file mode 100644 index 34dee42..0000000 --- a/tools/stratos-installer/config/all/repository/conf/datasources/master-datasources.xml +++ /dev/null @@ -1,129 +0,0 @@ -<?xml version='1.0'?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---> - -<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration";> - - <providers> - <provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider> - </providers> - - <datasources> - - <datasource> - <name>WSO2_CARBON_DB</name> - <description>The datasource used for registry and user manager</description> - <jndiConfig> - <name>jdbc/WSO2CarbonDB</name> - </jndiConfig> - <definition type="RDBMS"> - <configuration> - <url>jdbc:mysql://USERSTORE_DB_HOSTNAME:USERSTORE_DB_PORT/USERSTORE_DB_SCHEMA?autoReconnect=true</url> - <username>USERSTORE_DB_USER</username> - <password>USERSTORE_DB_PASS</password> - <driverClassName>com.mysql.jdbc.Driver</driverClassName> - <maxActive>50</maxActive> - <maxWait>60000</maxWait> - <testOnBorrow>true</testOnBorrow> - <validationQuery>SELECT 1</validationQuery> - <validationInterval>30000</validationInterval> - </configuration> - </definition> - </datasource> - - <!--datasource> - <name>WSO2BAM_DATASOURCE</name> - <description>The datasource used for analyzer data</description> - <definition type="RDBMS"> - <configuration> - <url>jdbc:h2:repository/database/samples/BAM_STATS_DB;AUTO_SERVER=TRUE</url> - <username>wso2carbon</username> - <password>wso2carbon</password> - <driverClassName>org.h2.Driver</driverClassName> - <maxActive>50</maxActive> - <maxWait>60000</maxWait> - <testOnBorrow>true</testOnBorrow> - <validationQuery>SELECT 1</validationQuery> - <validationInterval>30000</validationInterval> - </configuration> - </definition> - </datasource> - - <datasource> - <name>WSO2BillingDS</name> - <description>The datasource used for registry and user manager</description> - <jndiConfig> - <name>jdbc/WSO2BillingDS</name> - </jndiConfig> - <definition type="RDBMS"> - <configuration> - - <url>jdbc:mysql://BILLING_DB_HOSTNAME:BILLING_DB_PORT/BILLING_DB_SCHEMA</url> - <username>BILLING_USERNAME</username> - <password>BILLING_PASSWORD</password> - <driverClassName>com.mysql.jdbc.Driver</driverClassName> - <maxActive>50</maxActive> - <maxWait>60000</maxWait> - <testOnBorrow>true</testOnBorrow> - <validationQuery>SELECT 1</validationQuery> - <validationInterval>30000</validationInterval> - </configuration> - </definition> - </datasource--> - - <!-- For an explanation of the properties, see: http://people.apache.org/~fhanik/jdbc-pool/jdbc-pool.html --> - <!--datasource> - <name>SAMPLE_DATA_SOURCE</name> - <jndiConfig> - <name></name> - <environment> - <property name="java.naming.factory.initial"></property> - <property name="java.naming.provider.url"></property> - </environment> - </jndiConfig> - <definition type="RDBMS"> - <configuration> - - <defaultAutoCommit></defaultAutoCommit> - <defaultReadOnly></defaultReadOnly> - <defaultTransactionIsolation>NONE|READ_COMMITTED|READ_UNCOMMITTED|REPEATABLE_READ|SERIALIZABLE</defaultTransactionIsolation> - <defaultCatalog></defaultCatalog> - <username></username> - <password svns:secretAlias="WSO2.DB.Password"></password> - <maxActive></maxActive> - <maxIdle></maxIdle> - <initialSize></initialSize> - <maxWait></maxWait> - - <dataSourceClassName>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</dataSourceClassName> - <dataSourceProps> - <property name="url">jdbc:mysql://localhost:3306/Test1</property> - <property name="user">root</property> - <property name="password">123</property> - </dataSourceProps> - - </configuration> - </definition> - </datasource--> - - </datasources> - -</datasources-configuration> http://git-wip-us.apache.org/repos/asf/stratos/blob/4c8ba95d/tools/stratos-installer/config/all/repository/conf/datasources/stratos-datasources.xml ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/all/repository/conf/datasources/stratos-datasources.xml b/tools/stratos-installer/config/all/repository/conf/datasources/stratos-datasources.xml deleted file mode 100644 index 73a9739..0000000 --- a/tools/stratos-installer/config/all/repository/conf/datasources/stratos-datasources.xml +++ /dev/null @@ -1,51 +0,0 @@ -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration";> - <providers> - <provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider> - </providers> - <datasources> - - - <datasource> - <name>WSO2BillingDS</name> - <description>The datasource used for registry and user manager</description> - <jndiConfig> - <name>jdbc/WSO2BillingDS</name> - </jndiConfig> - <definition type="RDBMS"> - <configuration> - - <url>jdbc:mysql://BILLING_DB_HOSTNAME:BILLING_DB_PORT/BILLING_DB_SCHEMA</url> - <username>BILLING_USERNAME</username> - <password>BILLING_PASSWORD</password> - <driverClassName>com.mysql.jdbc.Driver</driverClassName> - <maxActive>50</maxActive> - <maxWait>60000</maxWait> - <testOnBorrow>true</testOnBorrow> - <validationQuery>SELECT 1</validationQuery> - <validationInterval>30000</validationInterval> - </configuration> - </definition> - </datasource> - </datasources> - -</datasources-configuration> - http://git-wip-us.apache.org/repos/asf/stratos/blob/4c8ba95d/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 deleted file mode 100755 index b4b3c41..0000000 --- a/tools/stratos-installer/config/all/repository/conf/identity.xml +++ /dev/null @@ -1,252 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- ~ Copyright (c) 2005-2011, WSO2 Inc. (http://www.wso2.org) All Rights - Reserved. ~ ~ WSO2 Inc. licenses this file to you under the Apache License, - ~ Version 2.0 (the "License"); you may not use this file except ~ in compliance - with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ ~ Unless required by applicable law or agreed to in writing, ~ software - distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT - WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the - License for the ~ specific language governing permissions and limitations - ~ under the License. --> - -<Server xmlns="http://wso2.org/projects/carbon/carbon.xml";> - - <JDBCPersistenceManager> - <DataSource> - <!-- Include a data source name (jndiConfigName) from the set of data - sources defined in master-datasources.xml --> - <Name>jdbc/WSO2CarbonDB</Name> - </DataSource> - <!-- If the identity database is created from another place and if it is - required to skip schema initialization during the server start up, set the - following property to "true". --> - <!-- <SkipDBSchemaCreation>false</SkipDBSchemaCreation> --> - </JDBCPersistenceManager> - - <!-- Security configurations --> - <Security> - <UserTrustedRPStore> - <Location>${carbon.home}/repository/resources/security/userRP.jks - </Location> - <!-- Keystore type (JKS/PKCS12 etc.) --> - <Type>JKS</Type> - <!-- Keystore password --> - <Password>wso2carbon</Password> - <!-- Private Key password --> - <KeyPassword>wso2carbon</KeyPassword> - </UserTrustedRPStore> - - <!-- The directory under which all other KeyStore files will be stored --> - <KeyStoresDir>${carbon.home}/conf/keystores</KeyStoresDir> - </Security> - - <Identity> - <IssuerPolicy>SelfAndManaged</IssuerPolicy> - <TokenValidationPolicy>CertValidate</TokenValidationPolicy> - <BlackList></BlackList> - <WhiteList></WhiteList> - <System> - <KeyStore></KeyStore> - <StorePass></StorePass> - </System> - </Identity> - - <OpenID> - <OpenIDServerUrl>https://localhost:9443/openidserver</OpenIDServerUrl> - <OpenIDUserPattern>https://localhost:9443/openid/</OpenIDUserPattern> - <!-- If the users must be prompted for approval --> - <OpenIDSkipUserConsent>false</OpenIDSkipUserConsent> - <!-- Expiry time of the OpenID RememberMe token in minutes --> - <OpenIDRememberMeExpiry>7200</OpenIDRememberMeExpiry> - <!-- Multifactor Authentication configuration --> - <UseMultifactorAuthentication>false</UseMultifactorAuthentication> - <!-- To enable or disable openid dumb mode --> - <DisableOpenIDDumbMode>false</DisableOpenIDDumbMode> - <!-- remember me session timeout in seconds --> - <SessionTimeout>36000</SessionTimeout> - <!-- skips authentication if valid SAML2 Web SSO browser session available --> - <AcceptSAMLSSOLogin>false</AcceptSAMLSSOLogin> - <ClaimsRetrieverImplClass>org.wso2.carbon.identity.provider.openid.claims.DefaultClaimsRetriever</ClaimsRetrieverImplClass> - </OpenID> - - <OAuth> - <RequestTokenUrl>https://localhost:9443/oauth/request-token</RequestTokenUrl> - <AccessTokenUrl>https://localhost:9443/oauth/access-token</AccessTokenUrl> - <AuthorizeUrl>https://localhost:9443/oauth/authorize-url</AuthorizeUrl> - <!-- Default validity period for Authorization Code in seconds --> - <AuthorizationCodeDefaultValidityPeriod>300</AuthorizationCodeDefaultValidityPeriod> - <!-- Default validity period for user access tokens in seconds --> - <AccessTokenDefaultValidityPeriod>3600</AccessTokenDefaultValidityPeriod> - <!-- Default validity period for application access tokens in seconds --> - <UserAccessTokenDefaultValidityPeriod>3600</UserAccessTokenDefaultValidityPeriod> - <!-- Validity period for refresh token --> - <RefreshTokenValidityPeriod>84600</RefreshTokenValidityPeriod> - <!-- Timestamp skew in seconds --> - <TimestampSkew>300</TimestampSkew> - <!-- Enable OAuth caching --> - <EnableOAuthCache>true</EnableOAuthCache> - <!-- Enable renewal of refresh token for refresh_token grant --> - <RenewRefreshTokenForRefreshGrant>true</RenewRefreshTokenForRefreshGrant> - <!-- Process the token before storing it in database, e.g. encrypting --> - <TokenPersistenceProcessor>org.wso2.carbon.identity.oauth.tokenprocessor.PlainTextPersistenceProcessor</TokenPersistenceProcessor> - <!-- Supported Client Autnetication Methods --> - <ClientAuthHandlers> - <ClientAuthHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.clientauth.BasicAuthClientAuthHandler</ClientAuthHandlerImplClass> - </ClientAuthHandlers> - <!-- Supported Response Types --> - <SupportedResponseTypes> - <SupportedResponseType> - <ResponseTypeName>token</ResponseTypeName> - <ResponseTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.authz.handlers.TokenResponseTypeHandler</ResponseTypeHandlerImplClass> - </SupportedResponseType> - <SupportedResponseType> - <ResponseTypeName>code</ResponseTypeName> - <ResponseTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.authz.handlers.CodeResponseTypeHandler</ResponseTypeHandlerImplClass> - </SupportedResponseType> - </SupportedResponseTypes> - <!-- Supported Grant Types --> - <SupportedGrantTypes> - <SupportedGrantType> - <GrantTypeName>authorization_code</GrantTypeName> - <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.AuthorizationCodeGrantHandler</GrantTypeHandlerImplClass> - </SupportedGrantType> - <SupportedGrantType> - <GrantTypeName>password</GrantTypeName> - <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.PasswordGrantHandler</GrantTypeHandlerImplClass> - </SupportedGrantType> - <SupportedGrantType> - <GrantTypeName>refresh_token</GrantTypeName> - <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.RefreshGrantHandler</GrantTypeHandlerImplClass> - </SupportedGrantType> - <SupportedGrantType> - <GrantTypeName>client_credentials</GrantTypeName> - <!--<GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.ClientCredentialsGrantHandler</GrantTypeHandlerImplClass>--> - <GrantTypeHandlerImplClass>org.apache.stratos.custom.handlers.granttype.ClientCredentialsGrantHandler</GrantTypeHandlerImplClass> - </SupportedGrantType> - <SupportedGrantType> - <GrantTypeName>urn:ietf:params:oauth:grant-type:saml2-bearer</GrantTypeName> - <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.saml.SAML2BearerGrantHandler</GrantTypeHandlerImplClass> - </SupportedGrantType> - <SupportedGrantType> - <GrantTypeName>iwa:ntlm</GrantTypeName> - <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.iwa.ntlm.NTLMAuthenticationGrantHandler</GrantTypeHandlerImplClass> - </SupportedGrantType> - </SupportedGrantTypes> - <OAuthCallbackHandlers> - <OAuthCallbackHandler Class="org.wso2.carbon.identity.oauth.callback.DefaultCallbackHandler" /> - </OAuthCallbackHandlers> - <!--TokenValidators> - <TokenValidator type="bearer" class="org.wso2.carbon.identity.oauth2.validators.DefaultOAuth2TokenValidator"/> - </TokenValidators--> - <!-- Assertions can be used to embedd parameters into access token. --> - <EnableAssertions> - <UserName>false</UserName> - </EnableAssertions> - - <!-- This should be set to true when using multiple user stores and keys - should saved into different tables according to the user store. By default - all the application keys are saved in to the same table. UserName Assertion - should be 'true' to use this. --> - <EnableAccessTokenPartitioning>false</EnableAccessTokenPartitioning> - <!-- user store domain names and mapping to new table name. eg: if you - provide 'A:foo.com', foo.com should be the user store domain name and 'A' - represent the relavant mapping of token store table, i.e. tokens will be - added to a table called IDN_OAUTH2_ACCESS_TOKEN_A. --> - <AccessTokenPartitioningDomains><!-- A:foo.com, B:bar.com --> - </AccessTokenPartitioningDomains> - <AuthorizationContextTokenGeneration> - <Enabled>false</Enabled> - <TokenGeneratorImplClass>org.wso2.carbon.identity.oauth2.authcontext.JWTTokenGenerator</TokenGeneratorImplClass> - <ClaimsRetrieverImplClass>org.wso2.carbon.identity.oauth2.authcontext.DefaultClaimsRetriever</ClaimsRetrieverImplClass> - <ConsumerDialectURI>http://wso2.org/claims</ConsumerDialectURI> - <SignatureAlgorithm>SHA256withRSA</SignatureAlgorithm> - <AuthorizationContextTTL>15</AuthorizationContextTTL> - </AuthorizationContextTokenGeneration> - <SAML2Grant> - <!--SAML2TokenHandler></SAML2TokenHandler--> - </SAML2Grant> - <OpenIDConnect> - <IDTokenBuilder>org.wso2.carbon.identity.openidconnect.DefaultIDTokenBuilder</IDTokenBuilder> - <IDTokenIssuerID>https://localhost:9443/oauth2endpoints/token</IDTokenIssuerID> - <IDTokenSubjectClaim>http://wso2.org/claims/givenname</IDTokenSubjectClaim> - <IDTokenCustomClaimsCallBackHandler>org.wso2.carbon.identity.openidconnect.SAMLAssertionClaimsCallback</IDTokenCustomClaimsCallBackHandler> - <IDTokenExpiration>3600</IDTokenExpiration> - <UserInfoEndpointClaimDialect>http://wso2.org/claims</UserInfoEndpointClaimDialect> - <UserInfoEndpointClaimRetriever>org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoUserStoreClaimRetriever</UserInfoEndpointClaimRetriever> - <UserInfoEndpointRequestValidator>org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInforRequestDefaultValidator</UserInfoEndpointRequestValidator> - <UserInfoEndpointAccessTokenValidator>org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoISAccessTokenValidator</UserInfoEndpointAccessTokenValidator> - <UserInfoEndpointResponseBuilder>org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoJSONResponseBuilder</UserInfoEndpointResponseBuilder> - <SkipUserConsent>false</SkipUserConsent> - </OpenIDConnect> - </OAuth> - - - <MultifactorAuthentication> - <XMPPSettings> - <XMPPConfig> - <XMPPProvider>gtalk</XMPPProvider> - <XMPPServer>talk.google.com</XMPPServer> - <XMPPPort>5222</XMPPPort> - <XMPPExt>gmail.com</XMPPExt> - <XMPPUserName>[email protected]</XMPPUserName> - <XMPPPassword>wso2carbon</XMPPPassword> - </XMPPConfig> - </XMPPSettings> - </MultifactorAuthentication> - - <SSOService> - <EntityId>localhost</EntityId> - <IdentityProviderURL>https://localhost:9443/samlsso</IdentityProviderURL> - <SingleLogoutRetryCount>5</SingleLogoutRetryCount> - <SingleLogoutRetryInterval>60000</SingleLogoutRetryInterval> <!-- in milli seconds --> - <TenantPartitioningEnabled>false</TenantPartitioningEnabled> - <SessionTimeout>36000</SessionTimeout> <!-- remember me session timeout in seconds --> - <!-- skips authentication if valid SAML2 Web SSO browser session available --> - <AttributeStatementBuilder>org.wso2.carbon.identity.sso.saml.attributes.UserAttributeStatementBuilder</AttributeStatementBuilder> - <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> - <!-- Uncomment this to enable on-demand policy loading --> - <!--OnDemandPolicyLoading> <Enable>true</Enable> <MaxInMemoryPolicies>100</MaxInMemoryPolicies> - </OnDemandPolicyLoading --> - <DecisionCaching> - <Enable>true</Enable> - <CachingInterval>36000</CachingInterval> - </DecisionCaching> - <AttributeCaching> - <Enable>true</Enable> - </AttributeCaching> - <ThirftBasedEntitlementConfig> - <EnableThriftService>true</EnableThriftService> - <ReceivePort>${Ports.ThriftEntitlementReceivePort}</ReceivePort> - <ClientTimeout>10000</ClientTimeout> - <KeyStore> - <Location>${carbon.home}/repository/resources/security/wso2carbon.jks</Location> - <Password>wso2carbon</Password> - </KeyStore> - </ThirftBasedEntitlementConfig> - </EntitlementSettings> - <SCIMAuthenticators> - <Authenticator class="org.wso2.carbon.identity.scim.provider.auth.BasicAuthHandler"> - <Property name="Priority">5</Property> - </Authenticator> - <Authenticator class="org.wso2.carbon.identity.scim.provider.auth.OAuthHandler"> - <Property name="Priority">10</Property> - <Property name="AuthorizationServer">local://services</Property> - <!--Property name="AuthorizationServer">https://localhost:9443/services</Property> - <Property name="UserName">admin</Property> - <Property name="Password">admin</Property--> - </Authenticator> - </SCIMAuthenticators> -</Server> http://git-wip-us.apache.org/repos/asf/stratos/blob/4c8ba95d/tools/stratos-installer/config/all/repository/conf/jndi.properties ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/all/repository/conf/jndi.properties b/tools/stratos-installer/config/all/repository/conf/jndi.properties deleted file mode 100644 index f9c29c4..0000000 --- a/tools/stratos-installer/config/all/repository/conf/jndi.properties +++ /dev/null @@ -1,33 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -# register some connection factories -# connectionfactory.[jndiname]=[ConnectionURL] - -java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory - -# use the following property to configure the default connector -connectionfactory.topicConnectionfactory=amqp://admin:admin@clientID/carbon?brokerlist='tcp://MB_HOSTNAME:MB_LISTEN_PORT'&reconnect='true' - -# use the following property to specify the JNDI name of the connection factory -connectionfactoryName=connectionfactory,topicConnectionfactory - -# register some topics in JNDI using the form -# topic.[jndiName]=[physicalName] -topic.lb-stats=lb-stats -topic.instance-stats=instance-stats -topic.summarized-health-stats=summarized-health-stats http://git-wip-us.apache.org/repos/asf/stratos/blob/4c8ba95d/tools/stratos-installer/config/all/repository/conf/metadataservice.xml ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/all/repository/conf/metadataservice.xml b/tools/stratos-installer/config/all/repository/conf/metadataservice.xml deleted file mode 100644 index 5e8bb1d..0000000 --- a/tools/stratos-installer/config/all/repository/conf/metadataservice.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<configuration> - <metadataservice> - <govenanceregistrytype>carbon</govenanceregistrytype> - <serverurl>https://localhost:9445/services/</serverurl> - <username>admin</username> - <password>admin</password> - - <mainResource>stratos</mainResource> - <axis2Repo>repository/deployment/client</axis2Repo> - <axis2Conf>repository/conf/axis2/axis2_client.xml</axis2Conf> - <trustStore>repository/resources/security/wso2carbon.jks</trustStore> - <trustStorePassword>wso2carbon</trustStorePassword> - <trustStoreType>JKS</trustStoreType> - - - - </metadataservice> -</configuration> http://git-wip-us.apache.org/repos/asf/stratos/blob/4c8ba95d/tools/stratos-installer/config/all/repository/conf/security/application-authentication.xml ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/all/repository/conf/security/application-authentication.xml b/tools/stratos-installer/config/all/repository/conf/security/application-authentication.xml deleted file mode 100644 index 695711c..0000000 --- a/tools/stratos-installer/config/all/repository/conf/security/application-authentication.xml +++ /dev/null @@ -1,123 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- ~ Copyright (c) 2005-2014, WSO2 Inc. (http://www.wso2.org) All Rights - Reserved. ~ ~ WSO2 Inc. licenses this file to you under the Apache License, - ~ Version 2.0 (the "License"); you may not use this file except ~ in compliance - with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ ~ Unless required by applicable law or agreed to in writing, ~ software - distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT - WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the - License for the ~ specific language governing permissions and limitations - ~ under the License. --> - -<ApplicationAuthentication xmlns="http://wso2.org/projects/carbon/application-authentication.xml";> - - <JDBCPersistenceManager> - <DataSource> - <!-- Include a data source name (jndiConfigName) from the set of data - sources defined in master-datasources.xml --> - <!--Name>jdbc/WSO2_IDP_DB</Name--> - <Name>jdbc/WSO2CarbonDB</Name> - </DataSource> - </JDBCPersistenceManager> - - <!-- - ProxyMode allows framework to operate in either 'smart' mode - or 'dumb' mode. - smart = both local and federated authentication is supported - dumb = only federated authentication is supported - --> - <ProxyMode>smart</ProxyMode> - - <!-- - AuthenticationEndpointURL is location of the web app containing - the authentication related pages - --> - <AuthenticationEndpointURL>/authenticationendpoint/login.do</AuthenticationEndpointURL> - - <!-- - Extensions allow extending the default behaviour of the authentication - process. - --> - <Extensions> - <RequestCoordinator>org.wso2.carbon.identity.application.authentication.framework.handler.request.impl.DefaultRequestCoordinator</RequestCoordinator> - <AuthenticationRequestHandler>org.wso2.carbon.identity.application.authentication.framework.handler.request.impl.DefaultAuthenticationRequestHandler</AuthenticationRequestHandler> - <LogoutRequestHandler>org.wso2.carbon.identity.application.authentication.framework.handler.request.impl.DefaultLogoutRequestHandler</LogoutRequestHandler> - <StepBasedSequenceHandler>org.wso2.carbon.identity.application.authentication.framework.handler.sequence.impl.DefaultStepBasedSequenceHandler</StepBasedSequenceHandler> - <RequestPathBasedSequenceHandler>org.wso2.carbon.identity.application.authentication.framework.handler.sequence.impl.DefaultRequestPathBasedSequenceHandler</RequestPathBasedSequenceHandler> - <StepHandler>org.wso2.carbon.identity.application.authentication.framework.handler.step.impl.DefaultStepHandler</StepHandler> - <HomeRealmDiscoverer>org.wso2.carbon.identity.application.authentication.framework.handler.hrd.impl.DefaultHomeRealmDiscoverer</HomeRealmDiscoverer> - <ClaimHandler>org.wso2.carbon.identity.application.authentication.framework.handler.claims.impl.DefaultClaimHandler</ClaimHandler> - <ProvisioningHandler>org.wso2.carbon.identity.application.authentication.framework.handler.provisioning.impl.DefaultProvisioningHandler</ProvisioningHandler> - </Extensions> - - <!-- - AuthenticatorNameMappings allow specifying an authenticator - against a pre-defined alias (which will be used by other components. - E.g. Application Mgt component). This enables the usage of a custom - authenticator in place of an authenticator that gets packed with the - distribution. - --> - <AuthenticatorNameMappings> - <AuthenticatorNameMapping name="BasicAuthenticator" alias="basic" /> - <AuthenticatorNameMapping name="OAuthRequestPathAuthenticator" alias="oauth-bearer" /> - <AuthenticatorNameMapping name="BasicAuthRequestPathAuthenticator" alias="basic-auth" /> - <AuthenticatorNameMapping name="IWAAuthenticator" alias="iwa" /> - <AuthenticatorNameMapping name="SAMLSSOAuthenticator" alias="samlsso" /> - <AuthenticatorNameMapping name="OpenIDConnectAuthenticator" alias="openidconnect" /> - <AuthenticatorNameMapping name="OpenIDAuthenticator" alias="openid" /> - <AuthenticatorNameMapping name="PassiveSTSAuthenticator" alias="passive-sts" /> - </AuthenticatorNameMappings> - - <!-- - AuthenticatorConfigs allow specifying various configurations needed - by the authenticators by using any number of \'Parameter\' elements - E.g. - <AuthenticatorConfig name="CustomAuthenticator" enabled="true" /> - <Parameter name="paramName1">paramValue</Parameter> - <Parameter name="paramName2">paramValue</Parameter> - </AuthenticatorConfig> - --> - <AuthenticatorConfigs> - <AuthenticatorConfig name="BasicAuthenticator" enabled="true" /> - <AuthenticatorConfig name="OAuthRequestPathAuthenticator" enabled="true" /> - <AuthenticatorConfig name="BasicAuthRequestPathAuthenticator" enabled="true" /> - <AuthenticatorConfig name="SAMLSSOAuthenticator" enabled="true"> - <!--Parameter name="SAMLSSOManager">org.wso2.carbon.identity.application.authenticator.samlsso.manager.DefaultSAMLSSOManager</Parameter--> - </AuthenticatorConfig> - <AuthenticatorConfig name="OpenIDConnectAuthenticator" enabled="true"> - <!--Parameter name="IDTokenHandler">org.wso2.carbon.identity.application.authenticator.oidc.DefaultIDTokenHandler</Parameter--> - <!--Parameter name="ClaimsRetriever">org.wso2.carbon.identity.application.authenticator.oidc.OIDCUserInfoClaimsRetriever</Parameter--> - </AuthenticatorConfig> - <AuthenticatorConfig name="OpenIDAuthenticator" enabled="true"> - <Parameter name="LoginPage">/authenticationendpoint/login.do</Parameter> - <Parameter name="TrustStorePath">/repository/resources/security/client-truststore.jks</Parameter> - <Parameter name="TrustStorePassword">wso2carbon</Parameter> - <!--Parameter name="OpenIDManager">org.wso2.carbon.identity.application.authenticator.openid.manager.DefaultOpenIDManager</Parameter> - <Parameter name="AttributesRequestor">org.wso2.carbon.identity.application.authenticator.openid.manager.SampleAttributesRequestor</Parameter--> - </AuthenticatorConfig> - </AuthenticatorConfigs> - - <!-- - Sequences allow specifying authentication flows for different - registered applications. \'default\' sequence is taken if an - application specific sequence doesn't exist in this file or - in the Application Mgt module. - --> - <Sequences> - <!-- Default Sequence. This is mandatory --> - <Sequence appId="default"> - <Step order="1"> - <Authenticator name="BasicAuthenticator"/> - </Step> - </Sequence> - </Sequences> - - <ServiceProvidersManagement> - <ApplicationDAO>org.wso2.carbon.identity.application.mgt.dao.impl.ApplicationDAOImpl</ApplicationDAO> - <OAuthOIDCClientDAO>org.wso2.carbon.identity.application.mgt.dao.impl.OAuthApplicationDAOImpl</OAuthOIDCClientDAO> - <SAMLClientDAO>org.wso2.carbon.identity.application.mgt.dao.impl.SAMLApplicationDAOImpl</SAMLClientDAO> - <SystemIDPDAO>org.wso2.carbon.identity.application.mgt.dao.impl.IdentityProviderDAOImpl</SystemIDPDAO> - <ClaimDialect>http://wso2.org/claims</ClaimDialect> - </ServiceProvidersManagement> - -</ApplicationAuthentication> http://git-wip-us.apache.org/repos/asf/stratos/blob/4c8ba95d/tools/stratos-installer/config/all/repository/conf/wso2mb/jndi.properties ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/all/repository/conf/wso2mb/jndi.properties b/tools/stratos-installer/config/all/repository/conf/wso2mb/jndi.properties deleted file mode 100755 index 6da76bf..0000000 --- a/tools/stratos-installer/config/all/repository/conf/wso2mb/jndi.properties +++ /dev/null @@ -1,20 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -connectionfactoryName=topicConnectionfactory -connectionfactory.topicConnectionfactory=amqp://admin:admin@clientID/carbon?brokerlist='tcp://MB_HOSTNAME:MB_LISTEN_PORT'&reconnect='true' -java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory http://git-wip-us.apache.org/repos/asf/stratos/blob/4c8ba95d/tools/stratos-installer/setup.sh ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/setup.sh b/tools/stratos-installer/setup.sh index 175acca..36cf0b4 100755 --- a/tools/stratos-installer/setup.sh +++ b/tools/stratos-installer/setup.sh @@ -233,7 +233,7 @@ function cc_setup() { echo "Setup CC" >> $LOG echo "Configuring the Cloud Controller" - cp -f ./config/all/repository/conf/cloud-controller.xml $stratos_extract_path/repository/conf/ + cp -f ./templates/cloud-controller.xml $stratos_extract_path/repository/conf/ export cc_path=$stratos_extract_path echo "In repository/conf/cloud-controller.xml" @@ -315,7 +315,7 @@ function as_setup() { echo "Setup AS" >> $LOG echo "Configuring the Autoscaler" - cp -f ./config/all/repository/conf/autoscaler.xml $stratos_extract_path/repository/conf/ + cp -f ./templates/autoscaler.xml $stratos_extract_path/repository/conf/ pushd $stratos_extract_path @@ -404,8 +404,8 @@ function sm_setup() { echo "Setup SM" >> $LOG echo "Configuring Stratos Manager" - cp -f ./config/all/repository/conf/cartridge-config.properties $stratos_extract_path/repository/conf/ - cp -f ./config/all/repository/conf/datasources/master-datasources.xml $stratos_extract_path/repository/conf/datasources/ + cp -f ./templates/cartridge-config.properties $stratos_extract_path/repository/conf/ + cp -f ./templates/datasources/master-datasources.xml $stratos_extract_path/repository/conf/datasources/ cp -f $mysql_connector_jar $stratos_extract_path/repository/components/lib/ pushd $stratos_extract_path @@ -617,8 +617,8 @@ mv -f ./hosts.tmp /etc/hosts echo 'Changing owner of '$stratos_path' to '$host_user:$host_user chown -R $host_user:$host_user $stratos_path -cp -f ./config/all/repository/conf/identity.xml $stratos_extract_path/repository/conf/ -cp -f ./config/all/repository/conf/security/application-authentication.xml $stratos_extract_path/repository/conf/security/ +cp -f ./templates/identity.xml $stratos_extract_path/repository/conf/ +cp -f ./templates/security/application-authentication.xml $stratos_extract_path/repository/conf/security/ echo "Apache Stratos configuration completed successfully" http://git-wip-us.apache.org/repos/asf/stratos/blob/4c8ba95d/tools/stratos-installer/templates/activemq/jndi.properties ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/templates/activemq/jndi.properties b/tools/stratos-installer/templates/activemq/jndi.properties new file mode 100644 index 0000000..8ce5c13 --- /dev/null +++ b/tools/stratos-installer/templates/activemq/jndi.properties @@ -0,0 +1,29 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# register some connection factories +# connectionfactory.[jndiname]=[ConnectionURL] + +connectionfactoryName=TopicConnectionFactory +java.naming.provider.url=tcp://MB_HOSTNAME:MB_LISTEN_PORT +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + +# register some topics in JNDI using the form +# topic.[jndiName]=[physicalName] +topic.lb-stats=lb-stats +topic.instance-stats=instance-stats +topic.summarized-health-stats=summarized-health-stats http://git-wip-us.apache.org/repos/asf/stratos/blob/4c8ba95d/tools/stratos-installer/templates/autoscaler.xml ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/templates/autoscaler.xml b/tools/stratos-installer/templates/autoscaler.xml new file mode 100755 index 0000000..fb3ab09 --- /dev/null +++ b/tools/stratos-installer/templates/autoscaler.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<configuration> + <autoscaler> + <cloudController> + <hostname>CC_HOSTNAME</hostname> + <port>CC_LISTEN_PORT</port> + <!-->CC client timout in ms<--> + <clientTimeout>300000</clientTimeout> + </cloudController> + <stratosManager> + <hostname>SM_HOSTNAME</hostname> + <port>SM_LISTEN_PORT</port> + <!--SM client timeout in ms--> + <clientTimeout>300000</clientTimeout> + </stratosManager> + <identity> + <hostname>SM_HOSTNAME</hostname> + <port>SM_LISTEN_PORT</port> + <clientTimeout>300000</clientTimeout> + </identity> + <member> + <!-- this is the maximum time(ms) a member can be in pending member state --> + <pendingMemberExpiryTimeout>900000</pendingMemberExpiryTimeout> + <!-- this is the maximum time(ms) a member can be in obsoleted member state --> + <obsoletedMemberExpiryTimeout>86400000</obsoletedMemberExpiryTimeout> + <!-- this is the maximum time(ms) a member can be in pending termination member state --> + <pendingTerminationMemberExpiryTimeout>1800000</pendingTerminationMemberExpiryTimeout> + </member> + <cluster> + <!-- cluster monitoring interval (ms) --> + <monitorInterval>90000</monitorInterval> + </cluster> + <threadpool> + <identifier>Autoscaler</identifier> + <threadPoolSize>10</threadPoolSize> + </threadpool> + </autoscaler> +</configuration> http://git-wip-us.apache.org/repos/asf/stratos/blob/4c8ba95d/tools/stratos-installer/templates/cartridge-config.properties ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/templates/cartridge-config.properties b/tools/stratos-installer/templates/cartridge-config.properties new file mode 100644 index 0000000..fb11f48 --- /dev/null +++ b/tools/stratos-installer/templates/cartridge-config.properties @@ -0,0 +1,30 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# + +# Configuration properties + +autoscaler.service.url=https://AS_HOSTNAME:AS_HTTPS_PORT/services/AutoscalerService/ +stratos.manager.service.url=https://localhost:9443/services/StratosManagerService/ +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/4c8ba95d/tools/stratos-installer/templates/cloud-controller.xml ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/templates/cloud-controller.xml b/tools/stratos-installer/templates/cloud-controller.xml new file mode 100644 index 0000000..b4548e0 --- /dev/null +++ b/tools/stratos-installer/templates/cloud-controller.xml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + # Licensed to the Apache Software Foundation (ASF) under one + # or more contributor license agreements. See the NOTICE file + # distributed with this work for additional information + # regarding copyright ownership. The ASF licenses this file + # to you under the Apache License, Version 2.0 (the + # "License"); you may not use this file except in compliance + # with the License. You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, + # software distributed under the License is distributed on an + # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + # KIND, either express or implied. See the License for the + # specific language governing permissions and limitations + # under the License. + --> +<cloudController xmlns:svns="http://org.wso2.securevault/configuration";> + + <svns:secureVault + provider="org.wso2.securevault.secret.handler.SecretManagerSecretCallbackHandler" /> + + <dataPublisher enable="false"> + <!-- BAM Server Info - default values are 'admin' and 'admin' + Optional element. --> + <bamServer> + <!-- BAM server URL should be specified in carbon.xml --> + <adminUserName>admin</adminUserName> + <adminPassword svns:secretAlias="cloud.controller.bam.server.admin.password">admin</adminPassword> + </bamServer> + <!-- Default cron expression is '1 * * * * ? *' meaning 'first second of every minute'. + Optional element. --> + <cron>1 * * * * ? *</cron> + <!-- Cassandra cluster related info --> + <!--cassandraInfo> + <connectionUrl>localhost:9160</connectionUrl> + <userName>admin</userName> + <password svns:secretAlias="cloud.controller.cassandra.server.password">admin</password> + </cassandraInfo--> + </dataPublisher> + + <topologySync enable="true"> + <property name="cron" value="1 * * * * ? *" /> + </topologySync> + + <!-- Specify the properties that are common to an IaaS here. This element + is not necessary [0..1]. But you can use this section to avoid specifying + same property over and over again. --> + <iaasProviders> + <EC2_PROVIDER_STARTiaasProvider type="ec2" name="ec2 specific details"> + <className>org.apache.stratos.cloud.controller.iaases.ec2.EC2Iaas</className> + <provider>aws-ec2</provider> + <identity svns:secretAlias="cloud.controller.ec2.identity">EC2_IDENTITY</identity> + <credential svns:secretAlias="cloud.controller.ec2.credential">EC2_CREDENTIAL</credential> + <property name="jclouds.ec2.ami-query" value="owner-id=EC2_OWNER_ID;state=available;image-type=machine"/> + <property name="availabilityZone" value="EC2_AVAILABILITY_ZONE"/> + <property name="securityGroups" value="EC2_SECURITY_GROUPS"/> + <property name="autoAssignIp" value="true" /> + <property name="keyPair" value="EC2_KEYPAIR"/> + </iaasProviderEC2_PROVIDER_END> + <OPENSTACK_PROVIDER_STARTiaasProvider type="openstack" name="openstack specific details"> + <className>org.apache.stratos.cloud.controller.iaases.openstack.OpenstackIaas</className> + <provider>openstack-nova</provider> + <identity svns:secretAlias="cloud.controller.openstack.identity">OPENSTACK_IDENTITY</identity> + <credential svns:secretAlias="cloud.controller.openstack.credential">OPENSTACK_CREDENTIAL</credential> + <property name="jclouds.endpoint" value="OPENSTACK_ENDPOINT" /> + <property name="jclouds.openstack-nova.auto-create-floating-ips" value="false"/> + <property name="jclouds.api-version" value="2.0/" /> + <property name="openstack.networking.provider" value="OPENSTACK_NETWORKING_PROVIDER" /> + <property name="X" value="x" /> + <property name="Y" value="y" /> + <property name="securityGroups" value="OPENSTACK_SECURITY_GROUPS"/> + <property name="keyPair" value="OPENSTACK_KEYPAIR"/> + </iaasProviderOPENSTACK_PROVIDER_END> + <VCLOUD_PROVIDER_STARTiaasProvider type="vcloud" name="VMware vCloud specific details"> + <className>org.apache.stratos.cloud.controller.iaases.vcloud.VCloudIaas</className> + <provider>vcloud</provider> + <identity svns:secretAlias="cloud.controller.vcloud.identity">VCLOUD_IDENTITY</identity> + <credential svns:secretAlias="cloud.controller.vcloud.credential">VCLOUD_CREDENTIAL</credential> + <property name="jclouds.endpoint" value="VCLOUD_ENDPOINT" /> + <property name="jclouds.vcloud.version.schema" value="1.5" /> + <property name="jclouds.api-version" value="1.5" /> + <property name="autoAssignIp" value="true" /> + <property name="X" value="x" /> + <property name="Y" value="y" /> + </iaasProviderVCLOUD_PROVIDER_END> + <GCE_PROVIDER_STARTiaasProvider type="gce" name="GCE specific details"> + <className>org.apache.stratos.cloud.controller.iaases.gce.GCEIaas</className> + <provider>google-compute-engine</provider> + <identity svns:secretAlias="cloud.controller.gce.identity">GCE_IDENTITY</identity> + <credential svns:secretAlias="cloud.controller.gce.credential">GCE_CREDENTIAL</credential> + <property name="projectName" value="GCE_PROJECTNAME" />> + <property name="autoAssignIp" value="true" /> + </iaasProviderGCE_PROVIDER_END> + <KUBERNETES_PROVIDER_STARTiaasProvider type="kubernetes" name="KUBERNETES specific details"> + <className>org.apache.stratos.cloud.controller.iaases.kubernetes.KubernetesIaas</className> + <provider>kubernetes</provider> + <identity svns:secretAlias="cloud.controller.kubernetes.identity">identity</identity> + <credential svns:secretAlias="cloud.controller.kubernetes.credential">credential</credential> + </iaasProviderKUBERNETES_PROVIDER_END> + </iaasProviders> +</cloudController> http://git-wip-us.apache.org/repos/asf/stratos/blob/4c8ba95d/tools/stratos-installer/templates/datasources/master-datasources.xml ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/templates/datasources/master-datasources.xml b/tools/stratos-installer/templates/datasources/master-datasources.xml new file mode 100644 index 0000000..34dee42 --- /dev/null +++ b/tools/stratos-installer/templates/datasources/master-datasources.xml @@ -0,0 +1,129 @@ +<?xml version='1.0'?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + +<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration";> + + <providers> + <provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider> + </providers> + + <datasources> + + <datasource> + <name>WSO2_CARBON_DB</name> + <description>The datasource used for registry and user manager</description> + <jndiConfig> + <name>jdbc/WSO2CarbonDB</name> + </jndiConfig> + <definition type="RDBMS"> + <configuration> + <url>jdbc:mysql://USERSTORE_DB_HOSTNAME:USERSTORE_DB_PORT/USERSTORE_DB_SCHEMA?autoReconnect=true</url> + <username>USERSTORE_DB_USER</username> + <password>USERSTORE_DB_PASS</password> + <driverClassName>com.mysql.jdbc.Driver</driverClassName> + <maxActive>50</maxActive> + <maxWait>60000</maxWait> + <testOnBorrow>true</testOnBorrow> + <validationQuery>SELECT 1</validationQuery> + <validationInterval>30000</validationInterval> + </configuration> + </definition> + </datasource> + + <!--datasource> + <name>WSO2BAM_DATASOURCE</name> + <description>The datasource used for analyzer data</description> + <definition type="RDBMS"> + <configuration> + <url>jdbc:h2:repository/database/samples/BAM_STATS_DB;AUTO_SERVER=TRUE</url> + <username>wso2carbon</username> + <password>wso2carbon</password> + <driverClassName>org.h2.Driver</driverClassName> + <maxActive>50</maxActive> + <maxWait>60000</maxWait> + <testOnBorrow>true</testOnBorrow> + <validationQuery>SELECT 1</validationQuery> + <validationInterval>30000</validationInterval> + </configuration> + </definition> + </datasource> + + <datasource> + <name>WSO2BillingDS</name> + <description>The datasource used for registry and user manager</description> + <jndiConfig> + <name>jdbc/WSO2BillingDS</name> + </jndiConfig> + <definition type="RDBMS"> + <configuration> + + <url>jdbc:mysql://BILLING_DB_HOSTNAME:BILLING_DB_PORT/BILLING_DB_SCHEMA</url> + <username>BILLING_USERNAME</username> + <password>BILLING_PASSWORD</password> + <driverClassName>com.mysql.jdbc.Driver</driverClassName> + <maxActive>50</maxActive> + <maxWait>60000</maxWait> + <testOnBorrow>true</testOnBorrow> + <validationQuery>SELECT 1</validationQuery> + <validationInterval>30000</validationInterval> + </configuration> + </definition> + </datasource--> + + <!-- For an explanation of the properties, see: http://people.apache.org/~fhanik/jdbc-pool/jdbc-pool.html --> + <!--datasource> + <name>SAMPLE_DATA_SOURCE</name> + <jndiConfig> + <name></name> + <environment> + <property name="java.naming.factory.initial"></property> + <property name="java.naming.provider.url"></property> + </environment> + </jndiConfig> + <definition type="RDBMS"> + <configuration> + + <defaultAutoCommit></defaultAutoCommit> + <defaultReadOnly></defaultReadOnly> + <defaultTransactionIsolation>NONE|READ_COMMITTED|READ_UNCOMMITTED|REPEATABLE_READ|SERIALIZABLE</defaultTransactionIsolation> + <defaultCatalog></defaultCatalog> + <username></username> + <password svns:secretAlias="WSO2.DB.Password"></password> + <maxActive></maxActive> + <maxIdle></maxIdle> + <initialSize></initialSize> + <maxWait></maxWait> + + <dataSourceClassName>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</dataSourceClassName> + <dataSourceProps> + <property name="url">jdbc:mysql://localhost:3306/Test1</property> + <property name="user">root</property> + <property name="password">123</property> + </dataSourceProps> + + </configuration> + </definition> + </datasource--> + + </datasources> + +</datasources-configuration> http://git-wip-us.apache.org/repos/asf/stratos/blob/4c8ba95d/tools/stratos-installer/templates/datasources/stratos-datasources.xml ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/templates/datasources/stratos-datasources.xml b/tools/stratos-installer/templates/datasources/stratos-datasources.xml new file mode 100644 index 0000000..73a9739 --- /dev/null +++ b/tools/stratos-installer/templates/datasources/stratos-datasources.xml @@ -0,0 +1,51 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration";> + <providers> + <provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider> + </providers> + <datasources> + + + <datasource> + <name>WSO2BillingDS</name> + <description>The datasource used for registry and user manager</description> + <jndiConfig> + <name>jdbc/WSO2BillingDS</name> + </jndiConfig> + <definition type="RDBMS"> + <configuration> + + <url>jdbc:mysql://BILLING_DB_HOSTNAME:BILLING_DB_PORT/BILLING_DB_SCHEMA</url> + <username>BILLING_USERNAME</username> + <password>BILLING_PASSWORD</password> + <driverClassName>com.mysql.jdbc.Driver</driverClassName> + <maxActive>50</maxActive> + <maxWait>60000</maxWait> + <testOnBorrow>true</testOnBorrow> + <validationQuery>SELECT 1</validationQuery> + <validationInterval>30000</validationInterval> + </configuration> + </definition> + </datasource> + </datasources> + +</datasources-configuration> +
