Page MenuHomeDevCentral
Files F54960297

D3728.diff
No OneTemporary
Actions

D3728.diff
View Options

diff --git a/pillar/paas/docker/docker-002/main.sls b/pillar/paas/docker/docker-002/main.sls
--- a/pillar/paas/docker/docker-002/main.sls
+++ b/pillar/paas/docker/docker-002/main.sls
@@ -148,6 +148,7 @@
credentials:
mysql: nasqueron/devcentral/mysql
mailgun: nasqueron/devcentral/mailgun
+ smtp: nasqueron/devcentral/mail_local
static_host: devcentral.nasqueron-user-content.org
title: Nasqueron DevCentral
mysql_link: acquisitariat
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
@@ -14,10 +14,10 @@
"type": "smtp",
"priority": 10,
"options": {
- "host": "{{ mail_local.host }}",
- "port": {{ mail_local.port }},
- "user": "{{ mail_local.username }}",
- "password": "{{ mail_local.password }}",
+ "host": "{{ smtp.host }}",
+ "port": {{ smtp.port }},
+ "user": "{{ smtp.username }}",
+ "password": "{{ smtp.password }}",
"protocol": "tls"
}
}
@@ -32,8 +32,8 @@
"https://notifications.nasqueron.org/gate/Phabricator/Nasqueron"
],
- "metamta.reply-handler-domain": "devcentral.nasqueron.org",
- "metamta.default-address": "notifications-noreply@devcentral.nasqueron.org",
+ "metamta.reply-handler-domain": "{{ fqdn }}",
+ "metamta.default-address": "notifications-noreply@{{ fqdn }}",
"mysql.host": "{{ db.host }}",
"mysql.user": "{{ db.username }}",
@@ -42,7 +42,7 @@
"notification.servers": [
{
"type": "client",
- "host": "devcentral.nasqueron.org",
+ "host": "{{ fqdn }}",
"port": 443,
"protocol": "https",
"path": "/ws/"
@@ -56,7 +56,7 @@
],
"phabricator.show-prototypes": true,
- "phabricator.base-uri": "https://devcentral.nasqueron.org/",
+ "phabricator.base-uri": "https://{{ fqdn }}/",
"phd.user": "app",
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
@@ -25,21 +25,29 @@
/srv/phabricator/{{ instance }}/conf/local/local.json:
file.managed:
- - source: salt://roles/paas-docker/containers/files/phabricator/devcentral/config.json.jinja
+ - source: salt://roles/paas-docker/containers/files/phabricator/{{ instance }}/config.json.jinja
- template: jinja
- context:
- mailgun:
- domain: devcentral.nasqueron.org
- api-key: "{{ salt["credentials.get_password"](container["credentials"]["mailgun"]) }}"
+ fqdn: {{ container["host"] }}
+
db:
host: "mysql"
username: "{{ salt["credentials.get_username"](container["credentials"]["mysql"]) }}"
password: "{{ salt["credentials.get_password"](container["credentials"]["mysql"]) }}"
- mail_local:
+
+ {% if "mailgun" in container["credentials"] %}
+ mailgun:
+ domain: {{ container["host"] }}
+ api-key: "{{ salt["credentials.get_password"](container["credentials"]["mailgun"]) }}"
+ {% endif %}
+
+ {% if "smtp" in container["credentials"] %}
+ smtp:
host: mail.nasqueron.org
port: 587
- username: "{{ salt["credentials.get_username"]("nasqueron/devcentral/mail_local") }}"
- password: "{{ salt["credentials.get_password"]("nasqueron/devcentral/mail_local") }}"
+ username: "{{ salt["credentials.get_username"](container["credentials"]["smtp"]) }}"
+ password: "{{ salt["credentials.get_password"](container["credentials"]["smtp"]) }}"
+ {% endif %}
{% endif %}

File Metadata

Mime Type
text/plain
Expires
Mon, Oct 26, 06:25 (22 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4219745
Default Alt Text
D3728.diff (3 KB)

Event Timeline

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