New instruction to regen nginx team file

README.md

@@ -164,9 +164,9 @@ The D Day
 ### Interact with the scheduler
 
 When you launch `launch.sh` or `launch_local.sh` script, a socket is open at
-`/tmp/test.sock`. Use `perl comm-socket.pl /tmp/test.sock` to connect to the
+`/tmp/scheduler.sock`. Use `perl comm-socket.pl /tmp/scheduler.sock` to connect
-scheduler. Consult `gen_site.pl` manual (`perldoc gen_site.pl`) for list of
+to the scheduler. Consult `gen_site.pl` manual (`perldoc gen_site.pl`) for list
-available instructions.
+of available instructions.
 
 ### More
 

TODO

@@ -11,7 +11,6 @@
 - Au moment du lancement du chrono, ouvrir la socket de communication avec le scheduler et lui ajouter la directive all:S pour regénérer toutes les équipes
 - On peut encore soumettre après la fin...
 - Gerer les espaces dans les fichiers (gen_hash_file plante)
-- Ajouter une instruction dans le scheduler pour regen le nginx des teams
 - image dans la description
 - upload/MAJ de fichiers depuis l'interface d'admin?
 - trop de thèmes dans l'interface d'admin => menu

gen_site.pl

@@ -181,6 +181,14 @@ sub manage
 		$m->stop();
 		return 1;
 	    }
+	    elsif (/^RT(E(A(M(S)?)?)?)?/)
+	    {
+		if (-x "nginx_gen_team.sh") {
+		    qx(./nginx_gen_team.sh > ./misc/shared/nginx-teams.conf)
+		} else {
+		    say "Unable to find nginx_gen_team.sh"
+		}
+	    }
 	    elsif (/^help/i)
 	    {
 		say "TODO, sorry :(";
@@ -795,7 +803,7 @@ __END__
 
 =head1 NAME
 
-Dave Null - The netiquette's guardian angel
+FIC parallel WGET
 
 =head1 USAGE
 
@@ -873,7 +881,7 @@ Generate pages for the C<11> theme for the team C<00>.
 
 =item B<reset>
 
-
+Clean the temporary directory.
 
 =item B<DSYNC>
 
@@ -892,7 +900,11 @@ Perform a C<ls> in the temporary directory content.
 
 =item B<JOIN>
 
-Flush the scheduler queue and
+Flush the scheduler queue and wait for all jobs done.
+
+=item B<RTEAMS>
+
+Regenerate the nginx file containing teams IDs.
 
 =item B<help>
 

launch.sh

@@ -22,7 +22,7 @@ KP1=$!
 
 TMPF=`mktemp`
 
-tail -f "$TMPF" | ./gen_site.pl -d -s /tmp/test.sock -o ./out ERRORS HOME all DS &
+tail -f "$TMPF" | ./gen_site.pl -d -s /tmp/scheduler.sock -o ./out ERRORS HOME all DS &
 KP2=$!
 
 trap "kill $KP1 $KP2; rm -rf '$TMPF'; echo" SIGINT SIGTERM

launch_local.sh

@@ -22,7 +22,7 @@ KP1=$!
 
 TMPF=`mktemp`
 
-tail -f "$TMPF" | ./gen_site.pl -d -s /tmp/test.sock -bt /challenge/ -ba /challenge-admin/ -o ./out ERRORS HOME all DS &
+tail -f "$TMPF" | ./gen_site.pl -d -s /tmp/scheduler.sock -bt /challenge/ -ba /challenge-admin/ -o ./out ERRORS HOME all DS &
 KP2=$!
 
 trap "kill $KP1 $KP2; rm -rf '$TMPF'; echo" SIGINT SIGTERM

onyx/config/sample.root.xml

@@ -5,6 +5,7 @@
     <var name="files_dir">/var/www/fic-server/files/</var>
     <var name="misc_dir">/var/www/fic-server/misc/</var>
     <var name="submission_dir">/var/www/fic-server/submission/</var>
+    <var name="scheduler_socket">/tmp/scheduler.sock</var>
     <var name="prefix_public">challenge-public</var>
     <var name="prefix_teams">challenge</var>
     <var name="prefix_admin">challenge-admin</var>

onyx/include/admin/import_users.php

@@ -73,7 +73,7 @@ if (!empty($_FILES["inputFile"]['tmp_name']))
 
 	  if (!$user->update())
           {
-              $error .= "Unable to add user $user->firstname $user->lastname $user->nickname </br>";
+              $error .= "Unable to add user $user->firstname $user->lastname $user->nickname<br>";
               $team->drop();
               continue;
           }