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/11/04 23:59:30 UTC

[08/14] git commit: [APIBAAS-1362]Have the update script only update the war file

[APIBAAS-1362]Have the update script only update the war file


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

Branch: refs/heads/key-row-sharding
Commit: 2db320943fdbc993b766f8d0b42fde57c0f918ad
Parents: 036a5c0
Author: ryan bridges <rb...@apigee.com>
Authored: Tue Nov 4 11:01:21 2014 -0500
Committer: ryan bridges <rb...@apigee.com>
Committed: Tue Nov 4 11:01:21 2014 -0500

----------------------------------------------------------------------
 stack/awscluster/src/main/dist/update.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2db32094/stack/awscluster/src/main/dist/update.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/update.sh b/stack/awscluster/src/main/dist/update.sh
index e8054ef..d3c399f 100644
--- a/stack/awscluster/src/main/dist/update.sh
+++ b/stack/awscluster/src/main/dist/update.sh
@@ -1,13 +1,13 @@
-#!/bin/bash 
+#!/bin/bash
 
 #  Licensed to the Apache Software Foundation (ASF) under one or more
 #   contributor license agreements.  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.
@@ -20,16 +20,16 @@
 sudo mkdir __tmpupdate__
 pushd __tmpupdate__
 
-    sudo s3cmd --config=/etc/s3cfg get s3://${RELEASE_BUCKET}/awscluster-1.0-SNAPSHOT-any.tar.gz
-    sudo tar xzvf awscluster-1.0-SNAPSHOT-any.tar.gz 
+    sudo s3cmd --config=/etc/s3cfg get s3://${RELEASE_BUCKET}/ROOT.war
+    # sudo tar xzvf awscluster-1.0-SNAPSHOT-any.tar.gz
     sudo /etc/init.d/tomcat7 stop
-    sudo cp -r webapps/* /var/lib/tomcat7/webapps
+    sudo cp -r ROOT.war /var/lib/tomcat7/webapps
 
     pushd /usr/share/usergrid/scripts
-        sudo groovy configure_portal_new.groovy > /var/lib/tomcat7/webapps/portal/config.js 
+        sudo groovy configure_portal_new.groovy > /var/lib/tomcat7/webapps/portal/config.js
     popd
 
     sudo /etc/init.d/tomcat7 start
 
-popd 
+popd
 sudo rm -rf __tmpupdate__