[gentoo-commits] gentoo-x86 commit in sys-auth/keystone/files: keystone.initd keystone.confd keystone.initd.havana

[gentoo-commits] gentoo-x86 commit in sys-auth/keystone/files: keystone.initd keystone.confd keystone.initd.havana

[Matt Thode (prometheanfire)]

prometheanfire    14/01/20 06:08:12

  Modified:             keystone.initd keystone.confd
  Removed:              keystone.initd.havana
  Log:
  updated init scripts :D
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)

Revision  Changes    Path
1.4                  sys-auth/keystone/files/keystone.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/files/keystone.initd?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/files/keystone.initd?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/files/keystone.initd?r1=1.3&r2=1.4

Index: keystone.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-auth/keystone/files/keystone.initd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- keystone.initd	18 Nov 2013 03:24:30 -0000	1.3
+++ keystone.initd	20 Jan 2014 06:08:12 -0000	1.4
@@ -1,56 +1,17 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/files/keystone.initd,v 1.3 2013/11/18 03:24:30 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/files/keystone.initd,v 1.4 2014/01/20 06:08:12 prometheanfire Exp $
 
-depend() {
-	need net
-}
-
-BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
+description="Starts both the service and administrative APIs in a single process to provide catalog, authorization, and authentication services for OpenStack"
 
-checkconfig() {
-	if [ ! -r /etc/conf.d/$BASENAME ]; then
-		eerror "No keystone service confd file found: /etc/conf.d/$BASENAME)"
-		return 1
-	fi
-	. /etc/conf.d/$BASENAME
-
-	if [ ! -r ${CONFIG_FILE} ]; then
-		eerror "No keystone config file found: ${CONFIG_FILE})"
-		return 1
-	fi
-
-	return 0
-}
+command=/usr/bin/keystone-all
+pidfile=/var/run/keystone.pid
+required_files="${KEYSTONE_CONF:-/etc/keystone/keystone.conf}"
 
+start_stop_daemon_args="--background --make-pidfile --user ${KEYSTONE_USER:-keystone}"
+command_args="${KEYSTONE_ARGS}"
 
-start() {
-	checkconfig || return $?
-	. /etc/conf.d/$BASENAME
-
-    if [ ! -d ${PID_PATH} ]; then
-        mkdir ${PID_PATH}
-    fi
-	
-	ebegin "Starting ${SVCNAME}"
-	
-	start-stop-daemon --start --quiet --make-pidfile --pidfile "${PID_PATH}/${SVCNAME}.pid" --exec /usr/bin/${SVCNAME}-all --background -- --config-file=${CONFIG_FILE} --log-file=${LOG_FILE}
-	
-	eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-	checkconfig || return $?
-	. /etc/conf.d/$BASENAME
-	
-	ebegin "Stopping ${SVCNAME}"
-	
-	start-stop-daemon --stop --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-					  --exec /usr/bin/${SVCNAME}-all
-	eend $? "Failed to stop ${SVCNAME}"
+depend() {
+	need net
 }
-
-#restart() {
-#
-#}



1.3                  sys-auth/keystone/files/keystone.confd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/files/keystone.confd?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/files/keystone.confd?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/files/keystone.confd?r1=1.2&r2=1.3

Index: keystone.confd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-auth/keystone/files/keystone.confd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keystone.confd	18 Nov 2013 03:24:30 -0000	1.2
+++ keystone.confd	20 Jan 2014 06:08:12 -0000	1.3
@@ -1,3 +1,3 @@
-CONFIG_FILE=/etc/keystone/keystone.conf
-LOG_FILE=/var/log/keystone/keystone.log
-PID_PATH=/var/run/keystone
+#KEYSTONE_CONF=/etc/keystone/keystone.conf
+#KEYSTONE_USER=keystone
+KEYSTONE_ARGS="--logfile /var/log/keystone/keystone.log"