You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/10/22 03:31:17 UTC
git commit: STRATOS-122: Removed unused files, variables,
added comments and re-ordered content in conf/setup.conf
Updated Branches:
refs/heads/3.0.0-incubating c042d6df7 -> ee058d777
STRATOS-122: Removed unused files, variables, added comments and re-ordered content in conf/setup.conf
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ee058d77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ee058d77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ee058d77
Branch: refs/heads/3.0.0-incubating
Commit: ee058d77712975a1cc4dcadccc3bb3d6d8fa2bb4
Parents: c042d6d
Author: Imesh Gunaratne <im...@apache.org>
Authored: Tue Oct 22 07:00:44 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Tue Oct 22 07:00:44 2013 +0530
----------------------------------------------------------------------
tools/stratos-installer/conf/setup.conf | 93 +++++++++-----------
.../resources/add_entry_zone_file.sh | 70 ---------------
.../stratos-installer/resources/db.stratos.com | 33 -------
tools/stratos-installer/resources/git | 92 -------------------
.../resources/gitolite-suexec-wrapper.sh | 30 -------
tools/stratos-installer/resources/notify.php | 62 -------------
.../resources/remove_entry_zone_file.sh | 75 ----------------
tools/stratos-installer/setup.sh | 16 +---
tools/stratos-installer/start-servers.sh | 10 ---
9 files changed, 46 insertions(+), 435 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee058d77/tools/stratos-installer/conf/setup.conf
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf
index ac13991..cfd1e0e 100644
--- a/tools/stratos-installer/conf/setup.conf
+++ b/tools/stratos-installer/conf/setup.conf
@@ -32,16 +32,16 @@
# General configuration
# ----------------------------------------------------------------------------
-export setup_path= #Folder path containing stratos_setup
-export stratos_pack_path= #Folder path containing stratos packages
-export stratos_path= #Folder which stratos will be installed
-
-export JAVA_HOME= #Java home path
-
+export JAVA_HOME= # Java home path
+export hostip="" # IP address of the host which setup script is run
+export host_user="" # A host user account for stratos. If not provided deafult is assumed stratos. If no account #named stratos exist it will be created.
+
+export setup_path= # Folder path containing stratos_setup
+export stratos_pack_path= # Folder path containing stratos packages
+export stratos_path= # Folder which stratos will be installed
+export stratos_version=3.0.0-incubating # Stratos version, will be used to refer package files
export log_path=/var/log/apache-stratos
-export hostip="ip" #Machine ip on which setup script run
-export host_user="" #A host user account for stratos. If not provided deafult is assumed stratos. If no account #named stratos exist it will be created.
-export mysql_connector_jar=$stratos_pack_path/"mysql-connector-java-5.1.25.jar" #mysql connector jar file name
+export mysql_connector_jar=$stratos_pack_path/"mysql-connector-java-5.1.25.jar" # mysql connector jar file name
export stratos_domain="stratos.apache.org"
export resource_path=$setup_path/resources
export script_path=$setup_path/scripts
@@ -55,46 +55,45 @@ export mb_listen_port="5677"
# SC configuration
# ----------------------------------------------------------------------------
-export sc_path=$stratos_path/"apache-stratos-sc-3.0.0-incubating"
-export sc_pack=$stratos_pack_path/"apache-stratos-sc-3.0.0-incubating.zip"
+export sc_path=$stratos_path/"apache-stratos-sc-$stratos_version"
+export sc_pack=$stratos_pack_path/"apache-stratos-sc-$stratos_version.zip"
export userstore_db_hostname="$stratos_domain"
export userstore_db_schema="userstore"
export userstore_db_port="3306"
-export userstore_db_user="root"
-export userstore_db_pass="mysql"
+export userstore_db_user="<mysql-username>"
+export userstore_db_pass="<mysql-password>"
export stratos_foundation_db_hostname="$stratos_domain"
export stratos_foundation_db_schema="stratos_foundation"
export stratos_foundation_db_port="3306"
-export stratos_foundation_db_user="root"
-export stratos_foundation_db_pass="mysql"
+export stratos_foundation_db_user="<mysql-username>"
+export stratos_foundation_db_pass="<mysql-password>"
export sc_https_port="9445"
export sc_http_port="9765"
export sc_port_offset=2
export sc_hostname="$stratos_domain"
-export elb_ip="elb ip" #Machine ip on which elb run
export cassandra_port="9163"
export sc_ip=$hostip
-export agent_ip="agent ip" #Machine ip on which agent run
+export elb_ip="" # ip address of the load balancer host
+export agent_ip="" # ip address of the agent host
export keypair_path="<keypair_path>"
+
# Git repo cofiguration. This will be needed only if you need to setup an internal git repo.
# ----------------------------------------------------------------------------
export git_user="git"
export email="git@$stratos_domain"
export git_hostname="$stratos_domain"
export git_ip=$hostip
-export axis2c_path="axis2c-1.6.2"
-export axis2c_pack="axis2-1.6.2-bin.zip"
# CC configuration
# ----------------------------------------------------------------------------
-export cc_path=$stratos_path/"apache-stratos-cc-3.0.0-incubating"
-export cc_pack=$stratos_pack_path/"apache-stratos-cc-3.0.0-incubating.zip"
+export cc_path=$stratos_path/"apache-stratos-cc-$stratos_version"
+export cc_pack=$stratos_pack_path/"apache-stratos-cc-$stratos_version.zip"
export cc_https_port="9444"
export cc_port_offset=1
@@ -106,8 +105,8 @@ export mb_cassandra_port="9161"
# ELB configuration
# ----------------------------------------------------------------------------
-export elb_path=$stratos_path/"apache-stratos-elb-3.0.0-incubating"
-export elb_pack=$stratos_pack_path/"apache-stratos-elb-3.0.0-incubating.zip"
+export elb_path=$stratos_path/"apache-stratos-elb-$stratos_version"
+export elb_pack=$stratos_pack_path/"apache-stratos-elb-$stratos_version.zip"
export elb_hostname="elb.$stratos_domain"
export enable_autoscaler=true
export enable_embedded_autoscaler=false
@@ -118,8 +117,8 @@ export elb_port="9443"
# Agent configuration
# ----------------------------------------------------------------------------
-export agent_path=$stratos_path/"apache-stratos-agent-3.0.0-incubating"
-export agent_pack=$stratos_pack_path/"apache-stratos-agent-3.0.0-incubating.zip"
+export agent_path=$stratos_path/"apache-stratos-agent-$stratos_version"
+export agent_pack=$stratos_pack_path/"apache-stratos-agent-$stratos_version.zip"
export agent_clustering_port="4025"
export agent_hostname="agent.$stratos_domain"
export agent_http_port="9767"
@@ -127,18 +126,6 @@ export agent_https_port="9447"
export agent_port_offset=4
-# BAM configuration
-# ----------------------------------------------------------------------------
-#export bam_port_offset=3
-#export bam_port="9446"
-#export bam_ip=$hostip
-#export bam_reciever_port="7614"
-#export bam_reciever_secured_port="7714"
-#export bam_hostname="$stratos_domain"
-#export bam_path="wso2bam-2.3.0"
-#export bam_pack="wso2bam-2.3.0.zip"
-
-
# IaaS Providers
# ----------------------------------------------------------------------------
# Set <iaas-name>_provider_enabled parameter to true to enable desired IaaS. A hybrid cloud could be
@@ -152,30 +139,36 @@ export ec2_keypair_name="<ec2_keypair_name>"
export ec2_owner_id="<ec2_owner_id>"
export ec2_scaleup_order=1
export ec2_scaledown_order=2
-export ec2_region="ap-southeast-1"
+export ec2_region="<ec2_region>"
export ec2_availability_zone="<ec2_availability_zone>"
export ec2_security_groups="<ec2_security_groups>"
export ec2_instance_type="m1.large"
export ec2_image_id=""
-export ec2_php_cartridge_image_id="ami-8a733bd8"
-export ec2_mysql_cartridge_image_id="ami-3e753d6c"
-export ec2_tomcat_cartridge_image_id="ami-6484cc36"
+export ec2_php_cartridge_image_id=""
+export ec2_mysql_cartridge_image_id=""
+export ec2_tomcat_cartridge_image_id=""
+
+# EC2 cartridge images availble in ap-southeast-1 region:
+# export ec2_php_cartridge_image_id="ami-8a733bd8"
+# export ec2_mysql_cartridge_image_id="ami-3e753d6c"
+# export ec2_tomcat_cartridge_image_id="ami-6484cc36"
+
# Openstack
export openstack_provider_enabled=true
-export openstack_identity="stratos:stratos" # Openstack project name:Openstack login user
-export openstack_credential="password" # Openstack login password
-export openstack_tenant="stratos" # openstack project name
+export openstack_identity="<project-name>:<username>" # Openstack project name : username
+export openstack_credential="<password>" # Openstack password
+export openstack_tenant="<project-name>" # Openstack project name
export openstack_project_id=$openstack_tenant
-export openstack_jclouds_endpoint="http://hostname:5000/v2.0"
+export openstack_jclouds_endpoint="http://<hostname>:5000/v2.0"
export openstack_scaleup_order=2
export openstack_scaledown_order=3
export openstack_keypair_name=""
-export openstack_image_id="RegionOne/" #No need to change this as of now
-export nova_region="RegionOne"
-export openstack_instance_type_tiny="RegionOne\/1"
-export openstack_instance_type_small="RegionOne\/2"
-export openstack_security_groups="security-groups"
+export openstack_image_id="" # Default cartridge image id
+export nova_region="<region>" # Example: RegionOne
+export openstack_instance_type_tiny="<region>\/1"
+export openstack_instance_type_small="<region>\/2"
+export openstack_security_groups="<security-groups>"
export openstack_php_cartridge_image_id=""
export openstack_mysql_cartridge_image_id=""
export openstack_tomcat_cartridge_image_id=""
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee058d77/tools/stratos-installer/resources/add_entry_zone_file.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/resources/add_entry_zone_file.sh b/tools/stratos-installer/resources/add_entry_zone_file.sh
deleted file mode 100644
index c9593e0..0000000
--- a/tools/stratos-installer/resources/add_entry_zone_file.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-#
-#
-# 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.
-#
-#
-zone_file=$3
-subdomain=$1
-ip=$2
-
-# check the file
-if [ -f {$zone_file} ]; then
- echo "Error: zone does not exist"
- exit 1
-fi
-echo "File $zone_file exists"
-
-#appending the zone file
-echo "$subdomain IN A $ip">> $zone_file
-echo "Added subdomain to the file"
-
-# get serial number
-serial=$(grep 'Serial' $zone_file | awk '{print $1}')
-echo "Serial number " $serial
-# get serial number's date
-serialdate=$(echo $serial | cut -b 1-8)
-# get today's date in same style
-date=$(date +%Y%m%d)
-
-
-#Serial number's date
-serialdate=$(echo $serial | cut -b 1-8)
-echo "serial date" $serialdate
-# get today's date in same style
-date=$(date +%Y%m%d)
-echo "Now date" $date
-
-# compare date and serial date
-if [ $serialdate = $date ]
- then
- # if equal, just add 1
- newserial=$(expr $serial + 1)
- echo "same date"
- else
- # if not equal, make a new one and add 00
- newserial=$(echo $date"00")
-fi
-
-echo "Adding subdomain $1 and ip $2 to $3"
-sed -i "s/.*Serial.*/ \t\t\t\t$newserial ; Serial./" $zone_file
-
-
-
-#reloading bind server
-/etc/init.d/bind9 reload
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee058d77/tools/stratos-installer/resources/db.stratos.com
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/resources/db.stratos.com b/tools/stratos-installer/resources/db.stratos.com
deleted file mode 100755
index 9e1f507..0000000
--- a/tools/stratos-installer/resources/db.stratos.com
+++ /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.
-
-
-;
-$TTL 604800
-$ORIGIN STRATOS_DOMAIN.
-@ 14400 IN SOA a.STRATOS_DOMAIN. admin.STRATOS_DOMAIN. (
- 2012112614 ; Serial
- 28800 ; Refresh
- 3600 ; Retry
- 604800 ; Expire
- 38400 ) ; Negative Cache TTL
-;
-@ IN A ELB_IP
-@ IN NS a.STRATOS_DOMAIN.
-git IN NS ELB_IP
-adp IN NS ELB_IP
-notify.git IN NS ADC_IP
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee058d77/tools/stratos-installer/resources/git
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/resources/git b/tools/stratos-installer/resources/git
deleted file mode 100644
index 245ac79..0000000
--- a/tools/stratos-installer/resources/git
+++ /dev/null
@@ -1,92 +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.
-
-
-<VirtualHost *:80>
-
-ServerName git.STRATOS_DOMAIN
-ServerAlias git
-
-DocumentRoot /var/www/gitweb
-
-SuexecUserGroup git git
-
-#RewriteEngine On
-#RewriteRule http://git.slive.com/(.*)/(.*)$ http://git.slive.com/$1.$2
-#RewriteRule ^git.slive.com/stratos.org/appserver.git http://git.slive.com/stratos.org.appserver.git
-
-#SSLEngine on
-#SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
-#SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
-
-
-
-SetEnv GIT_PROJECT_ROOT /home/git/repositories
-SetEnv GIT_HTTP_EXPORT_ALL
-
-SetEnv GITOLITE_HTTP_HOME /home/git
-
-ScriptAliasMatch \
-"(?x)^/(.*/(HEAD | \
-info/refs | \
-objects/(info/[^/]+ | \
-[0-9a-f]{2}/[0-9a-f]{38} | \
-pack/pack-[0-9a-f]{40}\.(pack|idx)) | \
-git-(upload|receive)-pack))$" \
-/var/www/bin/gitolite-suexec-wrapper.sh/$1
-
-Axis2RepoPath /home/wso2/axis2c/deploy
-AppfactorySVNAuthEPR https://IS_HOSTNAME:IS_PORT/services/AuthenticationAdmin
-CredentialCache on
-CacheMaxAge 5
-CacheMaxEntries 100
-
-
-<Directory "/var/www/gitweb">
-#RewriteEngine On
-#RewriteRule http://git.slive.com/(.*)/(.*)$ http://git.slive.com/$1.$2
-#RewriteRule ^git.slive.com/stratos.org/appserver.git http://git.slive.com/stratos.org.appserver.git
-Options ExecCGI
-AllowOverride None
-AddHandler cgi-script .cgi
-DirectoryIndex gitweb.cgi
-Order allow,deny
-Allow from all
-</Directory>
-
-<Directory "/var/www/bin">
-<Files "gitolite-suexec-wrapper.sh">
-Order allow,deny
-Allow from all
-</Files>
-</Directory>
-
-<Location />
-AuthType Basic
-AuthName "Git Access"
-AuthUserFile /dev/null
-AuthBasicProvider appfactory
-#AuthUserFile /home/git/authfile
-Require valid-user
-
-#Axis2LogFile /home/wso2/axis2c/deploy/axis2.log
-#Axis2LogLevel debug
-#Axis2MaxLogFileSize 10
-
-</Location>
-
-</VirtualHost>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee058d77/tools/stratos-installer/resources/gitolite-suexec-wrapper.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/resources/gitolite-suexec-wrapper.sh b/tools/stratos-installer/resources/gitolite-suexec-wrapper.sh
deleted file mode 100644
index 03d6550..0000000
--- a/tools/stratos-installer/resources/gitolite-suexec-wrapper.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-#
-#
-# 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.
-#
-#
-
-USER=$1
-
-export GIT_PROJECT_ROOT="/home/git/repositories"
-export GITOLITE_HTTP_HOME="/home/git"
-export GIT_HTTP_BACKEND="/usr/lib/git-core/git-http-backend"
-
-
-exec /usr/share/gitolite/gl-auth-command $USER
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee058d77/tools/stratos-installer/resources/notify.php
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/resources/notify.php b/tools/stratos-installer/resources/notify.php
deleted file mode 100644
index 7f80aa7..0000000
--- a/tools/stratos-installer/resources/notify.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/*
- *
- * 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.
- *
-*/
-
-// sample json
-
-//$dd='{"pusher":{"name":"none"},"repository":{"name":"wordpress","has_wiki":true,"size":6668,"created_at":"2012-11-28T21:00:56-08:00","private":false,"watchers":0,"fork":false,"language":"PHP","url":"https://github.com/lakwarus/wordpress","id":6915450,"pushed_at":"2012-12-02T22:34:01-08:00","has_downloads":true,"open_issues":0,"has_issues":true,"forks":0,"stargazers":0,"description":"","owner":{"name":"lakwarus","email":"lakwarus@gmail.com"}},"forced":false,"after":"bf3e4bbe16336b272ca7230eecd1f42cd569d850","head_commit":{"modified":[],"added":["test.txt"],"timestamp":"2012-12-02T22:33:22-08:00","removed":[],"author":{"name":"Lakmal Warusawithana","username":"lakwarus","email":"lakmal@wso2.com"},"url":"https://github.com/lakwarus/wordpress/commit/bf3e4bbe16336b272ca7230eecd1f42cd569d850","id":"bf3e4bbe16336b272ca7230eecd1f42cd569d850","distinct":true,"message":">>>>>>>>>","committer":{"name":"Lakmal Warusawithana","username":"lakwarus","email":"lakmal@wso2.com"}},"deleted":false,"c
ommits":[{"modified":["README.md"],"added":[],"timestamp":"2012-12-02T22:18:54-08:00","removed":[],"author":{"name":"Lakmal Warusawithana","username":"lakwarus","email":"lakmal@wso2.com"},"url":"https://github.com/lakwarus/wordpress/commit/7afd4089f402cc9926aa5490cbcef21d77f63265","id":"7afd4089f402cc9926aa5490cbcef21d77f63265","distinct":true,"message":"add","committer":{"name":"Lakmal Warusawithana","username":"lakwarus","email":"lakmal@wso2.com"}},{"modified":["README.md"],"added":[],"timestamp":"2012-12-02T22:22:11-08:00","removed":[],"author":{"name":"Lakmal Warusawithana","username":"lakwarus","email":"lakmal@wso2.com"},"url":"https://github.com/lakwarus/wordpress/commit/817137d6f40ff0065d1687437a67c2bb42ea98c8","id":"817137d6f40ff0065d1687437a67c2bb42ea98c8","distinct":true,"message":"add","committer":{"name":"Lakmal Warusawithana","username":"lakwarus","email":"lakmal@wso2.com"}},{"modified":[],"added":["test.txt"],"timestamp":"2012-12-02T22:33:22-08:00","removed":[],"author
":{"name":"Lakmal Warusawithana","username":"lakwarus","email":"lakmal@wso2.com"},"url":"https://github.com/lakwarus/wordpress/commit/bf3e4bbe16336b272ca7230eecd1f42cd569d850","id":"bf3e4bbe16336b272ca7230eecd1f42cd569d850","distinct":true,"message":">>>>>>>>>","committer":{"name":"Lakmal Warusawithana","username":"lakwarus","email":"lakmal@wso2.com"}}],"ref":"refs/heads/master","before":"d5d7e4ab8ae58af96dd151bdf536644323e901e3","compare":"https://github.com/lakwarus/wordpress/compare/d5d7e4ab8ae5...bf3e4bbe1633","created":false}';
-
-
-$json = json_decode($_POST['payload']);
-#$json = json_decode($dd);
-$repository=$json->repository;
-
-$jsonIterator = new RecursiveIteratorIterator(
- new RecursiveArrayIterator(json_decode(json_encode($repository), TRUE)),
- RecursiveIteratorIterator::SELF_FIRST);
-
-foreach ($jsonIterator as $key => $val) {
- if(is_array($val)) {
- } else {
- if($key=="url"){
- $giturl=$val;
- }
- }
-}
-#echo $giturl;
-
-$xml="<?xml version=\"1.0\"?><soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsd=\"http://org.apache.axis2/xsd\"><soapenv:Header/><soapenv:Body><xsd:synchronize><xsd:repositoryURL>".$giturl."</xsd:repositoryURL></xsd:synchronize></soapenv:Body></soapenv:Envelope>";
-
-$url = 'https://203.143.18.246:9445/services/RepoNotificationService';
-$ch = curl_init($url);
-curl_setopt($ch, CURLOPT_MUTE, 1);
-curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-curl_setopt($ch, CURLOPT_POST, 1);
-curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: text/xml'));
-curl_setopt($ch, CURLOPT_POSTFIELDS, "$xml");
-curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-
-$response = curl_exec($ch);
-
-curl_close($ch);
-
-?>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee058d77/tools/stratos-installer/resources/remove_entry_zone_file.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/resources/remove_entry_zone_file.sh b/tools/stratos-installer/resources/remove_entry_zone_file.sh
deleted file mode 100644
index c36e539..0000000
--- a/tools/stratos-installer/resources/remove_entry_zone_file.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-#
-#
-# 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.
-#
-#
-zone_file=$2
-subdomain=$1
-
-# check the file
-if [ -f {$zone_file} ]; then
- echo "Error: zone does not exist"
- exit 1
-fi
-echo "File $zone_file exists"
-
-# find entry to delete
-entry=$(grep $subdomain $zone_file)
-#sed "/$entry/d" $zone_file
-
-sed "/$entry/d" $zone_file >tmp
-mv tmp $zone_file
-
-echo "entry to delete $entry"
-
-
-# get serial number
-serial=$(grep 'Serial' $zone_file | awk '{print $1}')
-echo "Serial number " $serial
-# get serial number's date
-serialdate=$(echo $serial | cut -b 1-8)
-# get today's date in same style
-date=$(date +%Y%m%d)
-
-
-#Serial number's date
-serialdate=$(echo $serial | cut -b 1-8)
-echo "serial date" $serialdate
-# get today's date in same style
-date=$(date +%Y%m%d)
-echo "Now date" $date
-
-# compare date and serial date
-if [ $serialdate = $date ]
- then
- # if equal, just add 1
- newserial=$(expr $serial + 1)
- echo "same date"
- else
- # if not equal, make a new one and add 00
- newserial=$(echo $date"00")
-fi
-
-echo "Adding subdomain $1 and ip $2 to $3"
-sed -i "s/.*Serial.*/ \t\t\t\t$newserial ; Serial./" $zone_file
-
-
-
-#reloading bind server
-/etc/init.d/bind9 reload
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee058d77/tools/stratos-installer/setup.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/setup.sh b/tools/stratos-installer/setup.sh
index 8252f21..88cedc6 100755
--- a/tools/stratos-installer/setup.sh
+++ b/tools/stratos-installer/setup.sh
@@ -87,15 +87,11 @@ do
if [[ $x = "sc" ]]; then
sc="true"
fi
-# if [[ $x = "bam" ]]; then
-# bam="true"
-# fi
if [[ $x = "all" ]]; then
cc="true"
elb="true"
agent="true"
sc="true"
-# bam="true"
fi
done
product_list=`echo $product_list | sed 's/^ *//g' | sed 's/ *$//g'`
@@ -197,10 +193,7 @@ function setup_validate {
if [[ -z $git_user ]]; then
echo "Please specify the git user, because it will be needed to create an internal git repo"
fi
- if [[ -z $axis2c_path ]]; then
- echo "Please specify the path to Axis2/C binary, because it will be needed to create an internal git repo"
- fi
-
+
echo "$hostip git.$stratos_domain" >> /etc/hosts
fi
if [[ ( -z $email|| -z $stratos_foundation_db_user || -z $stratos_foundation_db_pass || -z $hostname
@@ -291,9 +284,6 @@ if [[ $sc = "true" ]]; then
if [[ ! -d $sc_path ]]; then
unzip $sc_pack -d $stratos_path
fi
- #if [[ ! -d $axis2c_path ]]; then
- # unzip $axis2c_pack -d $stratos_path
- #fi
fi
if [[ $elb = "true" ]]; then
if [[ ! -d $elb_path ]]; then
@@ -499,8 +489,8 @@ if [[ $cc = "true" ]]; then
fi
#cp -f ./config/cc/bin/stratos.sh $cc_path/bin/
- cp -f ./config/cc/repository/conf/cloud-controller.xml $cc_path/repository/conf/
- cp -f ./config/cc/repository/conf/carbon.xml $cc_path/repository/conf/
+ cp -f ./config/cc/repository/conf/cloud-controller.xml $cc_path/repository/conf/cloud-controller.conf
+ cp -f ./config/cc/repository/conf/carbon.xml $cc_path/repository/conf/carbon.xml
#MB specific file copying
#cp -f ./config/cc/repository/conf/advanced/qpid-virtualhosts.xml $cc_path/repository/conf/advanced/
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee058d77/tools/stratos-installer/start-servers.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/start-servers.sh b/tools/stratos-installer/start-servers.sh
index 287f327..f180bad 100755
--- a/tools/stratos-installer/start-servers.sh
+++ b/tools/stratos-installer/start-servers.sh
@@ -95,16 +95,6 @@ if [[ -z $product_list || $product_list = "" ]]; then
exit 1
fi
-#if [[ $bam = "true" ]]; then
-#
-# echo ${bam_path}
-#
-# echo "Starting BAM server ..." >> $LOG
-# nohup ${bam_path}/bin/stratos.sh -DportOffset=$bam_port_offset &
-# echo "BAM server started" >> $LOG
-# sleep $SLEEP
-#
-#fi
if [[ $cc = "true" ]]; then
echo ${cc_path}