diff options
author | Louis Sautier <sautier.louis@gmail.com> | 2018-05-17 14:53:48 +0200 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2018-05-24 08:27:27 +0200 |
commit | ae9ec8eac390679bf5dcc299ec9fea7dec4f0f03 (patch) | |
tree | 353f1cf4f3e2bbf1fa04d414c606611324f928f7 /app-admin/supervisor/files | |
parent | app-arch/bzip2: stable 1.0.6-r9 for sparc (diff) | |
download | gentoo-ae9ec8eac390679bf5dcc299ec9fea7dec4f0f03.tar.gz gentoo-ae9ec8eac390679bf5dcc299ec9fea7dec4f0f03.tar.bz2 gentoo-ae9ec8eac390679bf5dcc299ec9fea7dec4f0f03.zip |
app-admin/supervisor: bump to 3.3.4, add default config, dedicated group
- Add a default configuration file.
- Add a dedicated log directory and a group to which users can be added
in order to run supervisorctl and access logs.
- Fix warnings related to namespace packages.
- Add a missing RDEPEND on dev-python/setuptools (pkg_resources).
- Fix the init script to explicitely specify a configuration file to
supervisord, otherwise a warning is issued.
- Add informational messages when the package is installed for the first
time.
Closes: https://bugs.gentoo.org/589734
Package-Manager: Portage-2.3.31, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/8453
Diffstat (limited to 'app-admin/supervisor/files')
-rw-r--r-- | app-admin/supervisor/files/conf.d-r1 | 7 | ||||
-rw-r--r-- | app-admin/supervisor/files/init.d-r2 | 15 | ||||
-rw-r--r-- | app-admin/supervisor/files/supervisord.conf | 69 |
3 files changed, 91 insertions, 0 deletions
diff --git a/app-admin/supervisor/files/conf.d-r1 b/app-admin/supervisor/files/conf.d-r1 new file mode 100644 index 000000000000..7a80c826ef51 --- /dev/null +++ b/app-admin/supervisor/files/conf.d-r1 @@ -0,0 +1,7 @@ +# /etc/conf.d/supervisord + +# Configuration file (default: /etc/supervisord.conf) +#SUPD_CONFIG_FILE="/etc/supervisord.conf" + +# Options to pass to the supervisord process +SUPD_OPTS="" diff --git a/app-admin/supervisor/files/init.d-r2 b/app-admin/supervisor/files/init.d-r2 new file mode 100644 index 000000000000..c5723b36f013 --- /dev/null +++ b/app-admin/supervisor/files/init.d-r2 @@ -0,0 +1,15 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="client/server system that allows its users to monitor and control a number of processes on UNIX-like operating systems" + +SUPD_CONFIG_FILE="${SUPD_CONFIG_FILE:-/etc/supervisord.conf}" + +command="/usr/bin/supervisord" +pidfile="/run/supervisord.pid" +command_args="--nodaemon --pidfile ${pidfile} --configuration \ + \"${SUPD_CONFIG_FILE}\" ${SUPD_OPTS}" +command_background="yes" + +required_files="${SUPD_CONFIG_FILE}" diff --git a/app-admin/supervisor/files/supervisord.conf b/app-admin/supervisor/files/supervisord.conf new file mode 100644 index 000000000000..91d6be018123 --- /dev/null +++ b/app-admin/supervisor/files/supervisord.conf @@ -0,0 +1,69 @@ +; Supervisor configuration file based on supervisor/skel/sample.conf +; vim: set ft=dosini: + +; The below section contains configuration parameters for an HTTP server +; that listens on a UNIX domain socket. If the configuration file has no +; [unix_http_server] section, a UNIX domain socket HTTP server will not +; be started. +[unix_http_server] +; the path to the socket file (with which supervisorctl can communicate) +file=/run/supervisord.sock +; socket file mode (default 0700) +chmod=0770 +; socket file uid:gid owner +chown=root:supervisor +; default is no username (open server) +;username=user +; default is no password (open server) +;password=123 + +; The below section contains global settings +; related to the supervisord process. +[supervisord] +; main log file; default $CWD/supervisord.log +logfile=/var/log/supervisor/supervisord.log +; 'AUTO' child log dir, default $TEMP +childlogdir=/var/log/supervisor +; max main logfile bytes before rotation; default 50MB +logfile_maxbytes=50MB +; number of main logfile backups; 0 means none, default 10 +logfile_backups=10 +; log level; default info; others: debug, warn, trace +loglevel=info +; minimum available startup file descriptors; default 1024 +minfds=1024 +; minimum available process descriptors; default 200 +minprocs=200 +; default is current user, must be explicitely set if running as root +user=root +; process file creation umask; default 022 +;umask=022 +; supervisord identifier, default is 'supervisor' +;identifier=supervisor +; default is not to cd during start +;directory=/tmp +; don't clean up tempfiles at start; default false +;nocleanup=true +; key value pairs to add to environment +;environment=KEY="value" +; strip ANSI escape codes in logs; default false +;strip_ansi=false + +; The below section must remain in the config file for RPC +; (supervisorctl/web interface) to work, additional interfaces may be +; added by defining them in separate rpcinterface: sections +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +; The below section contains settings for +; the supervisorctl interactive shell program. +[supervisorctl] +serverurl=unix:///run/supervisord.sock ; use a unix:// URL for a unix socket + +; The below section can just contain the "files" setting. This +; setting can list multiple files (separated by whitespace or +; newlines). It can also contain wildcards. The filenames are +; interpreted as relative to this file. Included files *cannot* +; include files themselves. +[include] +files = /etc/supervisord.d/*.conf |