Add support for running thin as a different user and group than root. Thanks to Thomas D. in bug 473280.

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

4 files changed, 193 insertions, 1 deletions

diff --git a/www-servers/thin/ChangeLog b/www-servers/thin/ChangeLog
index 06aa9b6a2b56..be6e3bbcc262 100644
--- a/www-servers/thin/ChangeLog
+++ b/www-servers/thin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/thin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thin/ChangeLog,v 1.24 2013/07/16 10:08:03 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thin/ChangeLog,v 1.25 2013/07/16 10:14:35 graaff Exp $
+
+*thin-1.5.1-r2 (16 Jul 2013)
+
+  16 Jul 2013; Hans de Graaff <graaff@gentoo.org> +files/thin.confd-1,
+  +files/thin.initd-1, +thin-1.5.1-r2.ebuild:
+  Add support for running thin as a different user and group than root. Thanks
+  to Thomas D. in bug 473280.
 
   16 Jul 2013; Hans de Graaff <graaff@gentoo.org>
   -files/thin-1.2.5-tests.patch:
diff --git a/www-servers/thin/files/thin.confd-1 b/www-servers/thin/files/thin.confd-1
new file mode 100644
index 000000000000..16eddf2f524c
--- /dev/null
+++ b/www-servers/thin/files/thin.confd-1
@@ -0,0 +1,32 @@
+# /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"
+
+# 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-1 b/www-servers/thin/files/thin.initd-1
new file mode 100644
index 000000000000..1a3d7aa9adee
--- /dev/null
+++ b/www-servers/thin/files/thin.initd-1
@@ -0,0 +1,70 @@
+#!/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-1,v 1.1 2013/07/16 10:14:35 graaff 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}
+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 net localmount
+}
+
+checkconfig() {
+        [ ${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
+
+        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})
+}
diff --git a/www-servers/thin/thin-1.5.1-r2.ebuild b/www-servers/thin/thin-1.5.1-r2.ebuild
new file mode 100644
index 000000000000..07b76057dc10
--- /dev/null
+++ b/www-servers/thin/thin-1.5.1-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thin/thin-1.5.1-r2.ebuild,v 1.1 2013/07/16 10:14:35 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast and very simple Ruby web server"
+HOMEPAGE="http://code.macournoyer.com/thin/"
+SRC_URI="https://github.com/macournoyer/thin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="${DEPEND}
+	dev-util/ragel"
+RDEPEND="${RDEPEND}"
+
+# The runtime dependencies are used at build-time as well since the
+# Rakefile loads thin!
+mydeps=">=dev-ruby/daemons-1.0.9
+	>=dev-ruby/rack-1.0.0
+	>=dev-ruby/eventmachine-0.12.6
+	virtual/ruby-ssl"
+
+ruby_add_rdepend "${mydeps}"
+ruby_add_bdepend "${mydeps}
+	dev-ruby/rake-compiler
+	test? ( dev-ruby/rspec:0 )"
+
+all_ruby_prepare() {
+	# Fix Ragel-based parser generation (uses a *very* old syntax that
+	# is not supported in Gentoo)
+	sed -i -e 's: | rlgen-cd::' Rakefile || die
+
+	# Fix specs' dependencies so that the extension is not rebuilt
+	# when running tests
+	sed -i -e '/:spec =>/s:^:#:' tasks/spec.rake || die
+
+	# Fix rspec version to allow newer 1.x versions
+	sed -i -e '/gem "rspec"/ s/1.2.9/1.0/' tasks/spec.rake spec/spec_helper.rb || die
+
+	# Avoid CLEAN since it may not be available and we don't need it.
+	sed -i -e '/CLEAN/ s:^:#:' tasks/*.rake || die
+
+	# Disable a test that is known for freezing the testsuite,
+	# reported upstream. In thin 1.5.1 this just fails.
+	sed -i \
+		-e '/should force kill process in pid file/,/^  end/ s:^:#:' \
+		spec/daemonizing_spec.rb || die
+
+	# nasty but too complex to fix up for now :(
+	use test || rm tasks/spec.rake
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake compile || die "rake compile failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	keepdir /etc/thin
+	newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-1 ${PN}
+
+	einfo
+	elog "Thin is now shipped with init scripts."
+	elog "The default script (/etc/init.d/thin) will start all servers that have"
+	elog "configuration files in /etc/thin/. You can symlink the init script to"
+	elog "files of the format 'thin.SERVER' to be able to start individual servers."
+	elog "See /etc/conf.d/thin for more configuration options."
+	einfo
+}