public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-admin/chef-solr/files/initd: chef-solr-indexer chef-solr
@ 2010-07-03 12:54 Benedikt Boehm (hollow)
  0 siblings, 0 replies; 3+ messages in thread
From: Benedikt Boehm (hollow) @ 2010-07-03 12:54 UTC (permalink / raw
  To: gentoo-commits

hollow      10/07/03 12:54:17

  Added:                chef-solr-indexer chef-solr
  Log:
  initial ebuild, thanks to Gábor Vészi
  (Portage version: 2.2_rc67/cvs/Linux i686)

Revision  Changes    Path
1.1                  app-admin/chef-solr/files/initd/chef-solr-indexer

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr-indexer?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr-indexer?rev=1.1&content-type=text/plain

Index: chef-solr-indexer
===================================================================
#!/sbin/runscript
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

depend() {
	need net chef-solr
}

CHEF_SOLR_INDEXER_BINARY=${CHEF_SOLR_INDEXER_BINARY:-/usr/bin/chef-solr-indexer}
CHEF_SOLR_INDEXER_PIDFILE=${CHEF_SOLR_INDEXER_PIDFILE:-/var/run/chef/solr-indexer.pid}
CHEF_SOLR_INDEXER_LOGFILE=${CHEF_SOLR_INDEXER_LOGFILE:-/var/log/chef/solr-indexer.log}
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[@]}} )

fix_dir_owners() {
	for DIR in ${CHEF_DIRS[@]} ; do chown ${CHEF_USER}:${CHEF_GROUP} ${DIR} ; done
}

start() {
	ebegin "Starting Chef SOLR indexer"
	fix_dir_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} \
		-c ${CONFIGFILE} ${CHEF_SOLR_INDEXER_OPTS}
	eend $?
}

stop() {
	ebegin "Shutting down Chef SOLR indexer"
	start-stop-daemon --stop --quiet --pidfile ${CHEF_SOLR_INDEXER_PIDFILE}
	eend $?
}



1.1                  app-admin/chef-solr/files/initd/chef-solr

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr?rev=1.1&content-type=text/plain

Index: chef-solr
===================================================================
#!/sbin/runscript
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

depend() {
	need net rabbitmq
	after couchdb
}

CHEF_SOLR_BINARY=${CHEF_SOLR_BINARY:-/usr/bin/chef-solr}
CHEF_SOLR_PIDFILE=${CHEF_SOLR_PIDFILE:-/var/run/chef/solr.pid}
CHEF_SOLR_LOGFILE=${CHEF_SOLR_LOGFILE:-/var/log/chef/solr.log}
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[@]}} )

fix_dir_owners() {
	for DIR in ${CHEF_DIRS[@]} ; do chown ${CHEF_USER}:${CHEF_GROUP} ${DIR} ; done
}

start() {
	ebegin "Starting Chef SOLR"
	fix_dir_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} \
		-L ${CHEF_SOLR_LOGFILE} ${CHEF_SOLR_OPTS} > /dev/null
	eend $?
}

stop() {
	ebegin "Shutting down Chef SOLR"
	start-stop-daemon --stop --quiet --pidfile ${CHEF_SOLR_PIDFILE}
	eend $?
}






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-admin/chef-solr/files/initd: chef-solr-indexer chef-solr
@ 2010-07-04 10:13 Benedikt Boehm (hollow)
  0 siblings, 0 replies; 3+ messages in thread
From: Benedikt Boehm (hollow) @ 2010-07-04 10:13 UTC (permalink / raw
  To: gentoo-commits

hollow      10/07/04 10:13:03

  Modified:             chef-solr-indexer chef-solr
  Log:
  fix init script to set config file owner and permissions too
  (Portage version: 2.2_rc67/cvs/Linux i686)

Revision  Changes    Path
1.2                  app-admin/chef-solr/files/initd/chef-solr-indexer

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr-indexer?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr-indexer?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr-indexer?r1=1.1&r2=1.2

Index: chef-solr-indexer
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr-indexer,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chef-solr-indexer	3 Jul 2010 12:54:17 -0000	1.1
+++ chef-solr-indexer	4 Jul 2010 10:13:03 -0000	1.2
@@ -13,17 +13,18 @@
 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} \



