Page MenuHomeDevCentral
Files F3743481

D2632.diff
No OneTemporary
Actions

D2632.diff
View Options

diff --git a/roles/core/users/init.sls b/roles/core/users/init.sls
--- a/roles/core/users/init.sls
+++ b/roles/core/users/init.sls
@@ -122,7 +122,7 @@
- group: {{ username }}
- dir_mode: 700
-/home/{{ username}}/.ssh/authorized_keys:
+/home/{{ username }}/.ssh/authorized_keys:
file.managed:
- source: salt://roles/core/users/files/authorized_keys
- user: {{ username }}
diff --git a/roles/devserver/userland-home/homefiles.sls b/roles/devserver/userland-home/homefiles.sls
--- a/roles/devserver/userland-home/homefiles.sls
+++ b/roles/devserver/userland-home/homefiles.sls
@@ -13,7 +13,7 @@
{% set tasks = user.get('devserver_tasks', []) %}
{% if 'deploy_dotfiles' in tasks %}
-dotfiles_to_devserver_{{username}}:
+dotfiles_to_devserver_{{ username }}:
file.recurse:
- name: /home/{{ username }}
- source: salt://roles/devserver/userland-home/files/{{ username }}
@@ -48,7 +48,7 @@
- creates: {{ rustup_path }}
{% for toolchain in ['stable', 'nightly'] %}
-devserver_rustup_{{toolchain}}_{{username}}:
+devserver_rustup_{{ toolchain }}_{{ username }}:
cmd.run:
- name: {{ rustup_path }} install {{ toolchain }}
- runas: {{ username }}
@@ -57,11 +57,11 @@
{% endif %}
{% if 'install_diesel' in tasks %}
-devserver_diesel_{{username}}:
+devserver_diesel_{{ username }}:
cmd.run:
- - name: /home/{{username}}/.cargo/bin/cargo install diesel_cli --no-default-features --features postgres,sqlite
- - runas: {{username}}
- - creates: /home/{{username}}/.cargo/bin/diesel
+ - name: /home/{{ username }}/.cargo/bin/cargo install diesel_cli --no-default-features --features postgres,sqlite
+ - runas: {{ username }}
+ - creates: /home/{{ username }}/.cargo/bin/diesel
{% endif %}
{% endfor %}
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
@@ -20,10 +20,10 @@
- interactive: True
- image: nasqueron/bugzilla
- networks:
- - {{ container['network']}}
+ - {{ container['network'] }}
- environment:
- DB_HOST: {{ container['mysql']['host']}}
- DB_DATABASE: {{ container['mysql']['db']}}
+ 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']) }}
BUGZILLA_URL: https://{{ container['host'] }}/
diff --git a/roles/webserver-legacy/php-sites/account.sls b/roles/webserver-legacy/php-sites/account.sls
--- a/roles/webserver-legacy/php-sites/account.sls
+++ b/roles/webserver-legacy/php-sites/account.sls
@@ -14,7 +14,7 @@
web_account_{{ site['user'] }}:
user.present:
- - name: {{ site['user' ]}}
+ - name: {{ site['user' ] }}
- fullname: {{ fqdn }}
- gid: web
- system: True
diff --git a/roles/webserver-legacy/php-sites/php-fpm.sls b/roles/webserver-legacy/php-sites/php-fpm.sls
--- a/roles/webserver-legacy/php-sites/php-fpm.sls
+++ b/roles/webserver-legacy/php-sites/php-fpm.sls
@@ -41,13 +41,13 @@
fqdn: {{ fqdn }}
domain: {{ site['domain'] }}
subdomain: {{ site['subdomain'] }}
- user: {{ site['user' ]}}
+ user: {{ site['user' ] }}
display_errors: {{ site['display_errors']|default('off') }}
slow_delay: {{ site['slow_delay']|default('5s') }}
env : {{ site['env']|default({}) }}
capabilities: {{ site['capabilities']|default([]) }}
-/var/log/www/{{ site['domain' ]}}/{{ site['subdomain' ]}}-php.log:
+/var/log/www/{{ site['domain' ] }}/{{ site['subdomain' ] }}-php.log:
file.managed:
- replace: False
- user: {{ site['user'] }}
diff --git a/roles/webserver-legacy/php-sites/php.sls b/roles/webserver-legacy/php-sites/php.sls
--- a/roles/webserver-legacy/php-sites/php.sls
+++ b/roles/webserver-legacy/php-sites/php.sls
@@ -39,5 +39,5 @@
/var/tmp/php/sessions/{{ fqdn }}:
file.directory:
- mode: 0700
- - user: {{ site['user']}}
+ - user: {{ site['user'] }}
{% endfor %}

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 15, 20:50 (13 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2246746
Default Alt Text
D2632.diff (4 KB)

Event Timeline

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