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