diff --git a/files/gitlab-cookbooks/gitlab/recipes/nginx.rb b/files/gitlab-cookbooks/gitlab/recipes/nginx.rb
index 3ddaf60..45a80d5 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/nginx.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/nginx.rb
@@ -1,5 +1,6 @@
 #
 # Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Copyright:: Copyright (c) 2014 GitLab.com
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +16,13 @@
 # limitations under the License.
 #
 
-nginx_dir = node['chef_server']['nginx']['dir']
+nginx_dir = node['gitlab']['nginx']['dir']
 nginx_etc_dir = File.join(nginx_dir, "etc")
 nginx_cache_dir = File.join(nginx_dir, "cache")
 nginx_cache_tmp_dir = File.join(nginx_dir, "cache-tmp")
 nginx_html_dir = File.join(nginx_dir, "html")
 nginx_ca_dir = File.join(nginx_dir, "ca")
-nginx_log_dir = node['chef_server']['nginx']['log_directory']
+nginx_log_dir = node['gitlab']['nginx']['log_directory']
 
 [
   nginx_dir,
@@ -33,22 +34,22 @@ nginx_log_dir = node['chef_server']['nginx']['log_directory']
   nginx_log_dir,
 ].each do |dir_name|
   directory dir_name do
-    owner node['chef_server']['user']['username']
+    owner node['gitlab']['user']['username']
     mode '0700'
     recursive true
   end
 end
 
-ssl_keyfile = File.join(nginx_ca_dir, "#{node['chef_server']['nginx']['server_name']}.key")
-ssl_crtfile = File.join(nginx_ca_dir, "#{node['chef_server']['nginx']['server_name']}.crt")
-ssl_signing_conf = File.join(nginx_ca_dir, "#{node['chef_server']['nginx']['server_name']}-ssl.conf")
+ssl_keyfile = File.join(nginx_ca_dir, "#{node['gitlab']['nginx']['server_name']}.key")
+ssl_crtfile = File.join(nginx_ca_dir, "#{node['gitlab']['nginx']['server_name']}.crt")
+ssl_signing_conf = File.join(nginx_ca_dir, "#{node['gitlab']['nginx']['server_name']}-ssl.conf")
 
 unless File.exists?(ssl_keyfile) && File.exists?(ssl_crtfile) && File.exists?(ssl_signing_conf)
   file ssl_keyfile do
     owner "root"
     group "root"
     mode "0644"
-    content `/opt/chef-server/embedded/bin/openssl genrsa 2048`
+    content `/opt/gitlab/embedded/bin/openssl genrsa 2048`
     not_if { File.exists?(ssl_keyfile) }
   end
 
