From: Benedikt Boehm <hollow@gentoo.org>
Date: Sun, 4 Jul 2010 10:15:11 +0000 (+0000)
Subject: fix init script to set config file owner and permissions too
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ade1359978fed508f9c7178fb01bcd862590189d;p=gentoo.git

fix init script to set config file owner and permissions too
Package-Manager: portage-2.2_rc67/cvs/Linux i686
---

diff --git a/app-admin/chef-server-api/ChangeLog b/app-admin/chef-server-api/ChangeLog
index 8c10fe367cd1..bab609275e3a 100644
--- a/app-admin/chef-server-api/ChangeLog
+++ b/app-admin/chef-server-api/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/chef-server-api
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/ChangeLog,v 1.2 2010/07/03 13:00:42 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/ChangeLog,v 1.3 2010/07/04 10:15:11 hollow Exp $
+
+  04 Jul 2010; Benedikt Böhm <hollow@gentoo.org>
+  files/initd/chef-server-api:
+  fix init script to set config file owner and permissions too
 
   03 Jul 2010; Benedikt Böhm <hollow@gentoo.org>
   chef-server-api-0.9.6.ebuild:
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 81b0dea916dc..c42b0e9ed923 100644
--- a/app-admin/chef-server-api/files/initd/chef-server-api
+++ b/app-admin/chef-server-api/files/initd/chef-server-api
@@ -15,19 +15,18 @@ CLUSTER_NODES=${CLUSTER_NODES:-1}
 CHEF_USER=${CHEF_USER:-chef}
 CHEF_GROUP=${CHEF_GROUP:-chef}
 
-# TODO: this could be nicer
-DEFAULT_CHEF_DIRS=( /etc/chef /var/lib/chef /var/log/chef /var/run/chef )
-CHEF_DIRS=( ${CHEF_DIRS[@]:-${DEFAULT_CHEF_DIRS[@]}} )
+CHEF_DIRS=( /etc/chef /var/lib/chef /var/log/chef /var/run/chef )
 
