From a3b5b33a349d98a3e4ea7eedf8a7ee0fbac3d216 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Tue, 2 Sep 2014 17:53:08 +0200
Subject: [PATCH] Use the default NGINX directory layout

---
 CHANGELOG                                                        |  1 +
 files/gitlab-cookbooks/gitlab/recipes/nginx.rb                   | 10 ++++------
 files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb   |  3 +--
 files/gitlab-cookbooks/gitlab/templates/default/sv-nginx-run.erb |  4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 717fc5e..8e91076 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@ omnibus-gitlab repository.
 - Support `issue_closing_pattern` via gitlab.rb (Michael Hill)
 - Use SIGHUP for zero-downtime NGINX configuration changes
 - Give NGINX its own working directory
+- Use the default NGINX directory layout
 
 7.2.0
 - Pass environment variables to Unicorn and Sidekiq (Chris Portman)
diff --git a/files/gitlab-cookbooks/gitlab/recipes/nginx.rb b/files/gitlab-cookbooks/gitlab/recipes/nginx.rb
index 4fb1d97..b19b076 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/nginx.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/nginx.rb
@@ -17,14 +17,12 @@
 #
 
 nginx_dir = node['gitlab']['nginx']['dir']
-nginx_etc_dir = File.join(nginx_dir, "etc")
-nginx_working_dir = File.join(nginx_dir, "working")
+nginx_conf_dir = File.join(nginx_dir, "conf")
 nginx_log_dir = node['gitlab']['nginx']['log_directory']
 
 [
   nginx_dir,
-  nginx_etc_dir,
-  nginx_working_dir,
+  nginx_conf_dir,
   nginx_log_dir,
 ].each do |dir_name|
   directory dir_name do
@@ -34,9 +32,9 @@ nginx_log_dir = node['gitlab']['nginx']['log_directory']
   end
 end
 
-nginx_config = File.join(nginx_etc_dir, "nginx.conf")
+nginx_config = File.join(nginx_conf_dir, "nginx.conf")
 nginx_vars = node['gitlab']['nginx'].to_hash.merge({
-  :gitlab_http_config => File.join(nginx_etc_dir, "gitlab-http.conf"),
+  :gitlab_http_config => File.join(nginx_conf_dir, "gitlab-http.conf")
 })
 
 template nginx_vars[:gitlab_http_config] do
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb b/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb
index 55002f5..c5bf464 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb
@@ -4,8 +4,7 @@
 
 user <%= node['gitlab']['web-server']['username'] %> <%= node['gitlab']['web-server']['username']%>;
 worker_processes <%= @worker_processes %>;
-error_log /var/log/gitlab/nginx/error.log;
-pid /var/opt/gitlab/nginx/nginx.pid;
+error_log stderr;
 
 daemon off;
 
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/sv-nginx-run.erb b/files/gitlab-cookbooks/gitlab/templates/default/sv-nginx-run.erb
index 82b5dc1..e10581f 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/sv-nginx-run.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/sv-nginx-run.erb
@@ -1,5 +1,5 @@
 #!/bin/sh
 exec 2>&1
 <%= render("mount_point_check.erb") %>
-cd <%= File.join(node['gitlab']['nginx']['dir'], "working") %>
-exec chpst -P /opt/gitlab/embedded/sbin/nginx -c <%= File.join(node['gitlab']['nginx']['dir'], "etc", "nginx.conf") %>
+cd <%= node['gitlab']['nginx']['dir'] %>
+exec chpst -P /opt/gitlab/embedded/sbin/nginx -p <%= node['gitlab']['nginx']['dir'] %>
--
libgit2 0.21.2