Skip to content

Commit

Permalink
fix(map.jinja): fix salt-lint errors
Browse files Browse the repository at this point in the history
```bash
Examining nginx/map.jinja of type state
[202] Jinja statement should have spaces before and after: {% statement %}
nginx/map.jinja:175
})%}

[202] Jinja statement should have spaces before and after: {% statement %}
nginx/map.jinja:181
})%}

[202] Jinja statement should have spaces before and after: {% statement %}
nginx/map.jinja:188
})%}

[202] Jinja statement should have spaces before and after: {% statement %}
nginx/map.jinja:192
    })%}

[202] Jinja statement should have spaces before and after: {% statement %}
nginx/map.jinja:195
    })%}
```
  • Loading branch information
myii committed Oct 9, 2019
1 parent bedc1b6 commit 0772d8a
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions nginx/map.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -172,26 +172,26 @@
{% if 'user' not in nginx.server.config %}
{% do nginx.server.config.update({
'user': nginx.lookup.webuser,
})%}
}) %}
{% endif %}

{% if 'pid' not in nginx.server.config and 'pid_file' in nginx.lookup %}
{% do nginx.server.config.update({
'pid': nginx.lookup.pid_file,
})%}
}) %}
{% endif %}

{% if salt['grains.get']('os_family') == 'RedHat' %}
{% do nginx.passenger.update({
'passenger_root': '/usr/share/ruby/vendor_ruby/phusion_passenger/locations.ini',
'passenger_instance_registry_dir': '/var/run/passenger-instreg',
})%}
}) %}
{% if 'osfinger' in grains and salt['grains.get']('osfinger') == 'CentOS-6' %}
{% do nginx.server.config.update({
'pid': '/var/run/nginx.pid',
})%}
}) %}
{% do nginx.passenger.update({
'passenger_root': '/usr/lib/ruby/1.8/phusion_passenger/locations.ini',
})%}
}) %}
{% endif %}
{% endif %}

0 comments on commit 0772d8a

Please sign in to comment.