From 8ebcbfee6ce9f7550050f815a718115b2639dfb8 Mon Sep 17 00:00:00 2001 From: Kelvin Wong Date: Sat, 12 Apr 2014 01:11:11 -0700 Subject: [PATCH] Added standard Debian location for Supervisor configuration file Removed some white space --- supervisor/options.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/supervisor/options.py b/supervisor/options.py index fc3f426e9..25315dac4 100644 --- a/supervisor/options.py +++ b/supervisor/options.py @@ -101,7 +101,8 @@ def __init__(self, require_configfile=True): searchpaths = [os.path.join(here, 'etc', 'supervisord.conf'), os.path.join(here, 'supervisord.conf'), 'supervisord.conf', 'etc/supervisord.conf', - '/etc/supervisord.conf'] + '/etc/supervisord.conf', + '/etc/supervisor/supervisord.conf'] self.searchpaths = searchpaths def default_configfile(self): @@ -305,7 +306,7 @@ def realize(self, args=None, doc=None, def process_config(self, do_usage=True): """Process configuration data structure. - + This includes reading config file if necessary, setting defaults etc. """ if self.configfile: @@ -811,7 +812,7 @@ def processes_from_section(self, parser, section, group_name, raise ValueError( '%(process_num) must be present within process_name when ' 'numprocs > 1') - + if stopasgroup and not killasgroup: raise ValueError("Cannot set stopasgroup=true and killasgroup=false") @@ -1183,7 +1184,7 @@ def dropPrivileges(self, user): # always put our primary gid first in this list, otherwise we can # lose group info since sometimes the first group in the setgroups - # list gets overwritten on the subsequent setgid call (at least on + # list gets overwritten on the subsequent setgid call (at least on # freebsd 9 with python 2.7 - this will be safe though for all unix # /python version combos) groups.insert(0, gid)