Skip to content

Commit ec0e2a7

Browse files
daksdaks
committed
style: remove previous line from jinja directives
1 parent 3fb5a82 commit ec0e2a7

File tree

14 files changed

+225
-225
lines changed

14 files changed

+225
-225
lines changed

‎mysql/apparmor.sls‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% from tpldir ~ "/map.jinja" import mysql with context %}
1+
{%- from tpldir ~ "/map.jinja" import mysql with context %}
22
33
{%- if "apparmor" in mysql.config %}
44

‎mysql/client.sls‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include:
22
- .config
33

4-
{% from tpldir ~ "/map.jinja" import mysql with context %}
4+
{%- from tpldir ~ "/map.jinja" import mysql with context %}
55
66
mysql:
77
pkg.installed:

‎mysql/config.sls‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,100 @@
1-
{% from tpldir ~ "/map.jinja" import mysql with context %}
2-
{% set os_family = salt['grains.get']('os_family', None) %}
1+
{%- from tpldir ~ "/map.jinja" import mysql with context %}
2+
{%- set os_family = salt['grains.get']('os_family', None) %}
33
4-
{% if "config_directory" in mysql %}
4+
{%- if "config_directory" in mysql %}
55
mysql_config_directory:
66
file.directory:
77
- name: {{ mysql.config_directory }}
8-
{% if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
8+
{%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
99
- user: root
1010
- group: root
1111
- mode: 755
12-
{% endif %}
12+
{%- endif %}
1313
- makedirs: True
1414
15-
{% if "server_config" in mysql %}
15+
{%- if "server_config" in mysql %}
1616
mysql_server_config:
1717
file.managed:
1818
- name: {{ mysql.config_directory + mysql.server_config.file }}
1919
- template: jinja
2020
- source: salt://{{ tpldir }}/files/server.cnf
21-
{% if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
21+
{%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
2222
- context:
2323
tpldir: {{ tpldir }}
2424
- user: root
2525
- group: root
2626
- mode: 644
27-
{% endif %}
27+
{%- endif %}
2828
- require:
2929
- file: mysql_config_directory
30-
{% endif %}
30+
{%- endif %}
3131
32-
{% if "galera_config" in mysql %}
32+
{%- if "galera_config" in mysql %}
3333
mysql_galera_config:
3434
file.managed:
3535
- name: {{ mysql.config_directory + mysql.galera_config.file }}
3636
- template: jinja
3737
- source: salt://{{ tpldir }}/files/galera.cnf
38-
{% if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
38+
{%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
3939
- context:
4040
tpldir: {{ tpldir }}
4141
- user: root
4242
- group: root
4343
- mode: 644
44-
{% endif %}
44+
{%- endif %}
4545
- require:
4646
- file: mysql_config_directory
47-
{% endif %}
47+
{%- endif %}
4848
49-
{% if "library_config" in mysql %}
49+
{%- if "library_config" in mysql %}
5050
mysql_library_config:
5151
file.managed:
5252
- name: {{ mysql.config_directory + mysql.library_config.file }}
5353
- template: jinja
5454
- source: salt://{{ tpldir }}/files/client.cnf
55-
{% if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
55+
{%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
5656
- context:
5757
tpldir: {{ tpldir }}
5858
- user: root
5959
- group: root
6060
- mode: 644
61-
{% endif %}
61+
{%- endif %}
6262
- require:
6363
- file: mysql_config_directory
64-
{% endif %}
64+
{%- endif %}
6565
66-
{% if "clients_config" in mysql %}
66+
{%- if "clients_config" in mysql %}
6767
mysql_clients_config:
6868
file.managed:
6969
- name: {{ mysql.config_directory + mysql.clients_config.file }}
7070
- template: jinja
7171
- source: salt://{{ tpldir }}/files/mysql-clients.cnf
72-
{% if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
72+
{%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
7373
- context:
7474
tpldir: {{ tpldir }}
7575
- user: root
7676
- group: root
7777
- mode: 644
78-
{% endif %}
78+
{%- endif %}
7979
- require:
8080
- file: mysql_config_directory
81-
{% endif %}
81+
{%- endif %}
8282
83-
{% endif %}
83+
{%- endif %}
8484
8585
mysql_config:
8686
file.managed:
8787
- name: {{ mysql.config.file }}
8888
- template: jinja
89-
{% if "config_directory" in mysql %}
89+
{%- if "config_directory" in mysql %}
9090
- source: salt://{{ tpldir }}/files/my-include.cnf
91-
{% else %}
91+
{%- else %}
9292
- source: salt://{{ tpldir }}/files/my.cnf
93-
{% endif %}
93+
{%- endif %}
9494
- context:
9595
tpldir: {{ tpldir }}
96-
{% if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
96+
{%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
9797
- user: root
9898
- group: root
9999
- mode: 644
100-
{% endif %}
100+
{%- endif %}

‎mysql/database.sls‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
1-
{% from tpldir ~ "/map.jinja" import mysql with context %}
1+
{%- from tpldir ~ "/map.jinja" import mysql with context %}
22
3-
{% set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %}
4-
{% set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %}
5-
{% set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %}
6-
{% set db_states = [] %}
3+
{%- set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %}
4+
{%- set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %}
5+
{%- set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %}
6+
{%- set db_states = [] %}
77
8-
{% set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %}
9-
{% set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_pass) %}
8+
{%- set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %}
9+
{%- set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_pass) %}
1010
1111
include:
1212
- .python
1313
14-
{% for database_obj in salt['pillar.get']('mysql:database', []) %}
15-
{% set state_id = 'mysql_db_' ~ loop.index0 %}
16-
{% if not database_obj %}{# in case database_obj == [] #}
17-
{% continue %}
18-
{% elif database_obj is mapping %}
19-
{% set database = database_obj.get('name') %}
20-
{% set present = database_obj.get('present', True) %}
21-
{% else %}
22-
{% set database = database_obj %}
23-
{% set present = True %}
24-
{% endif %}
14+
{%- for database_obj in salt['pillar.get']('mysql:database', []) %}
15+
{%- set state_id = 'mysql_db_' ~ loop.index0 %}
16+
{%- if not database_obj %}{# in case database_obj == [] #}
17+
{%- continue %}
18+
{%- elif database_obj is mapping %}
19+
{%- set database = database_obj.get('name') %}
20+
{%- set present = database_obj.get('present', True) %}
21+
{%- else %}
22+
{%- set database = database_obj %}
23+
{%- set present = True %}
24+
{%- endif %}
2525
{{ state_id }}:
2626
{%- if present %}
2727
mysql_database.present:
28-
{% if database_obj is mapping %}
28+
{%- if database_obj is mapping %}
2929
- character_set: {{ database_obj.get('character_set', '') }}
3030
- collate: {{ database_obj.get('collate', '') }}
31-
{% endif %}
32-
{% else %}
31+
{%- endif %}
32+
{%- else %}
3333
mysql_database.absent:
34-
{% endif %}
34+
{%- endif %}
3535
- name: {{ database }}
3636
- connection_host: '{{ mysql_host }}'
3737
- connection_user: '{{ mysql_salt_user }}'
38-
{% if mysql_salt_pass %}
38+
{%- if mysql_salt_pass %}
3939
- connection_pass: '{{ mysql_salt_pass }}'
40-
{% endif %}
40+
{%- endif %}
4141
- connection_charset: utf8
4242
43-
{% if salt['pillar.get'](['mysql', 'schema', database, 'load']|join(':'), False) %}
43+
{%- if salt['pillar.get'](['mysql', 'schema', database, 'load']|join(':'), False) %}
4444
{{ state_id }}_schema:
4545
file.managed:
4646
- name: /etc/mysql/{{ database }}.schema
@@ -50,17 +50,17 @@ include:
5050
{%- if template_type %}
5151
- template: {{ template_type }}
5252
- context: {{ template_context|yaml }}
53-
{% endif %}
53+
{%- endif %}
5454
- user: {{ salt['pillar.get']('mysql:server:user', 'mysql') }}
5555
- makedirs: True
5656
5757
{{ state_id }}_load:
5858
cmd.wait:
59-
- name: mysql -u {{ mysql_salt_user }} -h{{ mysql_host }} {% if mysql_salt_pass %}-p{% endif %}{{ mysql_salt_pass }} {{ database }} < /etc/mysql/{{ database }}.schema
59+
- name: mysql -u {{ mysql_salt_user }} -h{{ mysql_host }} {%- if mysql_salt_pass %}-p{%- endif %}{{ mysql_salt_pass }} {{ database }} < /etc/mysql/{{ database }}.schema
6060
- watch:
6161
- file: {{ state_id }}_schema
6262
- mysql_database: {{ state_id }}
63-
{% endif %}
63+
{%- endif %}
6464
65-
{% do db_states.append(state_id) %}
66-
{% endfor %}
65+
{%- do db_states.append(state_id) %}
66+
{%- endfor %}

‎mysql/dev.sls‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% from tpldir ~ "/map.jinja" import mysql with context %}
1+
{%- from tpldir ~ "/map.jinja" import mysql with context %}
22
33
mysql_dev:
44
pkg:

‎mysql/disabled.sls‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% from tpldir ~ "/map.jinja" import mysql with context %}
1+
{%- from tpldir ~ "/map.jinja" import mysql with context %}
22
33
mysql:
44
service.dead:

‎mysql/init.sls‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
{% from tpldir ~ '/database.sls' import db_states with context %}
2-
{% from tpldir ~ '/user.sls' import user_states with context %}
1+
{%- from tpldir ~ '/database.sls' import db_states with context %}
2+
{%- from tpldir ~ '/user.sls' import user_states with context %}
33
4-
{% macro requisites(type, states) %}
4+
{%- macro requisites(type, states) %}
55
{%- for state in states %}
66
- {{ type }}: {{ state }}
77
{%- endfor -%}
8-
{% endmacro %}
8+
{%- endmacro %}
99
10-
{% set mysql_dev = salt['pillar.get']('mysql:dev:install', False) %}
11-
{% set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', False) %}
10+
{%- set mysql_dev = salt['pillar.get']('mysql:dev:install', False) %}
11+
{%- set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', False) %}
1212
1313
include:
1414
- .server
15-
{% if mysql_salt_user %}
15+
{%- if mysql_salt_user %}
1616
- .salt-user
17-
{% endif %}
17+
{%- endif %}
1818
- .database
1919
- .user
20-
{% if mysql_dev %}
20+
{%- if mysql_dev %}
2121
- .dev
22-
{% endif %}
22+
{%- endif %}
2323
2424
25-
{% if (db_states|length() + user_states|length()) > 0 %}
25+
{%- if (db_states|length() + user_states|length()) > 0 %}
2626
extend:
2727
mysqld-service-running:
2828
service:
2929
- require_in:
3030
{{ requisites('mysql_database', db_states) }}
3131
{{ requisites('mysql_user', user_states) }}
32-
{% endif %}
32+
{%- endif %}

‎mysql/macos/install.sls‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ mysql-macos-download-{{ product }}-archive:
2121
cmd.run:
2222
- name: curl {{ dl.opts }} -o {{ dl.tmpdir }}/{{ archivefile }} {{ data.url }}
2323
- unless: test -f {{ dl.tmpdir }}/{{ archivefile }}
24-
{% if grains['saltversioninfo'] >= [2017, 7, 0] %}
24+
{%- if grains['saltversioninfo'] >= [2017, 7, 0] %}
2525
- retry:
2626
attempts: {{ dl.retries }}
2727
interval: {{ dl.interval }}
2828
until: True
2929
splay: 10
30-
{% endif %}
30+
{%- endif %}
3131
- require:
3232
- mysql-macos-extract-dirs
3333

@@ -93,4 +93,4 @@ mysql-macos-{{ product }}-desktop-shortcut-add:
9393
- file: mysql-macos-{{ product }}-desktop-shortcut-add
9494

9595
{%- endif %}
96-
{% endfor %}
96+
{%- endfor %}

‎mysql/python.sls‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% from tpldir ~ "/map.jinja" import mysql with context %}
1+
{%- from tpldir ~ "/map.jinja" import mysql with context %}
22
33
mysql_python:
44
pkg.installed:

‎mysql/remove_test_database.sls‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
{% set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %}
2-
{% set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %}
3-
{% set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %}
4-
{% set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %}
5-
{% set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_pass) %}
1+
{%- set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %}
2+
{%- set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %}
3+
{%- set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %}
4+
{%- set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %}
5+
{%- set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_pass) %}
66

77
include:
88
- .python
@@ -13,7 +13,7 @@ mysql remove test database:
1313
- host: '{{ mysql_host }}'
1414
- connection_user: '{{ mysql_salt_user }}'
1515
- connection_host: '{{ mysql_host }}'
16-
{% if mysql_salt_pass %}
16+
{%- if mysql_salt_pass %}
1717
- connection_pass: '{{ mysql_salt_pass }}'
18-
{% endif %}
18+
{%- endif %}
1919
- connection_charset: utf8

0 commit comments

Comments
 (0)