You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/17 19:50:04 UTC

[1/2] git commit: Fixes missing env variable for graphite server

Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o 5a0410780 -> 3bae36b01


Fixes missing env variable for graphite server


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6a6791cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6a6791cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6a6791cf

Branch: refs/heads/two-dot-o
Commit: 6a6791cfdeafef6c80768ee6ef0be7c3dd760e67
Parents: 5a04107
Author: Todd Nine <to...@apache.org>
Authored: Fri Oct 17 11:04:24 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Fri Oct 17 11:04:24 2014 -0600

----------------------------------------------------------------------
 stack/awscluster/ugcluster-cf.json | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6a6791cf/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index efef0f9..47d1b64 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -285,6 +285,7 @@
                       "\n",
                       "export REST_SECURITY_GROUP_NAME=", { "Ref":"RestSecurityGroup" }, "\n",
                       "export GRAPHITE_NUM_SERVERS=", { "Ref":"GraphiteNumServers" }, "\n",
+                      "export RELEASE_BUCKET=", { "Ref":"ReleaseBucket" }, "\n",
                       "EOF\n",
                       "\n",
                       "# put AWS creds in environment\n",


[2/2] git commit: Added kopf and bigdesk to elasticsearch

Posted by to...@apache.org.
Added kopf and bigdesk to elasticsearch


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3bae36b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3bae36b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3bae36b0

Branch: refs/heads/two-dot-o
Commit: 3bae36b015f762ef2787c1d21b7a80750092950a
Parents: 6a6791c
Author: Todd Nine <to...@apache.org>
Authored: Fri Oct 17 11:49:57 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Fri Oct 17 11:49:57 2014 -0600

----------------------------------------------------------------------
 .../main/dist/init_instance/install_elasticsearch.sh   | 13 +++++++++++++
 stack/awscluster/ugcluster-cf.json                     |  7 +++++++
 2 files changed, 20 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3bae36b0/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh b/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
index e5c6473..a3c0b64 100644
--- a/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
+++ b/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
@@ -92,6 +92,19 @@ groovy ./configure_elasticsearch.groovy > /etc/elasticsearch/elasticsearch.yml
 
 update-rc.d elasticsearch defaults 95 10
 
+pushd /usr/share/elasticsearch/bin
+
+#Install kopf
+
+./plugin --install lmenezes/elasticsearch-kopf/1.2
+
+#Install bigdesk
+
+./plugin --install lukas-vlcek/bigdesk
+
+popd
+
+
 # Go!
 /etc/init.d/elasticsearch start
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3bae36b0/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index 47d1b64..b4d5a0b 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -1196,6 +1196,13 @@
                         "FromPort": "22",
                         "ToPort": "22",
                         "CidrIp": "0.0.0.0/0"
+                    },
+
+                    {
+                        "IpProtocol": "tcp",
+                        "FromPort": "9200",
+                        "ToPort": "9200",
+                        "CidrIp": "0.0.0.0/0"
                     }
                 ]
             }