Merge branch '7-0-stable' of gitlab.com:gitlab-org/omnibus-gitlab into 7-0-stable-ee

Jacob Vosmaer
2 parents c6524743 e3d83080
Showing 2 changed files with 54 additions and 0 deletions Show diff stats
config/software/chef-gem.rb
config/software/ohai.rb
@@ -0,0 +1,28 @@
+#
+# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
+# Copyright:: Copyright (c) 2014 GitLab B.V.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name "chef-gem"
+default_version "11.12.2"
+
+dependency "ruby"
+dependency "rubygems"
+dependency "ohai"
+
+build do
+  gem "install chef -n #{install_dir}/embedded/bin --no-rdoc --no-ri -v #{version}"
+end
@@ -0,0 +1,26 @@
+#
+# Copyright:: Copyright (c) 2014 GitLab B.V.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name "ohai"
+default_version "7.0.4"
+
+dependency "ruby"
+dependency "rubygems"
+
+build do
+  gem "install ohai -n #{install_dir}/embedded/bin --no-rdoc --no-ri -v #{version}"
+end
...	...	@@ -0,0 +1,28 @@
	1	+#
	2	+# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
	3	+# Copyright:: Copyright (c) 2014 GitLab B.V.
	4	+# License:: Apache License, Version 2.0
	5	+#
	6	+# Licensed under the Apache License, Version 2.0 (the "License");
	7	+# you may not use this file except in compliance with the License.
	8	+# You may obtain a copy of the License at
	9	+#
	10	+# http://www.apache.org/licenses/LICENSE-2.0
	11	+#
	12	+# Unless required by applicable law or agreed to in writing, software
	13	+# distributed under the License is distributed on an "AS IS" BASIS,
	14	+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	15	+# See the License for the specific language governing permissions and
	16	+# limitations under the License.
	17	+#
	18	+
	19	+name "chef-gem"
	20	+default_version "11.12.2"
	21	+
	22	+dependency "ruby"
	23	+dependency "rubygems"
	24	+dependency "ohai"
	25	+
	26	+build do
	27	+ gem "install chef -n #{install_dir}/embedded/bin --no-rdoc --no-ri -v #{version}"
	28	+end
...	...
...	...	@@ -0,0 +1,26 @@
	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	+name "ohai"
	19	+default_version "7.0.4"
	20	+
	21	+dependency "ruby"
	22	+dependency "rubygems"
	23	+
	24	+build do
	25	+ gem "install ohai -n #{install_dir}/embedded/bin --no-rdoc --no-ri -v #{version}"
	26	+end
...	...