Page MenuHomeDevCentral
Files F7339522

D3629.id9392.diff
No OneTemporary
Actions

D3629.id9392.diff
View Options

diff --git a/pillar/credentials/vault.sls b/pillar/credentials/vault.sls
--- a/pillar/credentials/vault.sls
+++ b/pillar/credentials/vault.sls
@@ -148,6 +148,7 @@
- ops/secrets/nasqueron/cachet/mysql
- ops/secrets/nasqueron/devcentral/mailgun
+ - ops/secrets/nasqueron/devcentral/mail_local
- ops/secrets/nasqueron/devcentral/mysql
- ops/secrets/nasqueron/etherpad/api
diff --git a/roles/paas-docker/containers/files/phabricator/devcentral/config.json.jinja b/roles/paas-docker/containers/files/phabricator/devcentral/config.json.jinja
--- a/roles/paas-docker/containers/files/phabricator/devcentral/config.json.jinja
+++ b/roles/paas-docker/containers/files/phabricator/devcentral/config.json.jinja
@@ -3,10 +3,23 @@
{
"key": "nasqueron-mailgun",
"type": "mailgun",
+ "priority": 5,
"options": {
"domain": "{{ mailgun.domain }}",
"api-key": "{{ mailgun["api-key"] }}"
}
+ },
+ {
+ "key": "nasqueron-local",
+ "type": "smtp",
+ "priority": 10,
+ "options": {
+ "host": "{{ mail_local.host }}",
+ "port": {{ mail_local.port }},
+ "user": "{{ mail_local.username }}",
+ "password": "{{ mail_local.password }}",
+ "protocol": "tls"
+ }
}
],
diff --git a/roles/paas-docker/containers/phabricator.sls b/roles/paas-docker/containers/phabricator.sls
--- a/roles/paas-docker/containers/phabricator.sls
+++ b/roles/paas-docker/containers/phabricator.sls
@@ -35,6 +35,11 @@
host: "mysql"
username: "{{ salt["credentials.get_username"](container["credentials"]["mysql"]) }}"
password: "{{ salt["credentials.get_password"](container["credentials"]["mysql"]) }}"
+ mail_local:
+ host: mail.nasqueron.org
+ port: 587
+ username: "{{ salt["credentials.get_username"]("nasqueron/devcentral/mail_local") }}"
+ password: "{{ salt["credentials.get_password"]("nasqueron/devcentral/mail_local") }}"
{% endif %}

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 26, 01:16 (18 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2605268
Default Alt Text
D3629.id9392.diff (1 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator