usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [1/5] git commit: Fixes issue with AWS props location
Date Sat, 18 Oct 2014 02:19:05 GMT
Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o 3914d6874 -> ee0f28c7a


Fixes issue with AWS props location


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

Branch: refs/heads/two-dot-o
Commit: 017720278d987353d502a69f3fcf13c0f7fb7bb5
Parents: 3914d68
Author: Todd Nine <toddnine@apache.org>
Authored: Fri Oct 17 18:16:24 2014 -0600
Committer: Todd Nine <toddnine@apache.org>
Committed: Fri Oct 17 18:16:24 2014 -0600

----------------------------------------------------------------------
 .../awscluster/src/main/dist/init_instance/init_rest_server.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/01772027/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 b370f34..28fbc48 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
@@ -114,6 +114,11 @@ export TOMCAT_CONNECTIONS=10000
 sed -i.bak "s/Xmx128m/Xmx${TOMCAT_RAM} -Xms${TOMCAT_RAM} -Dlog4j\.configuration=file:\/usr\/share\/usergrid\/lib\/log4j\.properties/g"
/etc/default/tomcat7
 sed -i.bak "s/<Connector/<Connector maxThreads=\"${TOMCAT_THREADS}\" acceptCount=\"${TOMCAT_THREADS}\"
maxConnections=\"${TOMCAT_CONNECTIONS}\"/g" /var/lib/tomcat7/conf/server.xml
 
+
+#Append our java opts for secret key
+echo "JAVA_OPTS=\"\${JAVA_OPTS} -DAWS_SECRET_KEY=${AWS_SECRET_KEY} -DAWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY}\""
>> /etc/default/tomcat7
+
+
 # set file limits
 sed -i.bak "s/# \/etc\/init\.d\/tomcat7 -- startup script for the Tomcat 6 servlet engine/ulimit
-n ${NOFILE}/" /etc/init.d/tomcat7
 sed -i.bak "s/@student/a *\t\thard\tnofile\t\t${NOFILE}\n*\t\tsoft\tnofile\t\t${NOFILE}"
/etc/security/limits.conf
@@ -148,7 +153,6 @@ mkdir -p /usr/share/tomcat7/lib
 groovy configure_usergrid.groovy > /usr/share/tomcat7/lib/usergrid-deployment.properties

 groovy configure_portal_new.groovy >> /var/lib/tomcat7/webapps/portal/config.js
 
-sudo sed -i '98i export CATALINA_OPTS=\"-DAWS_SECRET_KEY=${AWS_SECRET_KEY} -DAWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY}
${CATALINA_OPTS}\"' /usr/share/tomcat7/bin/catalina.sh
 
 
 #Install postfix so that we can send mail


Mime
View raw message