From fc299e1fe6a8e49b0289ce0d806c252c1e55d845 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sat, 25 Aug 2012 11:48:45 -0300 Subject: [PATCH] Minor fix. --- Procfile | 2 +- .../src/main/webapp/WEB-INF/heroku.properties | 50 ++----------------- 2 files changed, 5 insertions(+), 47 deletions(-) diff --git a/Procfile b/Procfile index 58577ba8..4981ba86 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: java $JAVA_OPTS -Dspring.profiles.active=keroku -jar wise-webapp/target/dependency/jetty-runner.jar --port $PORT wise-webapp/target/*.war +web: java $JAVA_OPTS -Dspring.profiles.active=heroku -jar wise-webapp/target/dependency/jetty-runner.jar --port $PORT wise-webapp/target/*.war diff --git a/wise-webapp/src/main/webapp/WEB-INF/heroku.properties b/wise-webapp/src/main/webapp/WEB-INF/heroku.properties index c9684559..67176a87 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/heroku.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/heroku.properties @@ -9,28 +9,6 @@ database.hibernate.dialect=${DATABASE_HIBERNATE_DIALECT} database.username=${DATABASE_USERNAME} database.password=${DATABASE_PASSWORD} -# HSQL Configuration properties -#database.url=jdbc:hsqldb:file:target/db/wisemapping -#database.driver=org.hsqldb.jdbc.JDBCDriver -#database.hibernate.dialect=org.hibernate.dialect.HSQLDialect -#database.username=sa -#database.password= - -################################################################################## -# Mail configuration. Must be configured to enable user registration confirmation. -################################################################################## - -#------------------------ -# Plain SMTP Server Configuration -#------------------------ -#mail.smtp.port=25 -#mail.smtp.host=localhost -#mail.username=root -#mail.password= -#mail.smtp.auth=false -#mail.smtp.starttls.enable=false -#mail.smtp.quitwait=false - #------------------------ # Sendgrid Configuration #------------------------ @@ -42,34 +20,14 @@ mail.smtp.auth=true mail.smtp.starttls.enable=true mail.smtp.quitwait=false - -#------------------------ -# SSL SMTP Server Configuration -#------------------------ - -#------------------------ -# GMAIL SMTP Configuration -#------------------------ -#mail.smtp.port=587 -#mail.smtp.host=smtp.gmail.com -#mail.username= -#mail.password= -#mail.smtp.auth=true -#mail.smtp.starttls.enable=true -#mail.smtp.quitwait=false - -#------------------------ -# Emails configuration -#------------------------ - # Required: "from" email account that will appear in the emails sent from the sender. -mail.serverSendEmail=root@localhost +mail.serverSendEmail=daemon@wisemapping.herokuapp.com # Optional: Support account that the users could use to contact you. This address will appear in emails and in some places in the site. -mail.supportEmail=root@localhost +mail.supportEmail=support@wisemapping.com # Optional: Unexpected errors will be reported to this address. -mail.errorReporterEmail=support@wisemapping.com +mail.errorReporterEmail=bug-report@wisemapping.com ################################################################################## # Users Registration Configuration @@ -95,7 +53,7 @@ google.recaptcha.publicKey = 6LeQ4tISAAAAALzCGKNgRv8UqsDx7Cb0vq4wbJBr admin.user = admin@wisemapping.org # Site URL. This url will be used during sharing emails and public views. -site.baseurl = http://localhost:8080 +site.baseurl = http://http://wisemapping.herokuapp.com:8080 ################################################################################## # Google Analytics Settings