summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2012-12-20 10:01:33 +0000
committerBenedikt Boehm <hollow@gentoo.org>2012-12-20 10:01:33 +0000
commit98819476fbe33e89faad45f48f6082b754c1d500 (patch)
tree216ff29fe32aa16347b16c86de8034575d15beed /app-admin/chef-server-api
parentStable for amd64, wrt bug #447338 (diff)
downloadhistorical-98819476fbe33e89faad45f48f6082b754c1d500.tar.gz
historical-98819476fbe33e89faad45f48f6082b754c1d500.tar.bz2
historical-98819476fbe33e89faad45f48f6082b754c1d500.zip
improve init script
Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Diffstat (limited to 'app-admin/chef-server-api')
-rw-r--r--app-admin/chef-server-api/ChangeLog5
-rw-r--r--app-admin/chef-server-api/Manifest4
-rw-r--r--app-admin/chef-server-api/files/initd/chef-server-api11
3 files changed, 9 insertions, 11 deletions
diff --git a/app-admin/chef-server-api/ChangeLog b/app-admin/chef-server-api/ChangeLog
index 95e95b5ab9f9..e9c644dccfec 100644
--- a/app-admin/chef-server-api/ChangeLog
+++ b/app-admin/chef-server-api/ChangeLog
@@ -1,6 +1,9 @@
# 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.14 2012/12/17 13:13:00 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/ChangeLog,v 1.15 2012/12/20 10:00:31 hollow Exp $
+
+ 20 Dec 2012; Benedikt Böhm <hollow@gentoo.org> files/initd/chef-server-api:
+ improve init script
*chef-server-api-10.16.2 (17 Dec 2012)
diff --git a/app-admin/chef-server-api/Manifest b/app-admin/chef-server-api/Manifest
index 0c41b999de96..ee57ec64857e 100644
--- a/app-admin/chef-server-api/Manifest
+++ b/app-admin/chef-server-api/Manifest
@@ -1,9 +1,9 @@
AUX confd/chef-server-api 598 SHA256 59049720372f336633f5ae984ec575b6494f86998748c1d19a708f178f302af4 SHA512 caf56f1749bf7f53e519c9c13fdf9987718996e879eef57b9551ff49cea486df9afb4e461aaa3a5de99cf0bf09e0e12998475b9ef96986f78e183bbee805d82e WHIRLPOOL 7720956a795e64799f92bdef3cb2fd851f367d34ef4ef60fe6308ac874e2e57bc90ebb0d610240937d13f939d65bcc648356f7562e66fc6d40075037e215b4fc
-AUX initd/chef-server-api 1143 SHA256 7947ede94b61042366c798f7c3c2d049c8ebc1f7ce9002994ce0ced9de5def2c SHA512 af6a3c916f1d9e96375c3f0a1cc5e4c89748547704eec349d302f84035f660090ce84e995fc23005056bc1b90c17f7588c41f2658ffc4aa38db110bb9acf9b6b WHIRLPOOL 2d37119c2f0c2501f1c2b1c882506094684fe72231dd8c61d15f79cf1f7d0dba21459d3ea2abbddb85e68cf86d9c050d46d6ccbddcd90dafe4b56428c0820720
+AUX initd/chef-server-api 1065 SHA256 cc618a8005fff559f276b407efaaa7afdbaeee8b28b53d9d4c1438e2e79afe84 SHA512 6bbb738f13a9e53a377d10bd511b571da0fe31eec3f343d9523463365b751f69fcea379ca1a6009af21b0cda9f4615ed42ac01bfa9c08b1e408d371834592643 WHIRLPOOL 2cd37dbd7d2dbe05af9993602698044a40c1fa77b138e92440f9d79e8ab89d8c867ef7c122d2f02c90c10ea9025dd667ec78703eff2fae2b333b7dd175ca7536
AUX server.rb 5136 SHA256 732b67b08d067cfa63ed102a35ab4769f517e49024c2f4830843bf5a3a515159 SHA512 19a0927f303cadd6ea552ad3d38e934d0e55332bb964010968cfd1e41e367c731d16f0e6f753d721e18ac4900b000711dad69434743abb63abd19ef5db419dc0 WHIRLPOOL 52eaab6c68ac3ad79e60bf57bdcb3a516c370385c524a8b0fa3ad9e2b76a7c2bbc35f3b5b1a4e975545a8500c1b3e9feedf9d8b4c33525d39109c79604e542bf
DIST chef-server-api-10.12.0.gem 52736 SHA256 00f54eb9220cbb56b47a4f0ffa814ae149a2c9e4c3022c1c5da048f719c0b389 SHA512 99fd4eb230232420c65eccdf6ffa35660185e0ad6032cc7d8113a1845ec164c3aa451b5de8ce4d7bd78d4018f7a042cee2575c8a1a79d446e165d182eab94fbc WHIRLPOOL ccb99fd99a402630187d6152a469b3d72917225406e217f5930c4a1168cf6d6c419847d466fd1b9a8a3751a1265fb7391a852c5209d51ae9414483ebc0fa8f30
DIST chef-server-api-10.16.2.gem 52736 SHA256 56a116887b7c5787eab61d0f8109bae18ddcc786b53f80300889572d0c502cff SHA512 2f1cfa45cf43fa588cb01f3d5d50a04602644e792a4117d8c66b31f55b33aa7ca01eccaff4d2d430a9af5b127ee46be6c43c3d8dde52fe9471009b13609fa29a WHIRLPOOL f370368657c8148db5cf9b1ee1ca510dbcd9ace7dc30b2195365499f9f0fe1223395784208b53c7e478a0267da4630d8b22b3743a6a7c8b8d91eb25c251cb5d0
EBUILD chef-server-api-10.12.0.ebuild 1781 SHA256 cca0f0b27576b28008000de852b790cf6560642b35fe34b5a402915235dc196e SHA512 54c7e0d8a07c93e09748b4f9ebf9269b26c5f25d7da246655334486167d2c1343e40057a6fa63a5781e4c457f6bcd6b39695ceba4d394131d53bf7b67342ba80 WHIRLPOOL a21dade96e0d96dbccec6b0f87b6f8c73417eb52b3af846981d3d13ad5d0fb743036f9ff2ea3cc9338772e0c956f10d64b75864891bef3dbd7e5a93b2609f49d
EBUILD chef-server-api-10.16.2.ebuild 1781 SHA256 d8257281bad9ab88e52e8c72a0e82f218f63abc0788ee15dfb42847d2f39b5e7 SHA512 3773c157b64f1c30c72d1168304d7eea2c7532ef6c5915aaad496a436e7b7e4060ffd88a6e8c5abefb11f14f9e886b921dff61848af115a36363159a0f67e364 WHIRLPOOL 0fbf98c17c84a07d0ace268898cbbfe25bd052c354c4b0130305bd1dc47a3c4ed0e8fdbad2b0804ed7e95a572bb0f2fbe9708584c5db1c4f0ed2ca0fadef3810
-MISC ChangeLog 2861 SHA256 135e50f03d1dd1e66ea945cb8a53c84344961e49c731f1effe32e7b8649ded7e SHA512 2c1e55b1a3e18c5a5b206f2fbd37935c01bf81ac378f94ff206181c6a550aa042296f5f66ba8d8e4f80d4617c71e728497ef9b09a4f8e32b10bb34c1dc6c4ca2 WHIRLPOOL 4ea0b7da8f279512075143d426d31f055044db9e078c3f53f8d38e303f0d26e1f66924f18a1be5b00f28c35e68cf6654a834fc14535c25cc5c39cc954b5a22b3
+MISC ChangeLog 2963 SHA256 d25b1d7de1186e199f9c4fae24414bf3646a7b99aee712714cabd2f99b603399 SHA512 b0d4f6e518e0679ef9301080275e99d57ebf99ed9761d5717f248186ef1219339af95538dcb65f76f2bc6f42ba5bfa9b8add0afbef336b49cb32fe6c621cfc50 WHIRLPOOL 864a5c586315c372e157d02bfccb8ac3b5b0263f70e02e051e1b2d0f6659ed1ebfc315e6ce3cb92a6e41acd70ff8d60caa9fbb2b48687a11bcc2d8d9c6882a4f
MISC metadata.xml 234 SHA256 9f3ea84c59dfbd2d2dd7f1e6f0b959540e27cc9caad4f77e6e76774ce98505a6 SHA512 15e1df0d58c775f2bfe4118944fec382ecfde7634864f65e06098d6ec66a5554d36932f6b3771dca38798e7b5b01d60a1c281ef1137379e189ed42fb40b670d7 WHIRLPOOL 90bf4a8155c532a86fb064f50485c79778189ac4f0d955a7ffb717d52bf9a23190131de6688da54a2e09f3bce161e8d2150cbef85a9c406a1a191f2d9cf6df26
diff --git a/app-admin/chef-server-api/files/initd/chef-server-api b/app-admin/chef-server-api/files/initd/chef-server-api
index a297c8c1919e..297fc6895418 100644
--- a/app-admin/chef-server-api/files/initd/chef-server-api
+++ b/app-admin/chef-server-api/files/initd/chef-server-api
@@ -15,18 +15,13 @@ CLUSTER_NODES=${CLUSTER_NODES:-1}
CHEF_USER=${CHEF_USER:-chef}
CHEF_GROUP=${CHEF_GROUP:-chef}
-CHEF_DIRS=( /etc/chef /var/lib/chef /var/log/chef /var/run/chef )
-
-fix_owners() {
- for i in ${CHEF_DIRS[@]} ${CONFIGFILE}; do
- chown ${CHEF_USER}:${CHEF_GROUP} ${i}
- done
- chmod 0600 ${CONFIGFILE}
+start_pre() {
+ checkpath -q -d -m 0750 -o ${user}:${group} /etc/chef /var/{lib,log,run}/chef
+ checkpath -q -f -m 0600 ${CONFIGFILE}
}
start() {
ebegin "Starting Chef server"
- fix_owners
${CHEF_SERVER_BINARY} -d -P ${CHEF_SERVER_PIDFILE} -C ${CONFIGFILE} \
-u ${CHEF_USER} -G ${CHEF_GROUP} --name chef-server \
-c ${CLUSTER_NODES} -L ${CHEF_SERVER_LOGFILE} ${CHEF_SERVER_OPTS} > /dev/null