1.2                  app-admin/chef-solr/files/initd/chef-solr

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr?r1=1.1&r2=1.2

Index: chef-solr
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chef-solr	3 Jul 2010 12:54:17 -0000	1.1
+++ chef-solr	4 Jul 2010 10:13:03 -0000	1.2
@@ -14,17 +14,18 @@
 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} \






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-admin/chef-solr/files/initd: chef-solr-indexer chef-solr
@ 2011-12-31 20:07 Christian Ruppert (idl0r)
  0 siblings, 0 replies; 3+ messages in thread
From: Christian Ruppert (idl0r) @ 2011-12-31 20:07 UTC (permalink / raw
  To: gentoo-commits

idl0r       11/12/31 20:07:50

  Modified:             chef-solr-indexer chef-solr
  Log:
  Revbump. Don't use deprecated start-stop-daemon options, bug 392777.
  
  (Portage version: 2.1.10.41/cvs/Linux i686, RepoMan options: --force)

Revision  Changes    Path
1.3                  app-admin/chef-solr/files/initd/chef-solr-indexer

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr-indexer?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr-indexer?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr-indexer?r1=1.2&r2=1.3

Index: chef-solr-indexer
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr-indexer,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- chef-solr-indexer	4 Jul 2010 10:13:03 -0000	1.2
+++ chef-solr-indexer	31 Dec 2011 20:07:50 -0000	1.3
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -25,7 +25,7 @@
 start() {
 	ebegin "Starting Chef SOLR indexer"
 	fix_owners
-	start-stop-daemon --start --quiet --chuid ${CHEF_USER}:${CHEF_GROUP} \
+	start-stop-daemon --start --quiet --user ${CHEF_USER} --group ${CHEF_GROUP} \
 		--pidfile ${CHEF_SOLR_INDEXER_PIDFILE} --exec ${CHEF_SOLR_INDEXER_BINARY} \
 		-- -d -P ${CHEF_SOLR_INDEXER_PIDFILE} -L ${CHEF_SOLR_INDEXER_LOGFILE} \
 		-c ${CONFIGFILE} ${CHEF_SOLR_INDEXER_OPTS}



1.3                  app-admin/chef-solr/files/initd/chef-solr

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr?r1=1.2&r2=1.3

Index: chef-solr
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/chef-solr/files/initd/chef-solr,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- chef-solr	4 Jul 2010 10:13:03 -0000	1.2
+++ chef-solr	31 Dec 2011 20:07:50 -0000	1.3
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -26,7 +26,7 @@
 start() {
 	ebegin "Starting Chef SOLR"
 	fix_owners
-	start-stop-daemon --start --quiet --chuid ${CHEF_USER}:${CHEF_GROUP} \
+	start-stop-daemon --start --quiet --user ${CHEF_USER} --group ${CHEF_GROUP} \
 		--pidfile ${CHEF_SOLR_PIDFILE} --name java --exec \
 		${CHEF_SOLR_BINARY} -- -d -P ${CHEF_SOLR_PIDFILE} -c ${CONFIGFILE} \
 		-L ${CHEF_SOLR_LOGFILE} ${CHEF_SOLR_OPTS} > /dev/null






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-12-31 20:08 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-04 10:13 [gentoo-commits] gentoo-x86 commit in app-admin/chef-solr/files/initd: chef-solr-indexer chef-solr Benedikt Boehm (hollow)
  -- strict thread matches above, loose matches on Subject: below --
2011-12-31 20:07 Christian Ruppert (idl0r)
2010-07-03 12:54 Benedikt Boehm (hollow)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox