Download as
Browse Code »

Commit 8e2e0b52b6feb97889efc0978c8e9dc9cef13caf

Authored by Marin Jankovski
2 parents bb662781 3c002829
Exists in 6-9-stable-ee

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

Showing 6 changed files with 30 additions and 1 deletions   Show diff stats
Makefile
  Diff comments   View file @8e2e0b5
... ... @@ -16,6 +16,8 @@ on_tag:
16 16 git describe --exact-match
17 17  
18 18 purge:
  19 + rm -rf /var/cache/omnibus/src/gitlab-rails
  20 + rm -rf /var/cache/omnibus/pkg
19 21 mkdir -p pkg
20 22 (cd pkg && find . -delete)
21 23  
... ...
README.md
  Diff comments   View file @8e2e0b5
... ... @@ -87,6 +87,21 @@ unicorn['port'] = 3456
87 87  
88 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 105 ## Updating
91 106  
92 107 Instructions for updating your Omnibus installation and upgrading from a manual installation are in the [update doc](doc/update.md).
... ...
config/software/gitlab-cookbooks.rb
  Diff comments   View file @8e2e0b5
... ... @@ -20,6 +20,8 @@ name "gitlab-cookbooks"
20 20  
21 21 dependency "rsync"
22 22  
  23 +always_build true
  24 +
23 25 source :path => File.expand_path("files/gitlab-cookbooks", Omnibus.project_root)
24 26  
25 27 build do
... ...
doc/update.md
  Diff comments   View file @8e2e0b5
... ... @@ -8,6 +8,9 @@ Please make sure you are viewing this file on the master branch.
8 8  
9 9 ## Updating from GitLab 6.6.x or higher to 6.8.x
10 10  
  11 +The procedure can also be used to upgrade from a CE omnibus package to an EE
  12 +omnibus package.
  13 +
11 14 First, download the latest [CE](https://www.gitlab.com/downloads/) or
12 15 [EE (subscribers only)](https://gitlab.com/subscribers/gitlab-ee/blob/master/doc/install/packages.md)
13 16 package to your GitLab server.
... ...
files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb
  Diff comments   View file @8e2e0b5
... ... @@ -29,6 +29,8 @@ server {
29 29 server_name <%= @fqdn %>;
30 30 server_tokens off;
31 31 return 301 https://<%= @fqdn %>:<%= @port %>$request_uri;
  32 + access_log <%= @log_directory %>/gitlab_access.log;
  33 + error_log <%= @log_directory %>/gitlab_error.log;
32 34 }
33 35 <% end %>
34 36  
... ...
files/gitlab-cookbooks/runit/recipes/default.rb
  Diff comments   View file @8e2e0b5
... ... @@ -19,7 +19,12 @@
19 19  
20 20 case node["platform_family"]
21 21 when "debian"
22   - include_recipe "runit::upstart"
  22 + case node["platform"]
  23 + when "debian"
  24 + include_recipe "runit::sysvinit"
  25 + else
  26 + include_recipe "runit::upstart"
  27 + end
23 28 when "rhel"
24 29 case node["platform"]
25 30 when "amazon", "xenserver"
... ...