You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2013/08/05 14:12:59 UTC
git commit: Adding user-data directory in default
Updated Branches:
refs/heads/master 98100136b -> aa931e17b
Adding user-data directory in default
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/aa931e17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/aa931e17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/aa931e17
Branch: refs/heads/master
Commit: aa931e17b80bab25349c1b85b1d4524dfd269d71
Parents: 9810013
Author: Lahiru Sandaruwan <la...@wso2.com>
Authored: Mon Aug 5 17:47:58 2013 +0530
Committer: Lahiru Sandaruwan <la...@wso2.com>
Committed: Mon Aug 5 17:47:58 2013 +0530
----------------------------------------------------------------------
.../billing-script/stratos_mysql.sql | 121 +++++++++++++++++++
.../modules/distribution/src/assembly/bin.xml | 36 ++++--
.../payload/user-data/ssl-cert-snakeoil.key | 16 +++
.../payload/user-data/ssl-cert-snakeoil.pem | 14 +++
4 files changed, 174 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa931e17/products/stratos-controller/billing-script/stratos_mysql.sql
----------------------------------------------------------------------
diff --git a/products/stratos-controller/billing-script/stratos_mysql.sql b/products/stratos-controller/billing-script/stratos_mysql.sql
new file mode 100644
index 0000000..186b30a
--- /dev/null
+++ b/products/stratos-controller/billing-script/stratos_mysql.sql
@@ -0,0 +1,121 @@
+-- MySQL Administrator dump 1.4
+--
+-- ------------------------------------------------------
+-- Server version 5.5.24-0ubuntu0.12.04.1
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+
+
+--
+-- Create schema s2_foundation
+--
+
+CREATE DATABASE IF NOT EXISTS s2_foundation;
+USE s2_foundation;
+
+--
+-- Definition of table `s2_foundation`.`CARTRIDGE_INSTANCE`
+--
+
+DROP TABLE IF EXISTS `s2_foundation`.`CARTRIDGE_INSTANCE`;
+CREATE TABLE `s2_foundation`.`CARTRIDGE_INSTANCE` (
+ `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `INSTANCE_IP` varchar(255) NOT NULL,
+ `TENANT_ID` int(11) DEFAULT NULL,
+ `TENANT_DOMAIN` varchar(255) DEFAULT NULL,
+ `CARTRIDGE_TYPE` varchar(255) NOT NULL,
+ `STATE` varchar(255) NOT NULL,
+ `CLUSTER_DOMAIN` varchar(255) NOT NULL,
+ `CLUSTER_SUBDOMAIN` varchar(255) NOT NULL,
+ PRIMARY KEY (`ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+
+--
+-- Definition of table `s2_foundation`.`CARTRIDGE_SUBSCRIPTION`
+--
+
+DROP TABLE IF EXISTS `s2_foundation`.`CARTRIDGE_SUBSCRIPTION`;
+CREATE TABLE `s2_foundation`.`CARTRIDGE_SUBSCRIPTION` (
+ `SUBSCRIPTION_ID` int(11) NOT NULL AUTO_INCREMENT,
+ `TENANT_ID` int(11) NOT NULL,
+ `CARTRIDGE` varchar(30) NOT NULL,
+ `PROVIDER` varchar(30) NOT NULL,
+ `HOSTNAME` varchar(255) NOT NULL,
+ `POLICY` varchar(50) NULL,
+ `CLUSTER_DOMAIN` varchar(255) NOT NULL,
+ `CLUSTER_SUBDOMAIN` varchar(255) NOT NULL,
+ `MGT_DOMAIN` varchar(255) NOT NULL,
+ `MGT_SUBDOMAIN` varchar(255) NOT NULL,
+ `STATE` varchar(30) NOT NULL,
+ `ALIAS` varchar(255) NOT NULL,
+ `TENANT_DOMAIN` varchar(255) NOT NULL,
+ `BASE_DIR` varchar(255) NOT NULL,
+ `REPO_ID` int(11) DEFAULT NULL,
+ `DATA_CARTRIDGE_ID` int(11) DEFAULT NULL,
+ `MAPPED_DOMAIN` varchar(255),
+ PRIMARY KEY (`SUBSCRIPTION_ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+
+
+
+--
+-- Definition of table `s2_foundation`.`DATA_CARTRIDGE`
+--
+
+DROP TABLE IF EXISTS `s2_foundation`.`DATA_CARTRIDGE`;
+CREATE TABLE `s2_foundation`.`DATA_CARTRIDGE` (
+ `DATA_CART_ID` int(11) NOT NULL AUTO_INCREMENT,
+ `TYPE` varchar(30) NOT NULL,
+ `USER_NAME` varchar(255) NOT NULL,
+ `PASSWORD` varchar(255) NOT NULL,
+ `STATE` varchar(255) NOT NULL,
+ PRIMARY KEY (`DATA_CART_ID`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+
+
+--
+-- Definition of table `s2_foundation`.`PORT_MAPPING`
+--
+
+DROP TABLE IF EXISTS `s2_foundation`.`PORT_MAPPING`;
+CREATE TABLE `s2_foundation`.`PORT_MAPPING` (
+ `PORT_MAPPING_ID` int(11) NOT NULL AUTO_INCREMENT,
+ `SUBSCRIPTION_ID` int(11) NOT NULL,
+ `TYPE` varchar(30) NOT NULL,
+ `PRIMARY_PORT` varchar(30) NOT NULL,
+ `PROXY_PORT` varchar(30) NOT NULL,
+ `STATE` varchar(30) NOT NULL,
+ PRIMARY KEY (`PORT_MAPPING_ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+
+
+--
+-- Definition of table `s2_foundation`.`REPOSITORY`
+--
+
+DROP TABLE IF EXISTS `s2_foundation`.`REPOSITORY`;
+CREATE TABLE `s2_foundation`.`REPOSITORY` (
+ `REPO_ID` int(11) NOT NULL AUTO_INCREMENT,
+ `REPO_NAME` varchar(255) NOT NULL,
+ `STATE` varchar(30) NOT NULL,
+ `REPO_USER_NAME` varchar(255) NOT NULL,
+ `REPO_USER_PASSWORD` varchar(255) NOT NULL,
+ PRIMARY KEY (`REPO_ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa931e17/products/stratos-controller/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/distribution/src/assembly/bin.xml b/products/stratos-controller/modules/distribution/src/assembly/bin.xml
index 9365a06..4285b40 100755
--- a/products/stratos-controller/modules/distribution/src/assembly/bin.xml
+++ b/products/stratos-controller/modules/distribution/src/assembly/bin.xml
@@ -281,11 +281,11 @@
</includes>
</fileSet>
<fileSet>
- <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/identity</outputDirectory>
- <includes>
- <include>**/**.sql</include>
- </includes>
+ <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/</directory>
+ <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/identity</outputDirectory>
+ <includes>
+ <include>**/**.sql</include>
+ </includes>
</fileSet>
<!-- copy the billing h2 db -->
@@ -305,7 +305,17 @@
<directory>../../billing-script/</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory>
</fileSet>
-
+ <fileSet>
+ <directory>../../payload</directory>
+ <includes>
+ <include>user-data</include>
+ </includes>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../../payload/user-data/</directory>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/user-data</outputDirectory>
+ </fileSet>
</fileSets>
<dependencySets>
@@ -480,13 +490,13 @@
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
</file>
<file>
- <source>src/bin/stratos.sh</source>
- <outputDirectory>apache-stratos-sc-${pom.version}/bin/</outputDirectory>
- <filtered>true</filtered>
- <fileMode>755</fileMode>
- </file>
- <file>
- <source>src/bin/stratos.bat</source>
+ <source>src/bin/stratos.sh</source>
+ <outputDirectory>apache-stratos-sc-${pom.version}/bin/</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>755</fileMode>
+ </file>
+ <file>
+ <source>src/bin/stratos.bat</source>
<outputDirectory>apache-stratos-sc-${pom.version}/bin/</outputDirectory>
<filtered>true</filtered>
<fileMode>755</fileMode>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa931e17/products/stratos-controller/payload/user-data/ssl-cert-snakeoil.key
----------------------------------------------------------------------
diff --git a/products/stratos-controller/payload/user-data/ssl-cert-snakeoil.key b/products/stratos-controller/payload/user-data/ssl-cert-snakeoil.key
new file mode 100644
index 0000000..41f6064
--- /dev/null
+++ b/products/stratos-controller/payload/user-data/ssl-cert-snakeoil.key
@@ -0,0 +1,16 @@
+-----BEGIN PRIVATE KEY-----
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJSn+hXW9Zzz9ORB
+KIC9Oi6wzM4zhqwHaKW2vZAqjOeLlpUW7zXwyk4tkivwsydPNaWUm+9oDlEAB2ls
+QJv7jwWNsF7SGx5R03kenC+cf8Nbxlxwa+Tncjo6uruEsK/Vke244KiSCHP8BOuH
+I+r5CS0x9edFLgesoYlPPFoJxTs5AgMBAAECgYBL/6iiO7hr2mjrvMgZMSSqtCaw
+kLUcA9mjRs6ZArfwtHNymzwGZqj22ONu5WqiASPbGCO0fI09KfegFQDe/fe6wnpi
+rBWtawLoXCZmGrwC+x/3iqbiGJMd7UB3FaZkZOzV5Jhzomc8inSJWMcR+ywiUY37
+stfVDqR1sJ/jzZ1OdQJBAO8vCa2OVQBJbzjMvk8Sc0KiuVwnyqMYqVty6vYuufe9
+ILJfhwhYzE82wIa9LYg7UK2bPvKyyehuFfqI5oU5lU8CQQCfG5LA3gp3D1mS7xxz
+tqJ+cm4SPO4R6YzVybAZKqKUvTFSKNV57Kp/LL7WjtUUNr+dY+aYRlKo81Hq61y8
+tBT3AkAjJyak+2ZCxIg0MONHe8603HWhtbdygQ1jA2DFDdkHMCS+EowmDeb5PXLO
+Wr92ZkFVQpvdz6kdIBDa4YP/0JbBAkBVHLjqd1z9x7ZRBZwgwkg2gBwloXZxGpB+
+JMARFl+WVYa2vqVD7bhfA56qxAl0IL1sAm7ucl/xhQgDNRiM0YCNAkEAqySTBx2H
+O9VyzuWWbf7BYTNsxfO80GaRkZGENfqO1QgnhT1FMeK+ox7Kbi+nSaCBoPjNzyrM
+bU08M6nSnkDEGA==
+-----END PRIVATE KEY-----
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa931e17/products/stratos-controller/payload/user-data/ssl-cert-snakeoil.pem
----------------------------------------------------------------------
diff --git a/products/stratos-controller/payload/user-data/ssl-cert-snakeoil.pem b/products/stratos-controller/payload/user-data/ssl-cert-snakeoil.pem
new file mode 100644
index 0000000..f0fac8d
--- /dev/null
+++ b/products/stratos-controller/payload/user-data/ssl-cert-snakeoil.pem
@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICNTCCAZ6gAwIBAgIES343gjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJV
+UzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDU1vdW50YWluIFZpZXcxDTALBgNVBAoM
+BFdTTzIxEjAQBgNVBAMMCWxvY2FsaG9zdDAeFw0xMDAyMTkwNzAyMjZaFw0zNTAy
+MTMwNzAyMjZaMFUxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwN
+TW91bnRhaW4gVmlldzENMAsGA1UECgwEV1NPMjESMBAGA1UEAwwJbG9jYWxob3N0
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCUp/oV1vWc8/TkQSiAvTousMzO
+M4asB2iltr2QKozni5aVFu818MpOLZIr8LMnTzWllJvvaA5RAAdpbECb+48FjbBe
+0hseUdN5HpwvnH/DW8ZccGvk53I6Orq7hLCv1ZHtuOCokghz/ATrhyPq+QktMfXn
+RS4HrKGJTzxaCcU7OQIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCBPAwDQYJKoZIhvcN
+AQEFBQADgYEAW5wPR7cr1LAdq+IrR44iQlRG5ITCZXY9hI0PygLP2rHANh+PYfTm
+xbuOnykNGyhM6FjFLbW2uZHQTY1jMrPprjOrmyK5sjJRO4d1DeGHT/YnIjs9JogR
+Kv4XHECwLtIVdAbIdWHEtVZJyMSktcyysFcvuhPQK8Qc/E/Wq8uHSCo=
+-----END CERTIFICATE-----