Changeset 355 for cleverbox/trunk

Timestamp:

07/13/09 13:07:27 (13 months ago)

Author:

trivoallan

Message:

Fixed SVN permission issues.

Location:

cleverbox/trunk/cleverbox

Files:

• model/project.py (modified) (1 diff)
• utils/filesystem.py (modified) (1 diff)

cleverbox/trunk/cleverbox/model/project.py

@@ -278 +278 @@
         os.path.join(environment.get_path(), 'projects-available', client_name + '-' + project_name)   : (0640, 'root', 'root'),
         os.path.join(clients_root, client_name, 'htdocs', project_name)                                : (0770, 'root', 'www-data'),
-        os.path.join(clients_root, client_name, 'var', 'svn', project_name)                            : (0750, 'root', 'www-data'),
-        os.path.join(clients_root, client_name, 'var', 'svn', project_name, 'db')                      : (0770, 'root', 'www-data'),
+        os.path.join(clients_root, client_name, 'var', 'svn', project_name)                            : (0770, 'root', 'www-data'),
         os.path.join(clients_root, client_name, 'var', 'trac', project_name)                           : (0770, 'root', 'www-data'),
         os.path.join(clients_root, client_name, 'var', 'trac', project_name, 'db')                     : (0770, 'root', 'www-data'),
         os.path.join(clients_root, client_name, 'var', 'trac', project_name, 'db', 'trac.db')          : (0770, 'root', 'www-data'),
         os.path.join(clients_root, client_name, 'var', 'trac', project_name, 'attachments')            : (0770, 'root', 'www-data'),
-        os.path.join(clients_root, client_name, 'var', 'trac', project_name, 'conf', 'trac.ini')       : (0640, 'root', 'www-data'),
+        os.path.join(clients_root, client_name, 'var', 'trac', project_name, 'conf', 'trac.ini')       : (0660, 'root', 'www-data'),
     }
 
     filesystem.set_permissions(permissions)
+
+    # Since filesystem.set_permissions does not handle recursion, svn/db dir is modified is done manually
+    filesystem.chowntree(
+        os.path.join(clients_root, client_name, 'var', 'svn', project_name, 'db'), 
+        filesystem.get_uid_from_name('root'), 
+        filesystem.get_gid_from_name('www-data')
+    )
+    os.path.walk(os.path.join(clients_root, client_name, 'var', 'svn', project_name, 'db'), filesystem.chmodtree, 0770) 
 
     print "  Perms fixed\n"

cleverbox/trunk/cleverbox/utils/filesystem.py

@@ -43 +43 @@
         print "rchown %s: %s" % (str(directory), str(why))
 
+def chmodtree(arg, dirname, fnames):
+    """ To be used with os.path.walk. """
+
+    os.chmod(dirname, arg)
+    for file in fnames:
+        os.chmod(os.path.join(dirname, file), arg)
+
+
 def get_uid_from_name(username):
     """