Merge branch '6-9-stable-ee' of gitlab.com:gitlab-org/omnibus-gitlab into 6-9-stable-ee

Marin Jankovski
2 parents bb662781 3c002829
Showing 6 changed files with 30 additions and 1 deletions Show diff stats
Makefile
README.md
config/software/gitlab-cookbooks.rb
doc/update.md
files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb
files/gitlab-cookbooks/runit/recipes/default.rb
@@ -16,6 +16,8 @@ on_tag:
 	git describe --exact-match
 purge:
+	rm -rf /var/cache/omnibus/src/gitlab-rails
+	rm -rf /var/cache/omnibus/pkg
 	mkdir -p pkg
 	(cd pkg && find . -delete)
@@ -87,6 +87,21 @@ unicorn[&#39;port&#39;] = 3456
 For Nginx port changes please see the section on enabling HTTPS below.
+### Uninstalling omnibus-gitlab
+
+To uninstall omnibus-gitlab, preserving your data (repositories, database, configuration), run the following commands.
+
+```
+# Stop gitlab and remove its supervision process
+sudo gitlab-ctl uninstall
+
+# Debian/Ubuntu
+sudo dpkg -r gitlab
+
+# Redhat/Centos
+sudo rpm -e gitlab
+```
+
 ## Updating
 Instructions for updating your Omnibus installation and upgrading from a manual installation are in the [update doc](doc/update.md).
@@ -20,6 +20,8 @@ name &quot;gitlab-cookbooks&quot;
 dependency "rsync"
+always_build true
+
 source :path => File.expand_path("files/gitlab-cookbooks", Omnibus.project_root)
 build do
@@ -8,6 +8,9 @@ Please make sure you are viewing this file on the master branch.
 ## Updating from GitLab 6.6.x or higher to 6.8.x
+The procedure can also be used to upgrade from a CE omnibus package to an EE
+omnibus package.
+
 First, download the latest [CE](https://www.gitlab.com/downloads/) or
 [EE (subscribers only)](https://gitlab.com/subscribers/gitlab-ee/blob/master/doc/install/packages.md)
 package to your GitLab server.
@@ -29,6 +29,8 @@ server {
   server_name <%= @fqdn %>;
   server_tokens off;
   return 301 https://<%= @fqdn %>:<%= @port %>$request_uri;
+  access_log  <%= @log_directory %>/gitlab_access.log;
+  error_log   <%= @log_directory %>/gitlab_error.log;
 }
 <% end %>
@@ -19,7 +19,12 @@
 case node["platform_family"]
 when "debian"
-  include_recipe "runit::upstart"
+  case node["platform"]
+  when "debian"
+    include_recipe "runit::sysvinit"
+  else
+    include_recipe "runit::upstart"
+  end
 when "rhel"
   case node["platform"]
   when "amazon", "xenserver"
	@@ -16,6 +16,8 @@ on_tag:		@@ -16,6 +16,8 @@ on_tag:
16	git describe --exact-match	16	git describe --exact-match
17		17
18	purge:	18	purge:
		19	+ rm -rf /var/cache/omnibus/src/gitlab-rails
		20	+ rm -rf /var/cache/omnibus/pkg
19	mkdir -p pkg	21	mkdir -p pkg
20	(cd pkg && find . -delete)	22	(cd pkg && find . -delete)
21		23
	@@ -87,6 +87,21 @@ unicorn['port'] = 3456		@@ -87,6 +87,21 @@ unicorn['port'] = 3456
87		87
88	For Nginx port changes please see the section on enabling HTTPS below.	88	For Nginx port changes please see the section on enabling HTTPS below.
89		89
		90	+### Uninstalling omnibus-gitlab
		91	+
		92	+To uninstall omnibus-gitlab, preserving your data (repositories, database, configuration), run the following commands.
		93	+
		94	+```
		95	+# Stop gitlab and remove its supervision process
		96	+sudo gitlab-ctl uninstall
		97	+
		98	+# Debian/Ubuntu
		99	+sudo dpkg -r gitlab
		100	+
		101	+# Redhat/Centos
		102	+sudo rpm -e gitlab
		103	+```
		104	+
90	## Updating	105	## Updating
91		106
92	Instructions for updating your Omnibus installation and upgrading from a manual installation are in the [update doc](doc/update.md).	107	Instructions for updating your Omnibus installation and upgrading from a manual installation are in the [update doc](doc/update.md).
	@@ -20,6 +20,8 @@ name "gitlab-cookbooks"		@@ -20,6 +20,8 @@ name "gitlab-cookbooks"
20		20
21	dependency "rsync"	21	dependency "rsync"
22		22
		23	+always_build true
		24	+
23	source :path => File.expand_path("files/gitlab-cookbooks", Omnibus.project_root)	25	source :path => File.expand_path("files/gitlab-cookbooks", Omnibus.project_root)
24		26
25	build do	27	build do