summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2012-04-29 13:23:58 +0000
committerBenedikt Boehm <hollow@gentoo.org>2012-04-29 13:23:58 +0000
commit486581478cef4302598275d859a558bff8e46c2d (patch)
tree94943ef185e2882251370d457c06ba088e0ec52d /app-admin
parentversion bump to resolve dependency conflicts (see #410385) (diff)
downloadgentoo-2-486581478cef4302598275d859a558bff8e46c2d.tar.gz
gentoo-2-486581478cef4302598275d859a558bff8e46c2d.tar.bz2
gentoo-2-486581478cef4302598275d859a558bff8e46c2d.zip
version bump to resolve dependency conflicts (see #410385)
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/chef-server-api/ChangeLog8
-rw-r--r--app-admin/chef-server-api/chef-server-api-0.10.10_beta1.ebuild69
-rw-r--r--app-admin/chef-server-api/files/confd/chef-server-api2
3 files changed, 77 insertions, 2 deletions
diff --git a/app-admin/chef-server-api/ChangeLog b/app-admin/chef-server-api/ChangeLog
index a2556c872859..b4cff7ae88d4 100644
--- a/app-admin/chef-server-api/ChangeLog
+++ b/app-admin/chef-server-api/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-admin/chef-server-api
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/ChangeLog,v 1.10 2012/01/29 12:22:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/ChangeLog,v 1.11 2012/04/29 13:23:57 hollow Exp $
+
+*chef-server-api-0.10.10_beta1 (29 Apr 2012)
+
+ 29 Apr 2012; Benedikt Böhm <hollow@gentoo.org>
+ +chef-server-api-0.10.10_beta1.ebuild, files/confd/chef-server-api:
+ version bump to resolve dependency conflicts (see #410385)
*chef-server-api-0.10.8 (29 Jan 2012)
diff --git a/app-admin/chef-server-api/chef-server-api-0.10.10_beta1.ebuild b/app-admin/chef-server-api/chef-server-api-0.10.10_beta1.ebuild
new file mode 100644
index 000000000000..b6bca3392419
--- /dev/null
+++ b/app-admin/chef-server-api/chef-server-api-0.10.10_beta1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/chef-server-api-0.10.10_beta1.ebuild,v 1.1 2012/04/29 13:23:57 hollow Exp $
+
+EAPI="4"
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_VERSION=${PV/_beta/.beta.}
+
+inherit ruby-fakegem
+
+DESCRIPTION="Configuration management tool"
+HOMEPAGE="http://wiki.opscode.com/display/chef"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-db/couchdb-0.10.0
+ >=net-misc/rabbitmq-server-1.7.0"
+
+ruby_add_rdepend "~app-admin/chef-${PV}
+ >=dev-ruby/dep_selector-0.0.3
+ >=dev-ruby/merb-assets-1.1.0
+ <dev-ruby/merb-assets-1.2
+ >=dev-ruby/merb-core-1.1.0
+ <dev-ruby/merb-core-1.2
+ >=dev-ruby/merb-helpers-1.1.0
+ <dev-ruby/merb-helpers-1.2
+ >=dev-ruby/merb-param-protection-1.1.0
+ <dev-ruby/merb-param-protection-1.2
+ >=dev-ruby/mixlib-authentication-1.1.3
+ >=dev-ruby/uuidtools-2.1.1
+ <dev-ruby/uuidtools-2.2
+ www-servers/thin"
+
+each_ruby_install() {
+ each_fakegem_install
+ ruby_fakegem_doins -r app
+ ruby_fakegem_doins -r config
+ ruby_fakegem_doins -r public
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ doinitd "${FILESDIR}/initd/chef-server-api"
+ doconfd "${FILESDIR}/confd/chef-server-api"
+
+ keepdir /etc/chef /var/lib/chef /var/log/chef /var/run/chef \
+ /etc/chef/certificates
+
+ insinto /etc/chef
+ doins "${FILESDIR}/server.rb"
+
+ fperms 0700 /etc/chef/certificates
+ fowners chef:chef /etc/chef/{,server.rb,certificates}
+ fowners chef:chef /var/{lib,log,run}/chef
+}
+
+pkg_postinst() {
+ elog
+ elog "You should edit /etc/chef/server.rb before starting the service with"
+ elog "/etc/init.d/chef-server-api start"
+ elog
+}
diff --git a/app-admin/chef-server-api/files/confd/chef-server-api b/app-admin/chef-server-api/files/confd/chef-server-api
index ffdc122c24f0..c5639e50560b 100644
--- a/app-admin/chef-server-api/files/confd/chef-server-api
+++ b/app-admin/chef-server-api/files/confd/chef-server-api
@@ -14,7 +14,7 @@
#CHEF_SERVER_LOGFILE="/var/log/chef/server.log"
# Any radom options you want to pass to chef-server.
-#CHEF_SERVER_OPTS=""
+CHEF_SERVER_OPTS="-e production"
# Path to the chef server binary.
#CHEF_SERVER_BINARY="/usr/bin/chef-server"