Merge pull request #249 from noelmcloughlin/arch

feat(linux): archlinux support (no osfinger grain)
This commit is contained in:
Niels Abspoel 2019-08-04 21:23:29 +02:00 committed by GitHub
commit 82edc41695
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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