-fix_dir_owners() {
-	for DIR in ${CHEF_DIRS[@]}; do
-		chown ${CHEF_USER}:${CHEF_GROUP} ${DIR}
+fix_owners() {
+	for i in ${CHEF_DIRS[@]} ${CONFIGFILE}; do
+		chown ${CHEF_USER}:${CHEF_GROUP} ${i}
 	done
+	chmod 0600 ${CONFIGFILE}
 }
 
 start() {
 	ebegin "Starting Chef server"
-	fix_dir_owners
+	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} > /dev/null
diff --git a/app-admin/chef-server-webui/ChangeLog b/app-admin/chef-server-webui/ChangeLog
index 6ee9a3241eee..31df9d484f75 100644
--- a/app-admin/chef-server-webui/ChangeLog
+++ b/app-admin/chef-server-webui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/chef-server-webui
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-webui/ChangeLog,v 1.1 2010/07/03 12:47:24 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-webui/ChangeLog,v 1.2 2010/07/04 10:13:57 hollow Exp $
+
+  04 Jul 2010; Benedikt Böhm <hollow@gentoo.org>
+  files/initd/chef-server-webui:
+  fix init script to set config file owner and permissions too
 
 *chef-server-webui-0.9.6 (03 Jul 2010)
 
diff --git a/app-admin/chef-server-webui/files/initd/chef-server-webui b/app-admin/chef-server-webui/files/initd/chef-server-webui
index 369a4e179507..57886e3f25e5 100644
--- a/app-admin/chef-server-webui/files/initd/chef-server-webui
+++ b/app-admin/chef-server-webui/files/initd/chef-server-webui
@@ -15,17 +15,18 @@ CLUSTER_NODES=${CLUSTER_NODES:-1}
 CHEF_USER=${CHEF_USER:-chef}
 CHEF_GROUP=${CHEF_GROUP:-chef}
 
-# TODO: this could be nicer
-DEFAULT_CHEF_DIRS=( /etc/chef /var/lib/chef /var/log/chef /var/run/chef )
-CHEF_DIRS=( ${CHEF_DIRS[@]:-${DEFAULT_CHEF_DIRS[@]}} )
+CHEF_DIRS=( /etc/chef /var/lib/chef /var/log/chef /var/run/chef )
 
-fix_dir_owners() {
-	for DIR in ${CHEF_DIRS[@]} ; do chown ${CHEF_USER}:${CHEF_GROUP} ${DIR} ; done
+fix_owners() {
+	for i in ${CHEF_DIRS[@]} ${CONFIGFILE}; do
+		chown ${CHEF_USER}:${CHEF_GROUP} ${i}
+	done
+	chmod 0600 ${CONFIGFILE}
 }
 
 start() {
 	ebegin "Starting Chef server web interface"
-	fix_dir_owners
+	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} > /dev/null
diff --git a/app-admin/chef-solr/ChangeLog b/app-admin/chef-solr/ChangeLog
index ca2046a70804..b542955df4d8 100644
--- a/app-admin/chef-solr/ChangeLog
+++ b/app-admin/chef-solr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/chef-solr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/ChangeLog,v 1.2 2010/07/03 12:59:55 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/ChangeLog,v 1.3 2010/07/04 10:13:04 hollow Exp $
+
+  04 Jul 2010; Benedikt Böhm <hollow@gentoo.org> files/initd/chef-solr,
+  files/initd/chef-solr-indexer:
+  fix init script to set config file owner and permissions too
 
   03 Jul 2010; Benedikt Böhm <hollow@gentoo.org> chef-solr-0.9.6.ebuild:
   fix dependency on chef
diff --git a/app-admin/chef-solr/files/initd/chef-solr b/app-admin/chef-solr/files/initd/chef-solr
index 941736c1288f..1c48727f562a 100644
--- a/app-admin/chef-solr/files/initd/chef-solr
+++ b/app-admin/chef-solr/files/initd/chef-solr
@@ -14,17 +14,18 @@ CONFIGFILE=${CONFIGFILE:-/etc/chef/solr.rb}
 CHEF_USER=${CHEF_USER:-chef}
 CHEF_GROUP=${CHEF_GROUP:-chef}
 
-# TODO: this could be nicer
-DEFAULT_CHEF_DIRS=( /etc/chef /var/lib/chef /var/log/chef /var/run/chef )
-CHEF_DIRS=( ${CHEF_DIRS[@]:-${DEFAULT_CHEF_DIRS[@]}} )
+CHEF_DIRS=( /etc/chef /var/lib/chef /var/log/chef /var/run/chef )
 
-fix_dir_owners() {
-	for DIR in ${CHEF_DIRS[@]} ; do chown ${CHEF_USER}:${CHEF_GROUP} ${DIR} ; done
+fix_owners() {
+	for i in ${CHEF_DIRS[@]} ${CONFIGFILE}; do
+		chown ${CHEF_USER}:${CHEF_GROUP} ${i}
+	done
+	chmod 0600 ${CONFIGFILE}
 }
 
 start() {
 	ebegin "Starting Chef SOLR"
-	fix_dir_owners
+	fix_owners
 	start-stop-daemon --start --quiet --chuid ${CHEF_USER}:${CHEF_GROUP} \
 		--pidfile ${CHEF_SOLR_PIDFILE} --name java --exec \
 		${CHEF_SOLR_BINARY} -- -d -P ${CHEF_SOLR_PIDFILE} -c ${CONFIGFILE} \
diff --git a/app-admin/chef-solr/files/initd/chef-solr-indexer b/app-admin/chef-solr/files/initd/chef-solr-indexer
index b32261cf8556..09772bab0886 100644
--- a/app-admin/chef-solr/files/initd/chef-solr-indexer
+++ b/app-admin/chef-solr/files/initd/chef-solr-indexer
@@ -13,17 +13,18 @@ CONFIGFILE=${CONFIGFILE:-/etc/chef/solr.rb}
 CHEF_USER=${CHEF_USER:-chef}
 CHEF_GROUP=${CHEF_GROUP:-chef}
 
-# TODO: this could be nicer
-DEFAULT_CHEF_DIRS=( /etc/chef /var/lib/chef /var/log/chef /var/run/chef )
-CHEF_DIRS=( ${CHEF_DIRS[@]:-${DEFAULT_CHEF_DIRS[@]}} )
+CHEF_DIRS=( /etc/chef /var/lib/chef /var/log/chef /var/run/chef )
 
-fix_dir_owners() {
-	for DIR in ${CHEF_DIRS[@]} ; do chown ${CHEF_USER}:${CHEF_GROUP} ${DIR} ; done
+fix_owners() {
+	for i in ${CHEF_DIRS[@]} ${CONFIGFILE}; do
+		chown ${CHEF_USER}:${CHEF_GROUP} ${i}
+	done
+	chmod 0600 ${CONFIGFILE}
 }
 
 start() {
 	ebegin "Starting Chef SOLR indexer"
-	fix_dir_owners
+	fix_owners
 	start-stop-daemon --start --quiet --chuid ${CHEF_USER}:${CHEF_GROUP} \
 		--pidfile ${CHEF_SOLR_INDEXER_PIDFILE} --exec ${CHEF_SOLR_INDEXER_BINARY} \
 		-- -d -P ${CHEF_SOLR_INDEXER_PIDFILE} -L ${CHEF_SOLR_INDEXER_LOGFILE} \