usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [35/50] [abbrv] git commit: Fix syntax for installation and configure to use smtp
Date Mon, 20 Oct 2014 13:47:03 GMT
Fix syntax for installation and configure to use smtp


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

Branch: refs/heads/two-dot-o-events
Commit: af29b4bef1a48eafb08395f0815791c9ce125f03
Parents: f7ab174
Author: Todd Nine <toddnine@apache.org>
Authored: Fri Oct 17 14:47:35 2014 -0600
Committer: Todd Nine <toddnine@apache.org>
Committed: Fri Oct 17 14:47:35 2014 -0600

----------------------------------------------------------------------
 .../src/main/dist/init_instance/init_rest_server.sh    |  7 +++++++
 .../src/main/groovy/configure_usergrid.groovy          | 13 +++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/af29b4be/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 75edc16..dde1a00 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
@@ -147,6 +147,13 @@ 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
+echo "postfix postfix/mailname string your.hostname.com" | debconf-set-selections
+echo "postfix postfix/main_mailer_type string 'Internet Site'" | debconf-set-selections
+apt-get install -y postfix
+
+
 # Go
 sh /etc/init.d/tomcat7 start
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/af29b4be/stack/awscluster/src/main/groovy/configure_usergrid.groovy
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/groovy/configure_usergrid.groovy b/stack/awscluster/src/main/groovy/configure_usergrid.groovy
index fc19b74..62452e3 100644
--- a/stack/awscluster/src/main/groovy/configure_usergrid.groovy
+++ b/stack/awscluster/src/main/groovy/configure_usergrid.groovy
@@ -99,17 +99,14 @@ elasticsearch.port=9300
 ######################################################
 # Custom mail transport 
 
-mail.transport.protocol=smtps
-mail.smtps.host=smtp.gmail.com
-mail.smtps.port=465
-mail.smtps.auth=true
-mail.smtps.quitwait=false
+mail.transport.protocol=smtp
+mail.smtp.host=localhost
+mail.smtp.port=25
+mail.smtp.auth=false
+mail.smtp.quitwait=false
 
 # TODO: make all usernames and passwords configurable via Cloud Formation parameters.
 
-# CAUTION: THERE IS A PASSWORD HERE!
-mail.smtps.username=usergridtest@gmail.com
-mail.smtps.password=pw123
 
 ######################################################
 # Admin and test user setup


Mime
View raw message