Adding -r3 adding bundler support to the init script; dropping 'need net' as thin defaults to 0.0.0.0; taking over maintenance

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 8E740238)

2 files changed, 122 insertions, 0 deletions

diff --git a/www-servers/thin/files/thin.confd-2 b/www-servers/thin/files/thin.confd-2
new file mode 100644
index 000000000000..ca89c44cfd0e
--- /dev/null
+++ b/www-servers/thin/files/thin.confd-2
@@ -0,0 +1,39 @@
+# /etc/conf.d/thin: Configuration for /etc/init.d/thin*
+# Copy this file to /etc/conf.d/thin.SERVERNAME for server specific options.
+
+# Set the configuration file location.
+# In start-all mode (/etc/init.d/thin), this must point to the directory where
+# all the thin configurations are located.
+# When starting a specific server (/etc/init.d/thin.SERVER), point to the exact
+# location of the .yml configuration file.
+# CONFIG="/etc/thin/${SVCNAME#*.}.yml"
+
+# Disable looking for a configuration file.
+# You can use THIN_OPTS instead for setting command line options.
+# NOCONFIG=0
+
+# Set the Ruby interpreter to use.
+# RUBY="/usr/bin/ruby"
+
+# Whether to start thin using `bundle exec'
+# DO_BUNDLER=0
+
+# What directory to cd into before starting thin
+# (useful for DO_BUNDLER)
+# CHDIR=
+
+# Set the user for this instance.
+# (Should mirror "user" value in /etc/thin/${SVCNAME#*.}.yml)
+# THIN_USER=
+
+# Set the group for this instance.
+# (Should mirror "group" value in /etc/thin/${SVCNAME#*.}.yml)
+# THIN_GROUP=
+
+# Set the pidfile for this instance.
+# (Should mirror "pid" value in /etc/thin/${SVCNAME#*.}.yml)
+# THIN_PID=
+
+# Set command line options to pass to thin.
+# In specific server mode, '--tag SERVER_NAME' is automatically appended.
+# THIN_OPTS=
diff --git a/www-servers/thin/files/thin.initd-2 b/www-servers/thin/files/thin.initd-2
new file mode 100644
index 000000000000..af87f0eb1692
--- /dev/null
+++ b/www-servers/thin/files/thin.initd-2
@@ -0,0 +1,83 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thin/files/thin.initd-2,v 1.1 2013/11/11 14:19:30 a3li Exp $
+
+SERVER=${SVCNAME#*.}
+if [ ${SERVER} != thin ]; then
+	CONFIG=${CONFIG:-/etc/thin/${SERVER}.yml}
+else
+	CONFIG=${CONFIG:-/etc/thin/}
+fi
+NOCONFIG=${NOCONFIG:-0}
+RUBY=${RUBY:-/usr/bin/ruby}
+DO_BUNDLER=${DO_BUNDLER:-0}
+CHDIR=${CHDIR:-}
+THIN_USER=${THIN_USER:-root}
+THIN_GROUP=${THIN_GROUP:-root}
+THIN_PID=${THIN_PID:-/var/run/thin/thin.pid}
+THIN_OPTS=${THIN_OPTS:-}
+
+depend() {
+	need localmount
+}
+
+checkconfig() {
+	if [ -n ${CHDIR} ]; then
+		cd "${CHDIR}"
+
+		if [ $? -ne 0 ]; then
+			eerror "Cannot cd into requested directory"
+			return 1
+		fi
+	fi
+
+	[ ${SERVER} = thin -o ${NOCONFIG} != 0 ] && return 0
+
+	if [ ! -f ${CONFIG} ]; then
+		eerror "Unable to find the server configuration."
+		eerror "Please set the CONFIG variable in /etc/conf.d/${SVCNAME} or"
+		eerror "set NOCONFIG there to 1 to disable looking for a config file."
+		return 1
+	fi
+}
+
+buildargs() {
+	if [ ${NOCONFIG} = 0 -a ${SERVER} != thin ]; then
+		echo -n "-C ${CONFIG} "
+	fi
+
+	echo -n "${THIN_OPTS}"
+}
+
+action() {
+	checkconfig || return 1
+
+	[ ${DO_BUNDLER} -ne 0 ] && RUBY="${RUBY} bundle exec"
+
+	if [ ${SERVER} = thin ]; then
+		ebegin "$2 all thin servers in ${CONFIG}"
+		${RUBY} /usr/bin/thin $1 $(buildargs) --all ${CONFIG}
+		eend $?
+	else
+		ebegin "$2 thin server ${SERVER}"
+		${RUBY} /usr/bin/thin $(buildargs) --tag ${SERVER} $1
+		eend $?
+	fi
+}
+
+start() {
+	action start 'Starting'
+}
+
+stop() {
+	action stop 'Stopping'
+}
+
+restart() {
+	action restart 'Restarting'
+}
+
+start_pre() {
+	checkpath -d -m 0775 -o ${THIN_USER}:${THIN_GROUP} $(dirname ${THIN_PID})
+}