Merge lp:~caio1982/capomastro/mta-charm into lp:~ubuntuone-hackers/capomastro/charm

[Caio Begotti]

These changes are necessary to have Capomastro sending e-mails when builds finish (with whatever status). The spec will be updated later with the settings Prodstack/Staging expect, as discussed with IS last Friday.

[Sheila Miguez (codersquid)]

LGTM

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-02-19 00:59:50 +0000
+++ config.yaml	2015-04-06 14:48:56 +0000
@@ -39,6 +39,18 @@
     type: string
     default: "capomastro"
     description: "The superuser default password"
+  email_from:
+    type: string
+    default: "Capomastro <noreply@localhost>"
+    description: "The From: field of notifications e-mails"
+  email_host:
+    type: string
+    default: "localhost"
+    description: "The e-mail host to use for sending notifications"
+  email_port:
+    type: string
+    default: "25"
+    description: "The e-mail host port, usually 25 (plain) or 587 (SSL)"
   superemail:
     type: string
     default: "capomastro@localhost"

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2015-03-17 13:42:18 +0000
+++ hooks/config-changed	2015-04-06 14:48:56 +0000
@@ -89,6 +89,11 @@
 	export t_app_allowed_hosts="'${sitename}', '${private_address}'"
 fi
 
+# MTA variables
+export t_email_from=${email_from}
+export t_email_host=${email_host}
+export t_email_port=${email_port}
+
 juju-log "Fixing up local settings of Capomastro..."
 cheetah fill --env --stdout templates/capomastro_local_settings.tmpl > ${app_config}
 

=== modified file 'inc/common'
--- inc/common	2014-12-16 16:53:12 +0000
+++ inc/common	2015-04-06 14:48:56 +0000
@@ -21,6 +21,11 @@
 django_superpassword=$(config-get superpassword)
 django_superemail=$(config-get superemail)
 
+# for the mta template part
+email_from=$(config-get email_from)
+email_host=$(config-get email_host)
+email_port=$(config-get email_port)
+
 # postresql customization and defaults
 db_name=$(config-get dbname)
 db_user=$(config-get dbuser)

=== modified file 'templates/capomastro_local_settings.tmpl'
--- templates/capomastro_local_settings.tmpl	2015-02-03 18:25:53 +0000
+++ templates/capomastro_local_settings.tmpl	2015-04-06 14:48:56 +0000
@@ -10,3 +10,9 @@
 
 # Note this should be a URL that Jenkins can access your Django application.
 NOTIFICATION_HOST = "http://${t_app_notification_host}/"
+
+# Django ignores the system MTA so you need it set up in here
+EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
+DEFAULT_FROM_EMAIL = "${t_email_from}"
+EMAIL_HOST = "${t_email_host}"
+EMAIL_PORT = "${t_email_port}"