Make it possible to deploy a UG 1 WAR. Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b0aee9e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b0aee9e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b0aee9e8 Branch: refs/heads/two-dot-o-push-notifications Commit: b0aee9e80671ef85eeb518b450615d00da7ffdd2 Parents: e129513 Author: Dave Johnson Authored: Fri Aug 29 17:28:29 2014 -0400 Committer: Dave Johnson Committed: Fri Aug 29 17:28:29 2014 -0400 ---------------------------------------------------------------------- stack/awscluster/src/main/dist/init_instance/init_rest_server.sh | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b0aee9e8/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh ---------------------------------------------------------------------- diff --git a/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh b/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh index d18165a..3adfce4 100644 --- a/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh +++ b/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh @@ -111,6 +111,8 @@ cd /usr/share/usergrid/scripts groovy wait_for_instances.groovy cassandra ${CASSANDRA_NUM_SERVERS} groovy wait_for_instances.groovy graphite ${GRAPHITE_NUM_SERVERS} +chmod 660 /usr/share/usergrid/webapps/ROOT.war + rm -rf /var/lib/tomcat7/webapps/* ln -s /usr/share/usergrid/webapps/ROOT.war /var/lib/tomcat7/webapps/ROOT.war ln -s /usr/share/usergrid/webapps/portal /var/lib/tomcat7/webapps/portal @@ -118,6 +120,8 @@ ln -s /usr/share/usergrid/webapps/portal /var/lib/tomcat7/webapps/portal # configure usergrid mkdir -p /usr/share/tomcat7/lib groovy configure_usergrid.groovy > /usr/share/tomcat7/lib/usergrid-custom.properties +# create a copy for 1.0 too +cp /usr/share/tomcat7/lib/usergrid-custom.properties /usr/share/tomcat7/lib/usergrid-deployment.properties groovy configure_portal_new.groovy >> /var/lib/tomcat7/webapps/portal/config.js # Go