 --- etc/gitlab.rb.template.bak	2015-09-22 20:55:42.088202003 +0000
 +++ etc/gitlab.rb.template	2015-09-22 20:55:50.888202003 +0000
 @@ -8,7 +8,7 @@
- ## Url on which GitLab will be reachable.
+ ## URL on which GitLab will be reachable.
  ## For more details on configuring external_url see:
- ## https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/configuration.md#configuring-the-external-url-for-gitlab
+ ## https://docs.gitlab.com/omnibus/settings/configuration.html#configuring-the-external-url-for-gitlab
 -external_url 'GENERATED_EXTERNAL_URL'
-+# external_url 'GENERATED_EXTERNAL_URL' # default: http://hostname
- 
- 
++# external_url 'GENERATED_EXTERNAL_URL'
+
+
  ## Note: configuration settings below are optional.
 --- embedded/cookbooks/gitlab.bak/recipes/remove_accounts.rb	2015-09-22 20:50:46.964202003 +0000
 +++ embedded/cookbooks/gitlab/recipes/remove_accounts.rb	2015-09-22 20:51:49.256202003 +0000
 @@ -16,8 +16,8 @@
  #
- 
+
  Gitlab[:node] = node
 -if File.exists?("/etc/gitlab/gitlab.rb")
 -  Gitlab.from_file("/etc/gitlab/gitlab.rb")

+	Gitlab.from_file("/assets/gitlab.rb")
 end
 config = Gitlab.generate_config(node['fqdn'])
 
--- embedded/cookbooks/gitlab.bak/recipes/config.rb	2016-11-09 19:44:10.325508266 -0800
+++ embedded/cookbooks/gitlab/recipes/config.rb	2016-11-09 19:38:33.785396908 -0800
@@ -17,8 +17,8 @@
 
 Gitlab[:node] = node
 
-if File.exists?('/etc/gitlab/gitlab.rb')
-  Gitlab.from_file('/etc/gitlab/gitlab.rb')
+if File.exists?("/assets/gitlab.rb")
+  Gitlab.from_file("/assets/gitlab.rb")
 end
 
 node.consume_attributes(Gitlab.generate_config(node['fqdn']))

+  Gitlab.from_file("/assets/gitlab.rb")
 end
 node.consume_attributes(Gitlab.generate_config(node['fqdn']))

--- embedded/cookbooks/gitlab.bak/recipes/show_config.rb	2015-09-22 20:50:46.964202003 +0000
+++ embedded/cookbooks/gitlab/recipes/show_config.rb	2015-09-22 20:52:02.716202003 +0000
@@ -16,9 +16,9 @@
 # limitations under the License.
 #

-if File.exists?("/etc/gitlab/gitlab.rb")
+if File.exists?("/assets/gitlab.rb")
 	Gitlab[:node] = node
