Ticket #6604: configurable-umask.patch

trac/util/daemon.py

@@ -17 +17 @@
 import sys
 
 def daemonize(pidfile=None, progname=None, stdin='/dev/null',
-              stdout='/dev/null', stderr='/dev/null'):
+              stdout='/dev/null', stderr='/dev/null', umask=022):
     """Fork a daemon process."""
 
     if pidfile:
@@ -50 +50 @@
 
     # Decouple from parent environment
     os.chdir('/')
-    os.umask(0)
+    os.umask(umask)
     os.setsid()
 
     # Perform second fork

trac/web/standalone.py

@@ -169 +169 @@
         parser.add_option('--pidfile', action='store',
                           dest='pidfile',
                           help='When daemonizing, file to which to write pid')
+        parser.add_option('--umask', action='store', type='int', dest='umask',
+                          metavar='MASK',
+                          help='When daemonizing, file mode creation mask '
+                          'to use (default 022)')
 
     parser.set_defaults(port=None, hostname='', base_path='', daemonize=False,
-                        protocol='http')
+                        protocol='http', umask=022)
     options, args = parser.parse_args()
 
     if not args and not options.env_parent_dir:
@@ -243 +247 @@
 
     try:
         if options.daemonize:
-            daemon.daemonize(pidfile=options.pidfile, progname='tracd')
+            daemon.daemonize(pidfile=options.pidfile, progname='tracd',
+                             umask=options.umask)
 
         if options.autoreload:
             def modification_callback(file):