@@ -63,13 +64,13 @@ unless File.exists?(ssl_keyfile) && File.exists?(ssl_crtfile) && File.exists?(ss
   prompt = no
 
   [ req_distinguished_name ]
-  C                      = #{node['chef_server']['nginx']['ssl_country_name']}
-  ST                     = #{node['chef_server']['nginx']['ssl_state_name']}
-  L                      = #{node['chef_server']['nginx']['ssl_locality_name']}
-  O                      = #{node['chef_server']['nginx']['ssl_company_name']}
-  OU                     = #{node['chef_server']['nginx']['ssl_organizational_unit_name']}
-  CN                     = #{node['chef_server']['nginx']['server_name']}
-  emailAddress           = #{node['chef_server']['nginx']['ssl_email_address']}
+  C                      = #{node['gitlab']['nginx']['ssl_country_name']}
+  ST                     = #{node['gitlab']['nginx']['ssl_state_name']}
+  L                      = #{node['gitlab']['nginx']['ssl_locality_name']}
+  O                      = #{node['gitlab']['nginx']['ssl_company_name']}
+  OU                     = #{node['gitlab']['nginx']['ssl_organizational_unit_name']}
+  CN                     = #{node['gitlab']['nginx']['server_name']}
+  emailAddress           = #{node['gitlab']['nginx']['ssl_email_address']}
   EOH
   end
 
@@ -79,15 +80,15 @@ unless File.exists?(ssl_keyfile) && File.exists?(ssl_crtfile) && File.exists?(ss
       r.owner "root"
       r.group "root"
       r.mode "0644"
-      r.content `/opt/chef-server/embedded/bin/openssl req -config '#{ssl_signing_conf}' -new -x509 -nodes -sha1 -days 3650 -key #{ssl_keyfile}`
+      r.content `/opt/gitlab/embedded/bin/openssl req -config '#{ssl_signing_conf}' -new -x509 -nodes -sha1 -days 3650 -key #{ssl_keyfile}`
       r.not_if { File.exists?(ssl_crtfile) }
       r.run_action(:create)
     end
   end
 end
 
-node.default['chef_server']['nginx']['ssl_certificate'] ||= ssl_crtfile
-node.default['chef_server']['nginx']['ssl_certificate_key'] ||= ssl_keyfile
+node.default['gitlab']['nginx']['ssl_certificate'] ||= ssl_crtfile
+node.default['gitlab']['nginx']['ssl_certificate_key'] ||= ssl_keyfile
 
 remote_directory nginx_html_dir do
   source "html"
@@ -95,12 +96,12 @@ remote_directory nginx_html_dir do
   files_owner "root"
   files_group "root"
   files_mode "0644"
-  owner node['chef_server']['user']['username']
+  owner node['gitlab']['user']['username']
   mode "0700"
 end
 
 nginx_config = File.join(nginx_etc_dir, "nginx.conf")
-nginx_vars = node['chef_server']['nginx'].to_hash.merge({
+nginx_vars = node['gitlab']['nginx'].to_hash.merge({
   :chef_https_config => File.join(nginx_etc_dir, "chef_https_lb.conf"),
   :chef_http_config => File.join(nginx_etc_dir, "chef_http_lb.conf")
 })
@@ -140,14 +141,14 @@ template nginx_config do
 end
 
 runit_service "nginx" do
-  down node['chef_server']['nginx']['ha']
+  down node['gitlab']['nginx']['ha']
   options({
     :log_directory => nginx_log_dir
   }.merge(params))
 end
 
-if node['chef_server']['bootstrap']['enable']
-	execute "/opt/chef-server/bin/chef-server-ctl start nginx" do
+if node['gitlab']['bootstrap']['enable']
+	execute "/opt/gitlab/bin/gitlab-ctl start nginx" do
 		retries 20
 	end
 end
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb b/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb
index 45df275..34df81a 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb
@@ -1,6 +1,6 @@
-user <%= node['chef_server']['user']['username'] %> <%= node['chef_server']['user']['username']%>;
+user <%= node['gitlab']['user']['username'] %> <%= node['gitlab']['user']['username']%>;
 worker_processes <%= @worker_processes %>;
-error_log /var/log/chef-server/nginx/error.log<%= node['chef_server']['lb']['debug'] ? " debug" : "" %>;
+error_log /var/log/gitlab/nginx/error.log<%= node['gitlab']['lb']['debug'] ? " debug" : "" %>;
 
 daemon off;
 
@@ -25,18 +25,18 @@ http {
   gzip_proxied <%= @gzip_proxied %>;
   gzip_types <%= @gzip_types.join(' ') %>;
 
-  include /opt/chef-server/embedded/conf/mime.types;
+  include /opt/gitlab/embedded/conf/mime.types;
 
-  <%- node['chef_server']['lb']['upstream'].each do |uname, servers| -%>
+  <%- node['gitlab']['lb']['upstream'].each do |uname, servers| -%>
   upstream <%= uname.gsub(/-/, '_') %> {
     <%- servers.each do |server| -%>
-    server <%= server %>:<%= node['chef_server'][uname]['port'] %>;
+    server <%= server %>:<%= node['gitlab'][uname]['port'] %>;
     <%- end -%>
   }
   <%- end -%>
 
   # external lb config for Chef API
-  <%- if node['chef_server']['lb']['enable'] -%>
+  <%- if node['gitlab']['lb']['enable'] -%>
   proxy_cache_path  <%= File.join(@dir, "cache") %> levels=1:2 keys_zone=webui-cache:50m max_size=<%= @cache_max_size %> inactive=600m;
   proxy_temp_path <%= File.join(@dir, "cache-tmp") %>;
 
@@ -51,7 +51,7 @@ http {
 
   server {
     listen <%= @non_ssl_port %>;
-    access_log /var/log/chef-server/nginx/rewrite-port-<%= @non_ssl_port %>.log;
+    access_log /var/log/gitlab/nginx/rewrite-port-<%= @non_ssl_port %>.log;
     return 301 https://$host:<%= @ssl_port %>$request_uri;
   }
   <%- end -%>
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 f6c958d..e3af575 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/sv-nginx-run.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/sv-nginx-run.erb
@@ -1,4 +1,4 @@
 #!/bin/sh
 exec 2>&1
-exec chpst -P /opt/chef-server/embedded/sbin/nginx -c <%= File.join(node['chef_server']['nginx']['dir'], "etc", "nginx.conf") %>
+exec chpst -P /opt/gitlab/embedded/sbin/nginx -c <%= File.join(node['gitlab']['nginx']['dir'], "etc", "nginx.conf") %>
 
--
libgit2 0.21.2