Commit a621a76a7494ca7d26564aa924a87395b30f0ec4
1 parent
581ebed7
Exists in
master
and in
4 other branches
Include remote_syslog gem for EE
Showing
2 changed files
with
31 additions
and
0 deletions
Show diff stats
config/projects/gitlab.rb
| @@ -20,6 +20,7 @@ name "gitlab" | @@ -20,6 +20,7 @@ name "gitlab" | ||
| 20 | maintainer "GitLab.com" | 20 | maintainer "GitLab.com" |
| 21 | homepage "http://www.gitlab.com/" | 21 | homepage "http://www.gitlab.com/" |
| 22 | 22 | ||
| 23 | + | ||
| 23 | replaces "gitlab" | 24 | replaces "gitlab" |
| 24 | install_path "/opt/gitlab" | 25 | install_path "/opt/gitlab" |
| 25 | build_version Omnibus::BuildVersion.new.semver | 26 | build_version Omnibus::BuildVersion.new.semver |
| @@ -35,6 +36,9 @@ dependency "git" | @@ -35,6 +36,9 @@ dependency "git" | ||
| 35 | dependency "redis" | 36 | dependency "redis" |
| 36 | dependency "nginx" | 37 | dependency "nginx" |
| 37 | dependency "chef-gem" | 38 | dependency "chef-gem" |
| 39 | +if system("#{Omnibus.project_root}/support/is_gitlab_ee.sh") || system("#{Omnibus.project_root}/support/is_gitlab_com.sh") | ||
| 40 | + dependency "remote_syslog" | ||
| 41 | +end | ||
| 38 | dependency "runit" | 42 | dependency "runit" |
| 39 | dependency "gitlab-rails" | 43 | dependency "gitlab-rails" |
| 40 | dependency "gitlab-shell" | 44 | dependency "gitlab-shell" |
| @@ -0,0 +1,27 @@ | @@ -0,0 +1,27 @@ | ||
| 1 | +# | ||
| 2 | +## Copyright:: Copyright (c) 2014 GitLab B.V. | ||
| 3 | +## License:: Apache License, Version 2.0 | ||
| 4 | +## | ||
| 5 | +## Licensed under the Apache License, Version 2.0 (the "License"); | ||
| 6 | +## you may not use this file except in compliance with the License. | ||
| 7 | +## You may obtain a copy of the License at | ||
| 8 | +## | ||
| 9 | +## http://www.apache.org/licenses/LICENSE-2.0 | ||
| 10 | +## | ||
| 11 | +## Unless required by applicable law or agreed to in writing, software | ||
| 12 | +## distributed under the License is distributed on an "AS IS" BASIS, | ||
| 13 | +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| 14 | +## See the License for the specific language governing permissions and | ||
| 15 | +## limitations under the License. | ||
| 16 | +## | ||
| 17 | +# | ||
| 18 | + | ||
| 19 | +name "remote_syslog" | ||
| 20 | +default_version "1.6.14" | ||
| 21 | + | ||
| 22 | +dependency "ruby" | ||
| 23 | +dependency "rubygems" | ||
| 24 | + | ||
| 25 | +build do | ||
| 26 | + gem "install remote_syslog -n #{install_dir}/embedded/bin --no-rdoc --no-ri -v #{version}" | ||
| 27 | +end |