|
|
@@ -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 %} |