Merge pull request #223 from firmhouse/COOK-4685

[COOK-4685] Set pid to /run/nginx.pid on Ubuntu 14.04
sous-chefs · Mar 14, 2015 · d2b954e · d2b954e
2 parents ba610d1 + ea9401b
commit d2b954e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -33,10 +33,15 @@
 default['nginx']['default_root'] = '/var/www/nginx-default'
 default['nginx']['ulimit']       = '1024'
 
+default['nginx']['pid'] = '/var/run/nginx.pid'
+
 case node['platform_family']
 when 'debian'
   default['nginx']['user']       = 'www-data'
   default['nginx']['init_style'] = 'runit'
+  if platform == 'ubuntu' && platform_version == '14.04'
+    default['nginx']['pid'] = '/run/nginx.pid'
+  end
 when 'rhel', 'fedora'
   default['nginx']['user']        = 'nginx'
   default['nginx']['init_style']  = 'init'
@@ -66,8 +71,6 @@
 
 default['nginx']['group'] = default['nginx']['group'] || node['nginx']['user']
 
-default['nginx']['pid'] = '/var/run/nginx.pid'
-
 default['nginx']['gzip']              = 'on'
 default['nginx']['gzip_static']       = 'off'
 default['nginx']['gzip_http_version'] = '1.0'