You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/09/21 21:49:00 UTC

[06/10] git commit: Rename deployment properties file back to usergrid-deployment.properties as it was in UG1.

Rename deployment properties file back to usergrid-deployment.properties as it was in UG1.


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

Branch: refs/heads/two-dot-o
Commit: 2f657901220dac2a78dd706ee81446b912704730
Parents: 4e6bd28
Author: Dave Johnson <dm...@apigee.com>
Authored: Sun Sep 21 14:31:14 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Sun Sep 21 14:31:14 2014 -0400

----------------------------------------------------------------------
 stack/awscluster/src/main/dist/init_instance/init_rest_server.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2f657901/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 46865a4..b8d05a7 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
@@ -134,9 +134,7 @@ chown -R tomcat7 /var/lib/tomcat7/webapps
 
 # 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_usergrid.groovy > /usr/share/tomcat7/lib/usergrid-deployment.properties 
 groovy configure_portal_new.groovy >> /var/lib/tomcat7/webapps/portal/config.js
 
 # Go