Page MenuHomeDevCentral
Files F3983124

D3623.diff
No OneTemporary
Actions

D3623.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
@@ -147,6 +147,9 @@
- ops/secrets/nasqueron/cachet/app_key
- ops/secrets/nasqueron/cachet/mysql
+ - ops/secrets/nasqueron/devcentral/mailgun
+ - ops/secrets/nasqueron/devcentral/mysql
+
- ops/secrets/nasqueron/etherpad/api
- ops/secrets/nasqueron/etherpad/mysql
- ops/secrets/nasqueron/etherpad/users/dereckson
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
@@ -146,11 +146,13 @@
- serveurs.nasqueron.org
mailer: mailgun
credentials:
- mysql: zed/phabricator/mysql
+ mysql: nasqueron/devcentral/mysql
+ mailgun: nasqueron/devcentral/mailgun
static_host: devcentral.nasqueron-user-content.org
title: Nasqueron DevCentral
mysql_link: acquisitariat
skip_container: True
+ config_managed: True
# Private instance for Dereckson
river_sector:
diff --git a/roles/paas-docker/containers/files/phabricator/devcentral/config.json.jinja b/roles/paas-docker/containers/files/phabricator/devcentral/config.json.jinja
new file mode 100644
--- /dev/null
+++ b/roles/paas-docker/containers/files/phabricator/devcentral/config.json.jinja
@@ -0,0 +1,57 @@
+{
+ "_comment": "<auto-generated>This file is managed by our rOPS SaltStack repository.</auto-generated>",
+ "cluster.mailers": [
+ {
+ "key": "nasqueron-mailgun",
+ "type": "mailgun",
+ "options": {
+ "domain": "{{ mailgun.domain }}",
+ "api-key": "{{ mailgun["api-key"] }}"
+ }
+ }
+ ],
+
+ "config.ignore-issues": [],
+
+ "diffusion.ssh-port": 5022,
+ "diffusion.ssh-user": "vcs",
+
+ "feed.http-hooks": [
+ "https://notifications.nasqueron.org/gate/Phabricator/Nasqueron"
+ ],
+
+ "metamta.reply-handler-domain": "devcentral.nasqueron.org",
+ "metamta.default-address": "notifications-noreply@devcentral.nasqueron.org",
+
+ "mysql.host": "{{ db.host }}",
+ "mysql.user": "{{ db.username }}",
+ "mysql.pass": "{{ db.password }}",
+
+ "notification.servers": [
+ {
+ "type": "client",
+ "host": "devcentral.nasqueron.org",
+ "port": 443,
+ "protocol": "https",
+ "path": "/ws/"
+ },
+ {
+ "type": "admin",
+ "host": "aphlict.nasqueron.org",
+ "port": 22281,
+ "protocol": "http"
+ }
+ ],
+
+ "phabricator.show-prototypes": true,
+ "phabricator.base-uri": "https://devcentral.nasqueron.org/",
+
+ "phd.user": "app",
+
+ "pygments.enabled": true,
+
+ "storage.default-namespace": "devcentral",
+
+ "security.alternate-file-domain": "https://devcentral.nasqueron-user-content.org"
+
+}
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
@@ -21,6 +21,23 @@
- group: 433
- makedirs: True
+{% if "config_managed" in container %}
+
+/srv/phabricator/{{ instance }}/conf/local/local.json:
+ file.managed:
+ - source: salt://roles/paas-docker/containers/files/phabricator/devcentral/config.json.jinja
+ - template: jinja
+ - context:
+ mailgun:
+ domain: devcentral.nasqueron.org
+ api-key: "{{ salt["credentials.get_password"](container["credentials"]["mailgun"]) }}"
+ db:
+ host: "mysql"
+ username: "{{ salt["credentials.get_username"](container["credentials"]["mysql"]) }}"
+ password: "{{ salt["credentials.get_password"](container["credentials"]["mysql"]) }}"
+
+{% endif %}
+
{% if has_selinux %}
selinux_context_{{ instance }}_data:
selinux.fcontext_policy_present:

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 9, 03:43 (25 m, 29 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2336350
Default Alt Text
D3623.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