All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 8a9bbc86 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Move the project CVS repo to /proj/cvsrepos/$pid, instead of /proj/$pid/CVS

This is to support anon CVS access via the ops web server and CVS pserver.
parent 5492c5c0
...@@ -41,8 +41,9 @@ my $ADDMMLIST = "$TB/sbin/addmmlist"; ...@@ -41,8 +41,9 @@ my $ADDMMLIST = "$TB/sbin/addmmlist";
my $PROJROOT = "/proj"; my $PROJROOT = "/proj";
my $GRPROOT = "/groups"; my $GRPROOT = "/groups";
my $TFTPROOT = "/tftpboot"; my $TFTPROOT = "/tftpboot";
my $CVSREPOS = "$PROJROOT/cvsrepos";
my @DIRLIST = ("exp", "images", "logs", "deltas", "tarfiles", "rpms", my @DIRLIST = ("exp", "images", "logs", "deltas", "tarfiles", "rpms",
"groups", "tiplogs", "CVS"); "groups", "tiplogs");
my $projhead; my $projhead;
# #
...@@ -219,12 +220,25 @@ if (! -e "$TFTPROOT/proj/$pid") { ...@@ -219,12 +220,25 @@ if (! -e "$TFTPROOT/proj/$pid") {
# #
# Do the CVS stuff if its turned on. # Do the CVS stuff if its turned on.
# #
my $CVSDIR = "$PROJROOT/$pid/CVS"; if ($CVSSUPPORT) {
my $CVSDIR = "$CVSREPOS/$pid";
if ($CVSSUPPORT && -e $CVSDIR) { if (! -e "$CVSDIR") {
system("$CVSBIN -d $CVSDIR init"); if (! mkdir("$CVSDIR", 0770)) {
if ($?) { fatal("Could not make directory $CVSDIR: $!");
fatal("Could not cvs init $CVSDIR!"); }
}
if (! chmod(0770, "$CVSDIR")) {
fatal("Could not chmod directory $CVSDIR: $!");
}
if (! chown($uid, $gid, "$CVSDIR")) {
fatal("Could not chown $CVSDIR to $uid/$gid: $!");
}
if (! -e "$CVSDIR/CVSROOT") {
system("$CVSBIN -d $CVSDIR init");
if ($?) {
fatal("Could not cvs init $CVSDIR!");
}
} }
# Chown the tree. # Chown the tree.
system("$CHOWN -R ${uid}:${gid} $CVSDIR"); system("$CHOWN -R ${uid}:${gid} $CVSDIR");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment