committing changes in /etc after emerge run

Package changes:
+www-servers/uwsgi-2.0.12

diff --git a/.etckeeper b/.etckeeper
index 5352e06424823f5102951637377438a541da3aa2..58e98dd49bdb7a1f3a0be12c3575456840130a6f 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -103,6 +103,7 @@ maybe chmod 0644 'conf.d/twistd'
 maybe chmod 0644 'conf.d/udev'
 maybe chmod 0644 'conf.d/unbound'
 maybe chmod 0644 'conf.d/urandom'
+maybe chmod 0644 'conf.d/uwsgi'
 maybe chmod 0700 'config-archive'
 maybe chmod 0755 'config-archive/etc'
 maybe chmod 0644 'config-archive/etc/DIR_COLORS'
@@ -603,6 +604,7 @@ maybe chmod 0755 'init.d/twistd'
 maybe chmod 0755 'init.d/udev'
 maybe chmod 0755 'init.d/unbound'
 maybe chmod 0755 'init.d/urandom'
+maybe chmod 0755 'init.d/uwsgi'
 maybe chmod 0755 'init.d/virtualbox-guest-additions'
 maybe chmod 0644 'inittab'
 maybe chmod 0644 'inputrc'
@@ -1044,6 +1046,8 @@ maybe chown 'unbound' 'unbound'
 maybe chmod 0755 'unbound'
 maybe chmod 0644 'unbound/unbound.conf'
 maybe chmod 0644 'updatedb.conf'
+maybe chmod 0755 'uwsgi.d'
+maybe chmod 0644 'uwsgi.d/.keep_www-servers_uwsgi-0'
 maybe chmod 0644 'vconsole.conf'
 maybe chmod 0755 'vim'
 maybe chmod 0644 'vim/vimrc'

diff --git a/conf.d/uwsgi b/conf.d/uwsgi
new file mode 100644 (file)
index 0000000..fa01580
--- /dev/null
+++ b/conf.d/uwsgi
@@ -0,0 +1,63 @@
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# YOU SHOULD ONLY MODIFY THIS FILE IF YOU USE THE UWSGI EMPEROR MODE!
+# IF YOU WANT TO RUN A SINGLE APP INSTANCE, CREATE A COPY AND MODIFY THAT INSTEAD!
+
+# Path (or name) of UNIX/TCP socket to bind to
+# Example : UWSGI_SOCKET=127.0.0.1:1234
+UWSGI_SOCKET=
+
+# Enable threads? (1 = yes, 0 = no). The default is 0
+#
+UWSGI_THREADS=0
+
+# The path to your uWSGI application.
+#
+UWSGI_PROGRAM=
+
+# The path to your uWSGI xml config file.
+#
+UWSGI_XML_CONFIG=
+
+# The number of child processes to spawn. The default is 1.
+#
+UWSGI_PROCESSES=1
+
+# The log file path. If empty, log only errors
+#
+UWSGI_LOG_FILE=
+
+# If you want to run your application inside a chroot then specify the
+# directory here. Leave this blank otherwise.
+#
+UWSGI_CHROOT=
+
+# If you want to run your application from a specific directiory specify
+# it here. Leave this blank otherwise.
+#
+UWSGI_DIR=
+
+# The user to run your application as. If you do not specify these,
+# the application will be run as user root.
+#
+UWSGI_USER=
+
+# The group to run your application as. If you do not specify these,
+# the application will be run as group root.
+#
+UWSGI_GROUP=
+
+# Run the uwsgi emperor which loads vassals dynamically from this PATH
+# see http://projects.unbit.it/uwsgi/wiki/Emperor
+# The advised Gentoo folder is /etc/uwsgi.d/
+UWSGI_EMPEROR_PATH=
+
+# The group the emperor should run as. This is different from the UWSGI_GROUP
+# as you could want your apps share some sockets with other processes such as
+# www servers while preserving your emperor logs from being accessible by them.
+UWSGI_EMPEROR_GROUP=
+
+# Additional options you might want to pass to uWSGI
+#
+UWSGI_EXTRA_OPTIONS=

