Added support for type ORG locker creation

[moira.git] / incremental / afs_create.pl

diff --git a/incremental/afs_create.pl b/incremental/afs_create.pl
index 7a543cef25d08fdd24dfaf358c606d29742fbbab..d453a5f1bbaf24b6df4f0131caee06f8cd32a413 100644 (file)
--- a/incremental/afs_create.pl
+++ b/incremental/afs_create.pl
@@ -22,12 +22,13 @@ $vname = $vtype . "." . $locker;
 $vname =~ s/[^-A-Za-z0-9_.]//g;                # strip out illegal characters
 
 # Find free space/Create volume
-foreach $tries (1..3) {
+$tries = 0; $code = 1;
+while ($tries<3 && $code) {
     ($asrv,$apart) = &afs_find($cell,$type,$quota,@except);
     die "Unable to find space to create $vname in $cell\n" unless ($asrv&&$apart);
     $code = system("$vos create $asrv $apart $vname -cell $cell >/dev/null");
     push(@except, $asrv);
-    next if ($code);
+    $tries++;
 }
 &fatal("Unable to create $vname in $cell") if ($code); # Too many create errors
 push(@clean, "$vos remove $asrv $apart $vname -cell $cell >/dev/null");
@@ -65,8 +66,10 @@ chop($_ = <FS>);
 close(FS);
 &fatal("Can't get information about $p") if ($?);
 @tmp = (split(/ /,$_));
-system("$vos release $tmp[$#tmp] -cell $cell >/dev/null") &&
-    &fatal("Can't release $tmp[$#tmp] in cell $cell");
+if ($tmp[$#tmp] !~ /user\../) {
+    system("$vos release $tmp[$#tmp] -cell $cell >/dev/null") &&
+       &fatal("Can't release $tmp[$#tmp] in cell $cell");
+}
 
 &afs_quota_adj($cell,$asrv,$apart,$quota);
 exit(0);
@@ -95,6 +98,8 @@ sub athena_proc
     # CONTRIB   <user> all system:anyuser rl
     # COURSE    <user> all <group> all system:facdev all system:authuser rl
     # HOMEDIR   <user> all
+    # LEASE    <user> all
+    # ORG      <user> all <group> all system:cwisfac all
     # PROJECT   <user> all <group> all
     # REF       <user> all system:anyuser rl
     # SW        <user> all system:swmaint all system:authuser rl
@@ -107,11 +112,12 @@ sub athena_proc
     @acl=("system:expunge ld");
     push(@acl,"system:facdev all") if ($type =~ /^(COURSE|UROP)/);
     push(@acl,"system:swmaint all") if ($type =~ /^(SW)/);
+    push(@acl,"system:cwisfac all") if ($type =~ /^(ORG)/);
     push(@acl,"system:administrators all") if ($type =~ /^(SYSTEM)/);
     push(@acl,"$user all")
-       if ($uid != 0 && $type =~ /^(ACTIVITY|APROJ|AREF|CONTRIB|COURSE|HOMEDIR|PROJECT|REF|SW|UROP)/);
+       if ($uid != 0 && $type =~ /^(ACTIVITY|APROJ|AREF|CONTRIB|COURSE|HOMEDIR|LEASE|ORG|PROJECT|REF|SW|UROP)/);
     push(@acl,"system:$group all")
-       if ($gid != 0 && $type =~ /^(ACTIVITY|APROJ|COURSE|PROJECT|UROP)/);
+       if ($gid != 0 && $type =~ /^(ACTIVITY|APROJ|COURSE|ORG|PROJECT|UROP)/);
     push(@acl,"system:$group rl") if ($gid != 0 && $type =~ /^(AREF)/);
     push(@acl,"system:authuser rl")
        if ($type =~ /^(COURSE|SW|UROP)/);
@@ -131,6 +137,15 @@ sub athena_proc
            die "Unable to set volume ownership\n";
     }
 
+    if ($type eq "ORG") {
+       mkdir("$path/www",0755) || die "Unable to create subdirectories\n";
+       system("$fs sa $path @acl system:anyuser rl -clear") &&
+           die "Unable to set acl on www directory\n";
+
+       system("$fs sa $path @acl system:anyuser l -clear") &&
+           die "Unable to set acl on top-level directory\n";
+    }
+
     if ($type eq "HOMEDIR") {
        die "Unable to get uid for user\n" unless ($uid);