upgrade for latest salt-lint rules (#296)

salt/backup/client/init.sls

@@ -37,19 +37,19 @@ include:
     - source: salt://backup/client/templates/backup.bash.jinja
     - template: jinja
     - context:
-      pre_script: '{{ config.get('pre_script', ":") }}'
-      remote_command: '/usr/bin/rdiff-backup --terminal-verbosity 1 {%- for exclude in config.get('exclude', []) %} --exclude {{ exclude }} {%- endfor %} --no-eas --remote-schema "ssh -i /etc/backup/.ssh/id_rsa_{{ backup }} -C %s rdiff-backup --server" {{ config['source_directory'] }} {{ config['target_user'] }}@{{ config['target_host'] }}::{{ config['target_directory'] }}'
-      post_script: '{{ config.get('post_script', ":") }}'
-      cleanup_script: '{{ config.get('cleanup_script', ":") }}'
+        pre_script: '{{ config.get('pre_script', ":") }}'
+        remote_command: '/usr/bin/rdiff-backup --terminal-verbosity 1 {%- for exclude in config.get('exclude', []) %} --exclude {{ exclude }} {%- endfor %} --no-eas --remote-schema "ssh -i /etc/backup/.ssh/id_rsa_{{ backup }} -C %s rdiff-backup --server" {{ config['source_directory'] }} {{ config['target_user'] }}@{{ config['target_host'] }}::{{ config['target_directory'] }}'
+        post_script: '{{ config.get('post_script', ":") }}'
+        cleanup_script: '{{ config.get('cleanup_script', ":") }}'
 
 {{ backup }}-cron:
   file.managed:
     - name: /etc/cron.d/{{ backup }}-backup
     - template: jinja
     - source: salt://backup/client/templates/cron.jinja
     - context:
-      job_frequency: {{ config['frequency'] }}
-      job_user: {{ config['user'] }}
-      job_command: /usr/local/backup/{{ backup }}/scripts/backup.bash
+        job_frequency: {{ config['frequency'] }}
+        job_user: {{ config['user'] }}
+        job_command: /usr/local/backup/{{ backup }}/scripts/backup.bash
 
 {% endfor %}

salt/backup/server/init.sls

@@ -39,8 +39,8 @@ include:
     - template: jinja
     - source: salt://backup/server/templates/cron.jinja
     - context:
-      cron: '0 3 * * *'
-      job_user: root
-      job_command: 'rdiff-backup --terminal-verbosity 2 --force --remove-older-than {{ config['increment_retention'] }} {{ config['directory'] }}'
+        cron: '0 3 * * *'
+        job_user: root
+        job_command: 'rdiff-backup --terminal-verbosity 2 --force --remove-older-than {{ config['increment_retention'] }} {{ config['directory'] }}'
 
 {% endfor %}

salt/bugs/init.sls

@@ -196,7 +196,7 @@ tracker-{{ tracker }}-detector-config:
     - mode: "0640"
     - template: jinja
     - context:
-      detector_config: {{ config.get('detector_config', {}) }}
+        detector_config: {{ config.get('detector_config', {}) }}
 
 tracker-{{ tracker }}-mailgw-forward:
   file.managed:
@@ -207,7 +207,7 @@ tracker-{{ tracker }}-mailgw-forward:
     - mode: "0640"
     - template: jinja
     - context:
-      tracker: {{ tracker }}
+        tracker: {{ tracker }}
 
 tracker-{{ tracker }}-wsgi:
   file.managed:
@@ -217,15 +217,15 @@ tracker-{{ tracker }}-wsgi:
     - mode: "0644"
     - template: jinja
     - context:
-      tracker: {{ tracker }}
+        tracker: {{ tracker }}
 
 /etc/systemd/system/roundup-{{ tracker }}.service:
   file.managed:
     - source: salt://bugs/config/instance.service.jinja
     - template: jinja
     - context:
-      tracker: {{ tracker }}
-      workers: {{ config.get('workers', '4') }}
+        tracker: {{ tracker }}
+        workers: {{ config.get('workers', '4') }}
 
   cmd.run:
     - name: systemctl daemon-reload
@@ -253,8 +253,8 @@ tracker-{{ tracker }}-nginx-config:
     - mode: "0600"
     - template: jinja
     - context:
-      tracker: {{ tracker }}
-      server_name: {{ config.get('server_name') }}
+        tracker: {{ tracker }}
+        server_name: {{ config.get('server_name') }}
     - require:
       - file: /etc/nginx/sites.d/
 

salt/buildbot/init.sls

@@ -85,8 +85,8 @@ find /data/www/buildbot/test-results -type f -mtime +7 -exec rm {} \;:
     - group: root
     - mode: "0644"
     - context:
-      instance: master
-      port: 9000
+        instance: master
+        port: 9000
     - require:
       - file: /etc/nginx/sites.d/
       - file: /etc/nginx/fastly_params

salt/cdn-logs/init.sls

@@ -8,7 +8,7 @@
     - source: salt://cdn-logs/config/fastly.rsyslog.conf
     - template: jinja
     - context:
-      fastly_logging_names: {{ pillar["fastly-logging-names"] }}
+        fastly_logging_names: {{ pillar["fastly-logging-names"] }}
 
 /etc/logrotate.d/fastly-logs:
   file.managed:

salt/codespeed/init.sls

@@ -132,19 +132,19 @@ codespeed-{{ instance }}-local_settings:
     - mode: "0640"
     - template: jinja
     - context:
-      instance: {{ instance }}
-      db_host: {{ db_cluster_config['host'] }}
-      db_port: {{ db_cluster_config['port'] }}
-      db_name: {{ config['db_user'] }}
-      db_user: {{ config['db_user'] }}
-      db_pass: {{ db_user_config['password'] }}
-      db_cert: /etc/ssl/postgres/{{ db_user_config['cluster'] }}.crt
-      server_name: {{ config['hostname'] }}
-      secret_key: {{ secrets[instance]['secret_key'] }}
-      admin_team_name: {{ config.get('admin_team_name', 'PSF Codespeed Admins') }}
-      admin_team_email: {{ config.get('admin_team_email', 'speed@python.org') }}
-      server_email: {{ config.get('server_email', '{}@codespeed.pythonhosted.org'.format(instance)) }}
-      default_from_email: {{ config.get('default_from_email', 'noreply@codespeed.pythonhosted.org') }}
+        instance: {{ instance }}
+        db_host: {{ db_cluster_config['host'] }}
+        db_port: {{ db_cluster_config['port'] }}
+        db_name: {{ config['db_user'] }}
+        db_user: {{ config['db_user'] }}
+        db_pass: {{ db_user_config['password'] }}
+        db_cert: /etc/ssl/postgres/{{ db_user_config['cluster'] }}.crt
+        server_name: {{ config['hostname'] }}
+        secret_key: {{ secrets[instance]['secret_key'] }}
+        admin_team_name: {{ config.get('admin_team_name', 'PSF Codespeed Admins') }}
+        admin_team_email: {{ config.get('admin_team_email', 'speed@python.org') }}
+        server_email: {{ config.get('server_email', '{}@codespeed.pythonhosted.org'.format(instance)) }}
+        default_from_email: {{ config.get('default_from_email', 'noreply@codespeed.pythonhosted.org') }}
 
 codespeed-{{ instance }}-pre-reload:
   cmd.run:
@@ -166,8 +166,8 @@ codespeed-{{ instance }}-pre-reload:
     - group: root
     - mode: "0644"
     - context:
-      instance: {{ instance }}
-      wsgi_app: {{ config['wsgi_app'] }}
+        instance: {{ instance }}
+        wsgi_app: {{ config['wsgi_app'] }}
   cmd.run:
     - name: systemctl daemon-reload
     - onchanges:
@@ -192,9 +192,9 @@ codespeed-{{ instance }}:
     - group: root
     - mode: "0644"
     - context:
-      instance: {{ instance }}
-      server_names: {{ config['hostname'] }}
-      port: {{ config['port'] }}
+        instance: {{ instance }}
+        server_names: {{ config['hostname'] }}
+        port: {{ config['port'] }}
     - require:
       - file: /etc/nginx/sites.d/
       - file: /etc/nginx/fastly_params

salt/datadog/init.sls

@@ -37,6 +37,6 @@ datadog-agent:
     - template: jinja
     - source: salt://datadog/config/datadog.yaml.jinja
     - context:
-      api_key: {{ pillar.get('datadog_api_key') }}
-      tags: {{ datadog_tags }}
+        api_key: {{ pillar.get('datadog_api_key') }}
+        tags: {{ datadog_tags }}
 {% endif %}

salt/sudoers/init.sls

@@ -9,7 +9,7 @@
     - source: salt://sudoers/config/salt.jinja
     - template: jinja
     - context:
-      sudoers: {{ pillar.get('sudoer_groups', {}).keys()|join(',') }}
+        sudoers: {{ pillar.get('sudoer_groups', {}).keys()|join(',') }}
     - user: root
     - group: root
     - mode: "0640"

salt/users/init.sls

@@ -74,7 +74,7 @@ include:
     - source: salt://users/config/authorized_keys.jinja
     - template: jinja
     - context:
-      ssh_keys: {{ user_config["ssh_keys"] }}
+        ssh_keys: {{ user_config["ssh_keys"] }}
     - require:
       - user: {{ user_name }}