diff --git a/init.d/uwsgi b/init.d/uwsgi
new file mode 100755 (executable)
index 0000000..ab550aa
--- /dev/null
+++ b/init.d/uwsgi
@@ -0,0 +1,144 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+PROGNAME=${SVCNAME#*.}
+
+UWSGI_EXEC=/usr/bin/uwsgi
+if [ "${SVCNAME}" = "uwsgi" ]; then
+       PIDPATH=/var/run/uwsgi
+else
+       PIDPATH="/var/run/uwsgi_${PROGNAME}"
+fi
+PIDFILE="${PIDPATH}/${PROGNAME}.pid"
+
+extra_started_commands="${opts} reload stats"
+
+depend() {
+       need net
+}
+
+start_emperor() {
+       local OPTIONS
+       OPTIONS="--daemonize"
+
+       if [ -n "${UWSGI_LOG_FILE}" ]; then
+               OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}"
+       else
+               OPTIONS="${OPTIONS} /dev/null --disable-logging"
+       fi
+
+       [ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
+       [ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
+       [ -z "${UWSGI_GROUP}" ] && UWSGI_GROUP="root"
+
+       if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
+               OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
+       fi
+
+       ebegin "Starting uWSGI emperor"
+       checkpath -d -m 0770 -o "${UWSGI_USER}":"${UWSGI_EMPEROR_GROUP:-${UWSGI_GROUP}}" "${PIDPATH}"
+
+       cd "${UWSGI_DIR}" && \
+       start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" \
+               --group ${UWSGI_EMPEROR_GROUP:-${UWSGI_GROUP}} \
+               -- --emperor "${UWSGI_EMPEROR_PATH}" ${OPTIONS} --pidfile "${PIDFILE}"
+       return $?
+}
+
+start_app() {
+       local OPTIONS
+       OPTIONS="--master --daemonize"
+
+       if [ -n "${UWSGI_LOG_FILE}" ]; then
+               OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}"
+       else
+               OPTIONS="${OPTIONS} /dev/null --disable-logging"
+       fi
+
+       [ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
+       [ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
+       [ -z "${UWSGI_GROUP}" ] && UWSGI_GROUP="root"
+
+       if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
+               OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
+       fi
+
+       if [ "${UWSGI_THREADS}" = "1" ]; then
+               OPTIONS="${OPTIONS} --enable-threads"
+       fi
+
+       if [ -n "${UWSGI_SOCKET}" ]; then
+               OPTIONS="${OPTIONS} --socket ${UWSGI_SOCKET}"
+       fi
+
+       if [ -n "${UWSGI_PROCESSES}" ]; then
+               OPTIONS="${OPTIONS} --processes ${UWSGI_PROCESSES}"
+       fi
+
+       if [ -n "${UWSGI_CHROOT}" ]; then
+               OPTIONS="${OPTIONS} --chroot ${UWSGI_CHROOT}"
+       fi
+
+       if [ -n "${UWSGI_PROGRAM}" ]; then
+               OPTIONS="${OPTIONS} --fileserve-mode ${UWSGI_PROGRAM}"
+       fi
+
+       if [ -n "${UWSGI_XML_CONFIG}" ]; then
+               OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}"
+       fi
+
+       ebegin "Starting uWSGI application ${PROGNAME}"
+       checkpath -d -m 0750 -o "${UWSGI_USER}":"${UWSGI_GROUP}" "${PIDPATH}"
+
+       cd "${UWSGI_DIR}" && \
+       start-stop-daemon --start --user "${UWSGI_USER}" --group "${UWSGI_GROUP}" \
+               --exec "${UWSGI_EXEC}" -- ${OPTIONS} --pidfile "${PIDFILE}"
+       return $?
+}
+
+start() {
+       if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
+               start_emperor
+               eend $?
+       else
+               if [ "${SVCNAME}" = "uwsgi" ]; then
+                       eerror "You are not supposed to run this script directly unless you"
+                       eerror "want to run in Emperor mode. In that case please set the UWSGI_EMPEROR_PATH."
+                       eerror "Otherwise create a symlink for the uwsgi application you want to run as well as"
+                       eerror "a copy of the configuration file and modify it appropriately like so..."
+                       eerror
+                       eerror "  ln -s uwsgi /etc/init.d/uwsgi.trac"
+                       eerror "  cp /etc/conf.d/uwsgi /etc/conf.d/uwsgi.trac"
+                       eerror "  nano /etc/conf.d/uwsgi.trac"
+                       eerror
+                       return 1
+               else
+                       start_app
+                       eend $?
+               fi
+       fi
+}
+
+stop() {
+       if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
+               ebegin "Stopping uWSGI emperor"
+       else
+               ebegin "Stopping uWSGI application ${PROGNAME}"
+       fi
+       start-stop-daemon --stop --signal QUIT --pidfile "${PIDFILE}"
+       eend $?
+}
+
+reload() {
+       ebegin "Reloading uWSGI"
+       start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
+       eend $?
+}
+
+stats() {
+       ebegin "Logging uWSGI statistics"
+       start-stop-daemon --signal USR1 --pidfile "${PIDFILE}"
+       eend $?
+}

diff --git a/uwsgi.d/.keep_www-servers_uwsgi-0 b/uwsgi.d/.keep_www-servers_uwsgi-0
new file mode 100644 (file)
index 0000000..e69de29