updated states by lint
This commit is contained in:
parent
ffd15afa3a
commit
2986915dc7
@ -10,10 +10,10 @@ borg-config-script-{{ key }}:
|
||||
- group: root
|
||||
- mode: 0700
|
||||
- context:
|
||||
key: {{ key }}
|
||||
job: {{ job }}
|
||||
working_dir: {{ borg.working_dir }}
|
||||
log_dir: {{ borg.log_dir }}
|
||||
key: {{ key }}
|
||||
job: {{ job }}
|
||||
working_dir: {{ borg.working_dir }}
|
||||
log_dir: {{ borg.log_dir }}
|
||||
{% endfor %}
|
||||
|
||||
borg-config-sudo:
|
||||
|
@ -13,5 +13,5 @@ chrome-policies-managed:
|
||||
- name: /etc/opt/chrome/policies/managed/managed_policies.json
|
||||
- source: salt://chrome/config.json.j2
|
||||
- context:
|
||||
config: {{ chrome.config.managed }}
|
||||
config: {{ chrome.config.managed }}
|
||||
- template: jinja
|
||||
|
@ -17,7 +17,7 @@ dovecot-config-main-{{ name }}:
|
||||
- watch_in:
|
||||
- service: dovecot-service
|
||||
- context:
|
||||
config: {{ config }}
|
||||
config: {{ config }}
|
||||
{%- endfor %}
|
||||
|
||||
{%- for name, config in dovecot.config.confd.items() %}
|
||||
@ -31,5 +31,5 @@ dovecot-config-conf.d-{{ name }}:
|
||||
- watch_in:
|
||||
- service: dovecot-service
|
||||
- context:
|
||||
config: {{ config }}
|
||||
config: {{ config }}
|
||||
{%- endfor %}
|
||||
|
@ -51,21 +51,21 @@ nginx-sites-available-{{ name }}:
|
||||
- watch_in:
|
||||
- service: nginx-service
|
||||
- context:
|
||||
vhost_name: {{ name }}
|
||||
sub: {{ vhost.sub|default([]) }}
|
||||
config_dir: {{ nginx.config.dir }}
|
||||
https: {{ vhost.https|default(true) }}
|
||||
proxy: {{ vhost.proxy|default(false) }}
|
||||
proxy_pass: {{ vhost.proxy_pass|default("") }}
|
||||
cache: {{ vhost.cache|default(true) }}
|
||||
autoindex: {{ vhost.autoindex|default(false) }}
|
||||
root_dir: {{ vhost.root_dir|default(none) }}
|
||||
internal_access: {{ vhost.internal_access|default(false) }}
|
||||
auth: {{ vhost.auth|default(false) }}
|
||||
dirs: {{ vhost.dirs|default([]) }}
|
||||
headers: {{ vhost.headers|default({}) }}
|
||||
php_socket_file: {{ nginx.config.php_socket_file }}
|
||||
geoip: {{ nginx.config.geoip }}
|
||||
vhost_name: {{ name }}
|
||||
sub: {{ vhost.sub|default([]) }}
|
||||
config_dir: {{ nginx.config.dir }}
|
||||
https: {{ vhost.https|default(true) }}
|
||||
proxy: {{ vhost.proxy|default(false) }}
|
||||
proxy_pass: {{ vhost.proxy_pass|default("") }}
|
||||
cache: {{ vhost.cache|default(true) }}
|
||||
autoindex: {{ vhost.autoindex|default(false) }}
|
||||
root_dir: {{ vhost.root_dir|default(none) }}
|
||||
internal_access: {{ vhost.internal_access|default(false) }}
|
||||
auth: {{ vhost.auth|default(false) }}
|
||||
dirs: {{ vhost.dirs|default([]) }}
|
||||
headers: {{ vhost.headers|default({}) }}
|
||||
php_socket_file: {{ nginx.config.php_socket_file }}
|
||||
geoip: {{ nginx.config.geoip }}
|
||||
|
||||
nginx-site-enabled-{{ name }}:
|
||||
file.symlink:
|
||||
|
@ -11,18 +11,18 @@ openvpn-server-{{ key }}-config:
|
||||
- mode: 0600
|
||||
- template: jinja
|
||||
- context:
|
||||
ca: |
|
||||
{{ instance.ca|indent(8) }}
|
||||
cert: |
|
||||
{{ instance.cert|indent(8) }}
|
||||
key: |
|
||||
{{ instance.key|indent(8) }}
|
||||
dh: |
|
||||
{{ instance.dh|indent(8) }}
|
||||
routes: {{ instance.routes }}
|
||||
config: {{ instance.config }}
|
||||
tunnel: {{ instance.tunnel }}
|
||||
dns: {{ instance.dns }}
|
||||
ca: |
|
||||
{{ instance.ca|indent(8) }}
|
||||
cert: |
|
||||
{{ instance.cert|indent(8) }}
|
||||
key: |
|
||||
{{ instance.key|indent(8) }}
|
||||
dh: |
|
||||
{{ instance.dh|indent(8) }}
|
||||
routes: {{ instance.routes }}
|
||||
config: {{ instance.config }}
|
||||
tunnel: {{ instance.tunnel }}
|
||||
dns: {{ instance.dns }}
|
||||
- watch_in:
|
||||
- service: openvpn-server-{{ key }}-service
|
||||
|
||||
|
@ -39,8 +39,8 @@ postfix-pgsql-{{ key }}:
|
||||
- mode: 644
|
||||
- template: jinja
|
||||
- context:
|
||||
config: {{ postfix.config.pgsql.config }}
|
||||
query: {{ value.query }}
|
||||
config: {{ postfix.config.pgsql.config }}
|
||||
query: {{ value.query }}
|
||||
- watch_in:
|
||||
- service: postfix-service
|
||||
{% endfor %}
|
||||
|
Loading…
Reference in New Issue
Block a user