Commit 20feee82 authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'master' into 6-8-release

parents 1c848e28 53751de8
......@@ -8,7 +8,7 @@ version '0.6.8'
recipe "gitlab::default", "Installation"
%w{ redisio ruby_build postgresql mysql database postfix yum phantomjs magic_shell apt monit }.each do |dep|
%w{ redisio ruby_build postgresql mysql database postfix yum-epel phantomjs magic_shell apt monit }.each do |dep|
depends dep
end
......
......@@ -30,6 +30,9 @@ end
gitlab['environments'].each do |environment|
postgresql_database "gitlabhq_database" do
database_name "gitlabhq_#{environment}"
template "template0"
encoding "utf8"
collation "en_US.UTF-8"
connection postgresql_connection
action :create
end
......
......@@ -12,7 +12,7 @@ end
# 1. Packages / Dependencies
include_recipe "apt" if platform?("ubuntu", "debian")
include_recipe "yum::epel" if platform_family?("rhel")
include_recipe "yum-epel" if platform_family?("rhel")
include_recipe "gitlab::git"
include_recipe "redisio::install"
include_recipe "redisio::enable"
......
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