Page MenuHomeDevCentral
Files F3910923

D2800.diff
No OneTemporary
Actions

D2800.diff
View Options

diff --git a/roles/opensearch/dashboards/config.sls b/roles/opensearch/dashboards/config.sls
--- a/roles/opensearch/dashboards/config.sls
+++ b/roles/opensearch/dashboards/config.sls
@@ -19,5 +19,5 @@
- template: jinja
- context:
config: {{ config }}
- username: {{ salt['zr.get_username'](config['users']['dashboards']) }}
- password: {{ salt['zr.get_password'](config['users']['dashboards']) }}
+ username: {{ salt['credentials.get_username'](config['users']['dashboards']) }}
+ password: {{ salt['credentials.get_password'](config['users']['dashboards']) }}
diff --git a/roles/opensearch/opensearch/security.sls b/roles/opensearch/opensearch/security.sls
--- a/roles/opensearch/opensearch/security.sls
+++ b/roles/opensearch/opensearch/security.sls
@@ -22,8 +22,8 @@
users:
{% for user, credential in config['users'].items() %}
{{ user }}:
- username: {{ salt['zr.get_username'](credential) }}
- password: {{ salt['zr.get_password'](credential) }}
+ username: {{ salt['credentials.get_username'](credential) }}
+ password: {{ salt['credentials.get_password'](credential) }}
{% endfor %}
opensearch_security_initialize:
diff --git a/roles/paas-docker/containers/auth-grove.sls b/roles/paas-docker/containers/auth-grove.sls
--- a/roles/paas-docker/containers/auth-grove.sls
+++ b/roles/paas-docker/containers/auth-grove.sls
@@ -51,8 +51,8 @@
- DB_HOST: mysql
- DB_PORT: 3306
- DB_DATABASE: {{ instance }}
- - DB_USERNAME: {{ salt['zr.get_username'](container['credential']) }}
- - DB_PASSWORD: {{ salt['zr.get_password'](container['credential']) }}
+ - DB_USERNAME: {{ salt['credentials.get_username'](container['credential']) }}
+ - DB_PASSWORD: {{ salt['credentials.get_password'](container['credential']) }}
- CANONICAL_URL: https://{{ container['host'] }}
- TRUST_ALL_PROXIES: 1
diff --git a/roles/paas-docker/containers/bugzilla.sls b/roles/paas-docker/containers/bugzilla.sls
--- a/roles/paas-docker/containers/bugzilla.sls
+++ b/roles/paas-docker/containers/bugzilla.sls
@@ -24,8 +24,8 @@
- environment:
DB_HOST: {{ container['mysql']['host'] }}
DB_DATABASE: {{ container['mysql']['db'] }}
- DB_USER: {{ salt['zr.get_username'](container['credential']) }}
- DB_PASSWORD: {{ salt['zr.get_password'](container['credential']) }}
+ DB_USER: {{ salt['credentials.get_username'](container['credential']) }}
+ DB_PASSWORD: {{ salt['credentials.get_password'](container['credential']) }}
BUGZILLA_URL: https://{{ container['host'] }}/
- ports:
- 80
diff --git a/roles/paas-docker/containers/cachet.sls b/roles/paas-docker/containers/cachet.sls
--- a/roles/paas-docker/containers/cachet.sls
+++ b/roles/paas-docker/containers/cachet.sls
@@ -29,10 +29,10 @@
- DB_HOST: mysql
- DB_PORT: 3306
- DB_DATABASE: cachet
- - DB_USERNAME: {{ salt['zr.get_username'](container['credential']) }}
- - DB_PASSWORD: {{ salt['zr.get_password'](container['credential']) }}
+ - DB_USERNAME: {{ salt['credentials.get_username'](container['credential']) }}
+ - DB_PASSWORD: {{ salt['credentials.get_password'](container['credential']) }}
- - APP_KEY: {{ salt['zr.get_token'](container['app_key']) }}
+ - APP_KEY: {{ salt['credentials.get_token'](container['app_key']) }}
- APP_LOG: errorlog
- APP_DEBUG: "false"
- ports:
diff --git a/roles/paas-docker/containers/etherpad.sls b/roles/paas-docker/containers/etherpad.sls
--- a/roles/paas-docker/containers/etherpad.sls
+++ b/roles/paas-docker/containers/etherpad.sls
@@ -57,7 +57,7 @@
file.managed:
- mode: 400
- user: 9001
- - contents: {{ salt['zr.get_token'](container['credential']) }}
+ - contents: {{ salt['credentials.get_token'](container['credential']) }}
deploy_api_key_{{ instance }}:
cmd.run:
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
@@ -61,17 +61,17 @@
PHABRICATOR_DOMAIN: {{ container['host'] }}
PHABRICATOR_ALT_FILE_DOMAIN: https://{{ container['static_host'] }}
- DB_USER: {{ salt['zr.get_username'](container['credentials']['mysql']) }}
- DB_PASS: {{ salt['zr.get_password'](container['credentials']['mysql']) }}
+ DB_USER: {{ salt['credentials.get_username'](container['credentials']['mysql']) }}
+ DB_PASS: {{ salt['credentials.get_password'](container['credentials']['mysql']) }}
PHABRICATOR_STORAGE_NAMESPACE: {{ container['storage']['namespace'] }}
{% if container['mailer'] == 'sendgrid' %}
PHABRICATOR_USE_SENDGRID: 1
- PHABRICATOR_SENDGRID_APIUSER: {{ salt['zr.get_username'](container['credentials']['sendgrid']) }}
- PHABRICATOR_SENDGRID_APIKEY: {{ salt['zr.get_password'](container['credentials']['sendgrid']) }}
+ PHABRICATOR_SENDGRID_APIUSER: {{ salt['credentials.get_username'](container['credentials']['sendgrid']) }}
+ PHABRICATOR_SENDGRID_APIKEY: {{ salt['credentials.get_password'](container['credentials']['sendgrid']) }}
{% elif container['mailer'] == 'mailgun' %}
PHABRICATOR_USE_MAILGUN: 1
- PHABRICATOR_MAILGUN_APIKEY: {{ salt['zr.get_token'](container['credentials']['mailgun']) }}
+ PHABRICATOR_MAILGUN_APIKEY: {{ salt['credentials.get_token'](container['credentials']['mailgun']) }}
{% endif %}
- links: {{ container['mysql_link'] }}:mysql
diff --git a/roles/paas-docker/containers/pixelfed.sls b/roles/paas-docker/containers/pixelfed.sls
--- a/roles/paas-docker/containers/pixelfed.sls
+++ b/roles/paas-docker/containers/pixelfed.sls
@@ -55,8 +55,8 @@
- DB_HOST: mysql
- DB_PORT: 3306
- DB_DATABASE: {{ instance }}
- - DB_USERNAME: {{ salt['zr.get_username'](container['credentials']['mysql']) }}
- - DB_PASSWORD: {{ salt['zr.get_password'](container['credentials']['mysql']) }}
+ - DB_USERNAME: {{ salt['credentials.get_username'](container['credentials']['mysql']) }}
+ - DB_PASSWORD: {{ salt['credentials.get_password'](container['credentials']['mysql']) }}
# Port must be defined, as Docker link populates REDIS_PORT to tcp://...:6379
# That gives the following rather strange connection string:
@@ -65,7 +65,7 @@
- REDIS_PORT: 6379
- APP_DOMAIN: {{ container['host'] }}
- - APP_KEY: {{ salt['zr.get_token'](container['credentials']['app_key']) }}
+ - APP_KEY: {{ salt['credentials.get_token'](container['credentials']['app_key']) }}
- APP_NAME: {{ container['app']['title'] }}
- APP_URL: https://{{ container['host'] }}
@@ -78,8 +78,8 @@
- MAIL_DRIVER: smtp
- MAIL_HOST: smtp.eu.mailgun.org
- MAIL_PORT: 587
- - MAIL_USERNAME: {{ salt['zr.get_username'](container['credentials']['mailgun']) }}
- - MAIL_PASSWORD: {{ salt['zr.get_password'](container['credentials']['mailgun']) }}
+ - MAIL_USERNAME: {{ salt['credentials.get_username'](container['credentials']['mailgun']) }}
+ - MAIL_PASSWORD: {{ salt['credentials.get_password'](container['credentials']['mailgun']) }}
- MAIL_FROM_ADDRESS: no-reply@{{ container['host'] }}
- MAIL_FROM_NAME: {{ container['app']['title'] }}
diff --git a/roles/paas-docker/containers/postgresql.sls b/roles/paas-docker/containers/postgresql.sls
--- a/roles/paas-docker/containers/postgresql.sls
+++ b/roles/paas-docker/containers/postgresql.sls
@@ -46,8 +46,8 @@
- image: {{ image }}
- binds: /srv/{{ instance }}/postgresql:/var/lib/postgresql/data
- environment:
- POSTGRES_USER: {{ salt['zr.get_username'](container['credential']) }}
- POSTGRES_PASSWORD: {{ salt['zr.get_password'](container['credential']) }}
+ POSTGRES_USER: {{ salt['credentials.get_username'](container['credential']) }}
+ POSTGRES_PASSWORD: {{ salt['credentials.get_password'](container['credential']) }}
{% if 'network' in container %}
- networks:
- {{ container['network'] }}
diff --git a/roles/paas-docker/containers/sentry.sls b/roles/paas-docker/containers/sentry.sls
--- a/roles/paas-docker/containers/sentry.sls
+++ b/roles/paas-docker/containers/sentry.sls
@@ -63,7 +63,7 @@
- {{ args['links']['redis'] }}:redis
- {{ args['links']['smtp'] }}:smtp
- environment: &env
- - SENTRY_SECRET_KEY: {{ salt['zr.get_token'](args['credential']) }}
+ - SENTRY_SECRET_KEY: {{ salt['credentials.get_token'](args['credential']) }}
- SENTRY_FILESTORE_DIR:
- SENTRY_USE_SSL: 1
- SENTRY_SERVER_EMAIL: {{ args['email_from'] }}

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 20, 00:54 (21 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2307142
Default Alt Text
D2800.diff (8 KB)

Event Timeline

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