From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 609CF1381F3 for ; Thu, 20 Dec 2012 10:01:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 350E321C0E3; Thu, 20 Dec 2012 10:01:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 881CA21C0E3 for ; Thu, 20 Dec 2012 10:01:31 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 97FCE33DA66 for ; Thu, 20 Dec 2012 10:01:30 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 915) id 5BF3C2171E; Thu, 20 Dec 2012 10:01:29 +0000 (UTC) From: "Benedikt Boehm (hollow)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, hollow@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-admin/chef-server-webui/files/initd: chef-server-webui X-VCS-Repository: gentoo-x86 X-VCS-Files: chef-server-webui X-VCS-Directories: app-admin/chef-server-webui/files/initd X-VCS-Committer: hollow X-VCS-Committer-Name: Benedikt Boehm Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20121220100129.5BF3C2171E@flycatcher.gentoo.org> Date: Thu, 20 Dec 2012 10:01:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 94ea9630-ce1f-42e7-8b30-3bf309a97f7d X-Archives-Hash: 9fe92fddb426402b4e8d1ef394987774 hollow 12/12/20 10:01:29 Modified: chef-server-webui Log: improve init script (Portage version: 2.2.0_alpha147/cvs/Linux x86_64, unsigned Manifest commit) Revision Changes Path 1.5 app-admin/chef-server-webui/files/initd/chef-server-webui file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-server-webui/files/initd/chef-server-webui?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-server-webui/files/initd/chef-server-webui?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-server-webui/files/initd/chef-server-webui?r1=1.4&r2=1.5 Index: chef-server-webui =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/chef-server-webui/files/initd/chef-server-webui,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- chef-server-webui 29 Jan 2012 12:34:16 -0000 1.4 +++ chef-server-webui 20 Dec 2012 10:01:29 -0000 1.5 @@ -15,18 +15,13 @@ 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 web interface" - fix_owners ${CHEF_SERVER_WEBUI_BINARY} -d -P ${CHEF_SERVER_WEBUI_PIDFILE} --name \ chef-server-webui -C ${CONFIGFILE} -u ${CHEF_USER} -G ${CHEF_GROUP} \ -c ${CLUSTER_NODES} -L ${CHEF_SERVER_WEBUI_LOGFILE} ${CHEF_SERVER_WEBUI_OPTS} > /dev/null