# HG changeset patch # User Sylvain Thénault # Date 1294246036 -3600 # Node ID accf5978a4407976741922b4134a49b27dcf12b4 # Parent 7dd4835d5198d2a3982abbcb59ad935e57eb26f1 [daemon] make process umask configurable diff -r 7dd4835d5198 -r accf5978a440 __pkginfo__.py --- a/__pkginfo__.py Wed Jan 05 15:32:37 2011 +0100 +++ b/__pkginfo__.py Wed Jan 05 17:47:16 2011 +0100 @@ -40,7 +40,7 @@ ] __depends__ = { - 'logilab-common': '>= 0.52.0', + 'logilab-common': '>= 0.54.0', 'logilab-mtconverter': '>= 0.8.0', 'rql': '>= 0.27.0', 'yams': '>= 0.30.1', diff -r 7dd4835d5198 -r accf5978a440 cwconfig.py --- a/cwconfig.py Wed Jan 05 15:32:37 2011 +0100 +++ b/cwconfig.py Wed Jan 05 17:47:16 2011 +0100 @@ -317,6 +317,12 @@ 'help': 'server\'s log level', 'group': 'main', 'level': 1, }), + ('umask', + {'type' : 'int', + 'default': 077, + 'help': 'permission umask for files created by the server', + 'group': 'main', 'level': 2, + }), # pyro options ('pyro-instance-id', {'type' : 'string', diff -r 7dd4835d5198 -r accf5978a440 debian/control --- a/debian/control Wed Jan 05 15:32:37 2011 +0100 +++ b/debian/control Wed Jan 05 17:47:16 2011 +0100 @@ -97,7 +97,7 @@ Package: cubicweb-common Architecture: all XB-Python-Version: ${python:Versions} -Depends: ${python:Depends}, graphviz, gettext, python-logilab-mtconverter (>= 0.8.0), python-logilab-common (>= 0.51.0), python-yams (>= 0.30.1), python-rql (>= 0.27.0), python-lxml +Depends: ${python:Depends}, graphviz, gettext, python-logilab-mtconverter (>= 0.8.0), python-logilab-common (>= 0.54.0), python-yams (>= 0.30.1), python-rql (>= 0.27.0), python-lxml Recommends: python-simpletal (>= 4.0), python-crypto Conflicts: cubicweb-core Replaces: cubicweb-core diff -r 7dd4835d5198 -r accf5978a440 etwist/server.py --- a/etwist/server.py Wed Jan 05 15:32:37 2011 +0100 +++ b/etwist/server.py Wed Jan 05 17:47:16 2011 +0100 @@ -415,7 +415,7 @@ "commands (e.g : 'net start my_instance)'") from logilab.common.daemon import daemonize LOGGER.info('instance started in the background on %s', root_resource.base_url) - whichproc = daemonize(config['pid-file']) + whichproc = daemonize(config['pid-file'], umask=config['umask']) if whichproc: # 1 = orig process, 2 = first fork, None = second fork (eg daemon process) return whichproc # parent process root_resource.init_publisher() # before changing uid diff -r 7dd4835d5198 -r accf5978a440 server/serverctl.py --- a/server/serverctl.py Wed Jan 05 15:32:37 2011 +0100 +++ b/server/serverctl.py Wed Jan 05 17:47:16 2011 +0100 @@ -594,7 +594,7 @@ # go ! (don't daemonize in debug mode) if not os.path.exists(piddir): os.makedirs(piddir) - if not debug and daemonize(pidfile): + if not debug and daemonize(pidfile, umask=config['umask']): return uid = config['uid'] if uid is not None: