Commit a200bbb5 authored by Marin Jankovski's avatar Marin Jankovski

Update templates and versions for release 6.8

parent 53e77665
......@@ -22,7 +22,7 @@
"ref": "000ffed11710e8d307ea5b18c13213e53e66e289"
},
"redisio": {
"locked_version": "1.7.0"
"locked_version": "1.7.1"
},
"ulimit": {
"locked_version": "0.3.2"
......@@ -31,43 +31,55 @@
"locked_version": "0.8.0"
},
"mysql": {
"locked_version": "4.0.6"
},
"openssl": {
"locked_version": "1.1.0"
},
"build-essential": {
"locked_version": "1.4.2"
"locked_version": "5.1.12"
},
"database": {
"locked_version": "1.5.2"
"locked_version": "2.1.6"
},
"aws": {
"locked_version": "1.0.0"
"locked_version": "2.1.1"
},
"xfs": {
"locked_version": "1.1.0"
},
"mysql-chef_gem": {
"locked_version": "0.0.2"
},
"build-essential": {
"locked_version": "2.0.0"
},
"postfix": {
"locked_version": "3.0.4"
"locked_version": "3.1.8"
},
"phantomjs": {
"locked_version": "1.0.3"
},
"chocolatey": {
"locked_version": "0.0.5"
"locked_version": "0.1.0"
},
"powershell": {
"locked_version": "1.1.2"
"locked_version": "3.0.0"
},
"windows": {
"locked_version": "1.11.0"
"locked_version": "1.30.2"
},
"chef_handler": {
"locked_version": "1.1.4"
"locked_version": "1.1.6"
},
"ms_dotnet45": {
"locked_version": "1.1.2"
},
"ms_dotnet4": {
"locked_version": "1.0.2"
},
"ms_dotnet2": {
"locked_version": "1.0.0"
},
"apt": {
"locked_version": "2.3.0"
"locked_version": "2.3.8"
},
"openssl": {
"locked_version": "1.1.0"
}
}
}
......@@ -42,11 +42,11 @@ if node['gitlab']['env'] == "development"
default['gitlab']['shell_revision'] = "master"
else
default['gitlab']['environments'] = %w{production}
default['gitlab']['revision'] = "6-7-stable" # Must be branch, otherwise GitLab update will run on each chef run
default['gitlab']['revision'] = "6-8-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.1"
default['gitlab']['shell_revision'] = "v1.9.3"
end
# GitLab configuration
......@@ -56,6 +56,7 @@ default['gitlab']['email_from'] = "gitlab@localhost"
default['gitlab']['support_email'] = "support@localhost"
default['gitlab']['signup_enabled'] = false
default['gitlab']['signin_enabled'] = true
default['gitlab']['projects_limit'] = 10
default['gitlab']['oauth_enabled'] = false
default['gitlab']['oauth_block_auto_created_users'] = true
......
# Git
default['gitlab']['git']['prefix'] = "/usr/local"
default['gitlab']['git']['version'] = "1.8.4.1"
default['gitlab']['git']['version'] = "1.8.5.2"
default['gitlab']['git']['url'] = "https://codeload.github.com/git/git/zip/v#{node['gitlab']['git']['version']}"
if platform_family?("rhel")
......@@ -9,4 +9,4 @@ else
packages = %w{unzip build-essential libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev}
end
default['gitlab']['git']['packages'] = packages
\ No newline at end of file
default['gitlab']['git']['packages'] = packages
......@@ -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.7'
version '0.6.8'
recipe "gitlab::default", "Installation"
......
......@@ -20,6 +20,7 @@ template File.join(gitlab['path'], 'config', 'gitlab.yml') do
:repos_path => gitlab['repos_path'],
:shell_path => gitlab['shell_path'],
:signup_enabled => gitlab['signup_enabled'],
:signin_enabled => gitlab['signin_enabled'],
:projects_limit => gitlab['projects_limit'],
:oauth_enabled => gitlab['oauth_enabled'],
:oauth_block_auto_created_users => gitlab['oauth_block_auto_created_users'],
......
......@@ -56,6 +56,10 @@ production: &base
## Users management
# default: false - Account passwords are not sent via the email if signup is enabled.
signup_enabled: <%= @signup_enabled %>
#
# default: true - If set to false, standard login form won't be shown on the sign-in page
# signin_enabled: false
# Restrict setting visibility levels for non-admin users.
# The default is to allow all levels.
......@@ -65,7 +69,7 @@ production: &base
# If a commit message matches this regular expression, all issues referenced from the matched text will be closed.
# This happens when the commit is pushed or merged into the default branch of a project.
# When not specified the default issue_closing_pattern as specified below will be used.
# issue_closing_pattern: '([Cc]lose[sd]|[Ff]ixe[sd]) +#\d+'
# issue_closing_pattern: '([Cc]lose[sd]|[Ff]ixe[sd]) #(\d+)'
## Default project features settings
default_projects_features:
......@@ -76,6 +80,11 @@ production: &base
snippets: <%= @default_projects_features['snippets'] %>
visibility_level: "<%= @default_projects_features['visibility_level'] %>" # can be "private" | "internal" | "public"
## Repository downloads directory
# When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory.
# The default is 'tmp/repositories' relative to the root of the Rails app.
# repository_downloads_path: tmp/repositories
## External issues trackers
issues_tracker:
# redmine:
......@@ -169,6 +178,7 @@ production: &base
# see https://github.com/gitlabhq/gitlab-public-wiki/wiki/Working-custom-omniauth-provider-configurations
# The 'app_id' and 'app_secret' parameters are always passed as the first two
# arguments, followed by optional 'args' which can be either a hash or an array.
# Documentation for this is available at http://doc.gitlab.com/ce/integration/omniauth.html
providers:
<% @oauth_providers.each do |provider| %>
- { name: '<%= provider['name'] -%>', app_id: '<%= provider['app_id'] -%>', app_secret: '<%= provider['app_secret'] -%>' <%= ", args: { #{provider['args']} } " if provider['args'] %>}
......
......@@ -59,6 +59,12 @@ server {
# if a file, which is not found in the root folder is requested,
# then the proxy pass the request to the upsteam (gitlab unicorn)
location @gitlab {
# If you use https make sure you disable gzip compression
# to be safe against BREACH attack
<% if @port == '443' %>
gzip off;
<% end %>
proxy_read_timeout 300; # Some requests take more than 30 seconds.
proxy_connect_timeout 300; # Some requests take more than 30 seconds.
proxy_redirect off;
......@@ -71,5 +77,13 @@ server {
proxy_pass http://gitlab;
}
# Enable gzip compression as per rails guide: http://guides.rubyonrails.org/asset_pipeline.html#gzip-compression
location ~ ^/(assets)/ {
root /home/git/gitlab/public;
gzip_static on; # to serve pre-gzipped version
expires max;
add_header Cache-Control public;
}
error_page 502 /502.html;
}
}
\ No newline at end of file
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