Commit b2f86eb9 authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'release/6.9' into 'master'

Release 6.9
parents c24f6e43 f7ac9763
......@@ -28,7 +28,7 @@ GRAPH
mysql-chef_gem (>= 0.0.0)
postgresql (>= 1.0.0)
xfs (>= 0.0.0)
gitlab (0.6.8)
gitlab (0.6.9)
apt (>= 0.0.0)
database (>= 0.0.0)
magic_shell (>= 0.0.0)
......
......@@ -3,9 +3,9 @@ GitLab Cookbook
Chef cookbook with recipes to install GitLab and its dependencies:
* GitLab: 6.7
* GitLab Shell: 1.9.1
* Ruby: 2.1.1
* GitLab: 6.9
* GitLab Shell: 1.9.4
* Ruby: 2.0.0-p451
* Redis: 2.6.13
* Git: 1.8.4.1
* Nginx: 1.1.19
......@@ -17,7 +17,7 @@ Chef cookbook with recipes to install GitLab and its dependencies:
Cookbook has been tested and it is known to work on:
* Ubuntu (12.04, 12.10)
* RHEL/CentOS (6.4)
* RHEL/CentOS (6.5)
## Installation
......
......@@ -15,7 +15,7 @@ end
default['gitlab']['packages'] = packages
default['gitlab']['compile_ruby'] = true
default['gitlab']['ruby'] = "2.0.0-p353" # Latest 2.0 by ruby-build 20131225.1 (Ubuntu)
default['gitlab']['ruby'] = "2.0.0-p451" # Latest 2.0 by ruby-build 20131225.1 (Ubuntu)
# User
default['gitlab']['user'] = "git" # Do not change this attribute in production unless you know what you do since some code from the GitLab repo such as init.d script assume it is git.
......@@ -54,11 +54,11 @@ if node['gitlab']['env'] == "development"
default['gitlab']['shell_revision'] = "master"
else
default['gitlab']['environments'] = %w{production}
default['gitlab']['revision'] = "6-8-stable" # Must be branch, otherwise GitLab update will run on each chef run
default['gitlab']['revision'] = "6-9-stable" # Must be branch, otherwise GitLab update will run on each chef run
default['gitlab']['url'] = "http://localhost:80/"
default['gitlab']['port'] = "80"
default['gitlab']['ssh_port'] = "22"
default['gitlab']['shell_revision'] = "v1.9.3"
default['gitlab']['shell_revision'] = "v1.9.4"
end
# GitLab configuration
......
......@@ -35,6 +35,5 @@ Provision a GitLab instance by using the cookbook in supported environments:
1. Ubuntu 12.04
1. CentOS 6.5
1. AWS OpsWorks
1. Vagrant (development)
After provisioning, login to each instance and *at least* create a repository and push to GitLab.
......@@ -4,7 +4,7 @@ maintainer_email 'marin@gitlab.com'
license 'MIT'
description 'Installs/Configures GitLab'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '0.6.8'
version '0.6.9'
recipe "gitlab::default", "Installation"
......
......@@ -15,7 +15,7 @@ describe "gitlab::clone" do
it "clones the gitlab repository" do
expect(chef_run).to sync_git('/home/git/gitlab').with(
repository: 'https://github.com/gitlabhq/gitlabhq.git',
revision: '6-8-stable',
revision: '6-9-stable',
user: 'git',
group: 'git'
)
......@@ -49,7 +49,7 @@ describe "gitlab::clone" do
it "clones the gitlab repository" do
expect(chef_run).to sync_git('/data/git/gitlab').with(
repository: 'https://github.com/gitlabhq/gitlabhq.git',
revision: '6-8-stable',
revision: '6-9-stable',
user: 'git',
group: 'git'
)
......@@ -69,7 +69,7 @@ describe "gitlab::clone" do
it "clones the gitlab repository" do
expect(chef_run).to sync_git('/home/git/gitlab').with(
repository: 'https://github.com/gitlabhq/gitlabhq.git',
revision: '6-8-stable',
revision: '6-9-stable',
user: 'git',
group: 'git'
)
......@@ -103,7 +103,7 @@ describe "gitlab::clone" do
it "clones the gitlab repository" do
expect(chef_run).to sync_git('/data/git/gitlab').with(
repository: 'https://github.com/gitlabhq/gitlabhq.git',
revision: '6-8-stable',
revision: '6-9-stable',
user: 'git',
group: 'git'
)
......
......@@ -15,7 +15,7 @@ describe "gitlab::gitlab_shell_clone" do
it "clones the gitlab-shell repository" do
expect(chef_run).to sync_git('/home/git/gitlab-shell').with(
repository: 'https://github.com/gitlabhq/gitlab-shell.git',
revision: "v1.9.3",
revision: "v1.9.4",
user: 'git',
group: 'git'
)
......@@ -64,7 +64,7 @@ describe "gitlab::gitlab_shell_clone" do
it "clones the gitlab-shell repository" do
expect(chef_run).to sync_git('/home/git/gitlab-shell').with(
repository: 'https://github.com/gitlabhq/gitlab-shell.git',
revision: "v1.9.3",
revision: "v1.9.4",
user: 'git',
group: 'git'
)
......
......@@ -28,4 +28,4 @@ web_server_pid_path="$pid_path/unicorn.pid"
# sidekiq_pid_path defines the path in which to create the pid file for sidekiq
# The default is "$pid_path/sidekiq.pid"
sidekiq_pid_path="$pid_path/sidekiq.pid"
\ No newline at end of file
sidekiq_pid_path="$pid_path/sidekiq.pid"
......@@ -19,15 +19,13 @@ production: &base
port: <%= @port %>
https: <%= @port == "443" ? true : false %>
# Uncomment and customize the last line to run in a non-root path
# WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this.
# Note that four settings need to be changed for this to work.
# 1) In your application.rb file: config.relative_url_root = "/gitlab"
# 2) In your gitlab.yml file: relative_url_root: /gitlab
# 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
# 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab"
# To update the path, run: sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
#
# Uncommment this line below if your ssh host is different from HTTP/HTTPS one
# (you'd obviously need to replace ssh.host_example.com with your own host).
# Otherwise, ssh host will be set to the `host:` value above
# ssh_host: ssh.host_example.com
# WARNING: See config/application.rb under "Relative url support" for the list of
# other files that need to be changed for relative url support
# relative_url_root: /gitlab
# Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
......@@ -102,7 +100,7 @@ production: &base
# ## :id - Issue id (from commit messages)
# issues_url: "http://redmine.sample/issues/:id"
#
# ## If not nil, linkis to creating new issues will be replaced with this
# ## If not nil, links to creating new issues will be replaced with this
# ## Use placeholders:
# ## :project_id - GitLab project identifier
# ## :issues_tracker_id - Project Name or Id in external issue tracker
......
......@@ -77,7 +77,10 @@ server {
proxy_pass http://gitlab;
}
# Enable gzip compression as per rails guide: http://guides.rubyonrails.org/asset_pipeline.html#gzip-compression
# Enable gzip compression as per rails guide: http://guides.rubyonrails.org/asset_pipeline.html#gzip-compression
# WARNING: If you are using relative urls do remove the block below
# See config/application.rb under "Relative url support" for the list of
# other files that need to be changed for relative url support
location ~ ^/(assets)/ {
root /home/git/gitlab/public;
gzip_static on; # to serve pre-gzipped version
......
......@@ -8,14 +8,8 @@
# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
# documentation.
# Uncomment and customize the last line to run in a non-root path
# WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this.
# Note that four settings need to be changed for this to work.
# 1) In your application.rb file: config.relative_url_root = "/gitlab"
# 2) In your gitlab.yml file: relative_url_root: /gitlab
# 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
# 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab"
# To update the path, run: sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
# WARNING: See config/application.rb under "Relative url support" for the list of
# other files that need to be changed for relative url support
#
# ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment