# HG changeset patch
# User devi
# Date 1137190361 -7200
# Node ID 93e98a3fa44d79b276c72d5c154ad8224647d56f
# Parent  187b6636a3be6bfcccc32f803f2fba8123138746
Наконец-то пофиксил неверное определение присутствия l3-agent в FreeBSD

diff -r 187b6636a3be -r 93e98a3fa44d l3-agent
--- a/l3-agent	Wed Dec 28 18:44:42 2005 +0200
+++ b/l3-agent	Sat Jan 14 00:12:41 2006 +0200
@@ -968,7 +968,7 @@
 				unlink $Config{agent_pidfile}
 					or die "Can't remove stale pidfile ". $Config{agent_pidfile}. " : $!";
 			}
-			elsif ($^O eq 'freebsd' && $pid && `ps axo uid,pid,command | grep '$<.*$pid.*$Config{"l3-agent"}' 2> /dev/null`) {
+			elsif ($^O eq 'freebsd' && $pid && `ps axo uid,pid,command | grep '$<\\s*$pid\\s*$Config{"l3-agent"}' 2> /dev/null`) {
 				print "Removing stale pidfile\n";
 				unlink $Config{agent_pidfile}
 					or die "Can't remove stale pidfile ". $Config{agent_pidfile}. " : $!";
diff -r 187b6636a3be -r 93e98a3fa44d l3config.pm
--- a/l3config.pm	Wed Dec 28 18:44:42 2005 +0200
+++ b/l3config.pm	Sat Jan 14 00:12:41 2006 +0200
@@ -14,123 +14,125 @@
 
 
 our %Config = (
-		"skip_empty" 			=> 	"yes",
-		"skip_interrupted" 		=>	"no",
-		"skip_wrong" 			=>	"no",
-		"editors"			=>	["vi", "pico", "ee", "vim", "nano"],
-		"pagers"			=>	["more", "less", "zmore", "zless", "info", 
-							"man", "mc", "trafshow", "screen", "cfdisk",
-							"trafshow-bsd", "yes", "lynx", "links", "centericq"
-							],
-		"terminal"			=>	["mc"],
-		"suppress_editors"		=>	"yes",
-		"suppress_pagers"		=>	"yes",
-		"suppress_terminal"		=>	"yes",
+	"skip_empty"		=> "yes",
+	"skip_interrupted"	=> "no",
+	"skip_wrong" 		=> "no",
+	"editors"		    => ["vi", "pico", "ee", "vim", "nano"],
+	"pagers"		    => ["more", "less", "zmore", "zless", "info", 
+				        "man", "mc", "trafshow", "screen", "cfdisk",
+				        "trafshow-bsd", "yes", "lynx", "links", "centericq"
+				        ],
+	"terminal"		    => ["mc"],
+	"suppress_editors"	=> "yes",
+	"suppress_pagers"	=> "yes",
+	"suppress_terminal"	=> "yes",
 
-		"terminal_width"		=> 	400,
-		"terminal_height"		=> 	100,
-		"verbose"			=>	"yes",
+	"terminal_width"	=> 400,
+	"terminal_height"	=> 100,
+	"verbose"		    => "yes",
 
-		"head_lines"			=> 	5,
-		"tail_lines"			=>	5,
-		"cache_head_lines"		=> 	50,
-		"cache_tail_lines"		=>	50,
-		"skip_text"			=>	"...",
-		"show_time"			=>	"yes",
-		"show_diffs"			=>	"yes",
-		"show_comments"			=>	"yes",
-		"show_notes"			=>	"yes",
+	"head_lines"		=> 5,
+	"tail_lines"		=> 5,
+	"cache_head_lines"	=> 50,
+	"cache_tail_lines"	=> 50,
+	"skip_text"		    => "...",
+	"show_time"		    => "yes",
+	"show_diffs"		=> "yes",
+	"show_comments"		=> "yes",
+	"show_notes"		=> "yes",
 
-		"input"				=>	"$ENV{HOME}/.lilalo",
-		"diffs"				=>	"",
-		"input_mask"			=>	"*.script",
-		"encoding"			=> 	"utf-8",
+	"input"			=> "$ENV{HOME}/.lilalo",
+	"diffs"			=> "",
+	"input_mask"		=> "*.script",
+	"encoding"		=> "utf-8",
 
-		"cache"				=>	"$ENV{HOME}/.lilalo/report.xml",
-		"cache_stat"			=>	"$ENV{HOME}/.lilalo/.report.dat",
+	"cache"			=> "$ENV{HOME}/.lilalo/report.xml",
+	"cache_stat"		=> "$ENV{HOME}/.lilalo/.report.dat",
 
-		"output"			=>	"/tmp/report.html",
-		"output_mask"			=>	"INDEX",
-		"output_format"			=>	"html",
-		"frontend_css"			=>	"/l3/l3.css",
-		"frontend_google_ico"		=>	"/l3/google.ico",
-		"frontend_linux_ico"		=>	"/l3/linux.ico",
-		"frontend_freebsd_ico"		=>	"/l3/freebsd.ico",
-		"frontend_opennet_ico"		=>	"/l3/opennet.ico",
-		"frontend_local_ico"		=>	"/l3/freebsd.ico",
+	"output"		=> "/tmp/report.html",
+	"output_mask"		=> "INDEX",
+	"output_format"		=> "html",
+	"frontend_css"		=> "/l3/l3.css",
+	"frontend_google_ico"	=> "/l3/google.ico",
+	"frontend_linux_ico"	=> "/l3/linux.ico",
+	"frontend_freebsd_ico"	=> "/l3/freebsd.ico",
+	"frontend_opennet_ico"	=> "/l3/opennet.ico",
+	"frontend_local_ico"	=> "/l3/freebsd.ico",
 
-		"mywi_server"			=>	"127.0.0.1",
-		"mywi_port"			=> 	"19801",
+	"mywi_server"		=> "127.0.0.1",
+	"mywi_port"		=> "19801",
 
-		"stat_inactivity_interval"	=>	"1800",
-		
-		"signature"			=>	"#lm:",
-		"from"				=>	"",
-		"to"				=>	"",
-		"lab"				=>	"",
-		"keywords"			=>	"linux command",
-		"files_keywords"		=>	"linux file",
-		
-		comment_width			=>	"300",
-		note_width			=>	"500",
-		time_width			=>	"60",
-		
-		"mode"				=>	"daemon",		# daemon | normal
-		"daemon_sleep_interval"		=>	"1",
-		"detach"			=>	"yes",
-		"agent_pidfile"			=> 	"$ENV{HOME}/.lilalo/l3-agent.pid",
+	"stat_inactivity_interval"	=>	"1800",
 
-		"backend_address"		=>	"192.168.15.254",
-		"backend_port"			=> 	"18030",
-		"backend_pidfile"		=> 	"/tmp/l3-backend.pid",
-		"backend_datafile"		=> 	"/var/lilalo/lablogs-xml/backend.xml",
+	"signature"		=> "#lm:",
+	"from"			=> "",
+	"to"			=> "",
+	"lab"			=> "",
+	"keywords"		=> "linux command",
+	"files_keywords"	=> "linux file",
 
-		"l3-agent"			=>	"l3-agent", 
-		"l3-backend"			=>	"l3-backend", 
-		
-		"course-name" => "", 
-		"course-code" => "", 
-		"course-date" => "", 
-		"course-center" => "", 
-		"course-trainer" => "", 
-		"course-student" => "", 
+	comment_width		=> "300",
+	note_width		=> "500",
+	time_width		=> "60",
 
-		"filter" => "",
-		#lm
-		"show_host" 	=> "no",
+	"mode"			=> "daemon",		# daemon | normal
+	"daemon_sleep_interval"	=> "10",
+	"detach"		=> "yes",
+	"agent_pidfile"		=> "$ENV{HOME}/.lilalo/l3-agent.pid",
 
-		# Вспомогательные программы
-		#"l3-report"	=> "./lm-report",
-		"l3-report"	=> "./l3-report",
+	"backend_address"	=> "192.168.15.254",
+	"backend_port"		=> "18030",
+	"backend_pidfile"	=> "/tmp/l3-backend.pid",
+	"backend_datafile"	=> "/var/lilalo/lablogs-xml/backend.xml",
 
-		# Каталоги
-		"path_lilalo" => "/var/lilalo/",
-		"path_classes"	=> "/var/lilalo/classes/",
-		"path_lablogs"	=> "/var/lilalo/lablogs/",
-		"courses_path"	=> "/var/lilalo/courses/",
-		"outpath"	=> "/var/lilalo/out/",
-		"path_web"	=> "/var/www/l3",		# Путь к web-отчётам
-		"path_share"	=> "./share/",		# Путь к web-отчётам
+	"l3-agent"		=> "l3-agent", 
+	"l3-backend"		=> "l3-backend", 
 
-		# Файлы
-		"runfile"	=> "lm.run", 
-		"logfile"	=> "lm.log", 
+	"course-name" 		=> "", 
+	"course-code" 		=> "", 
+	"course-date" 		=> "", 
+	"course-center" 	=> "", 
+	"course-trainer" 	=> "", 
+	"course-student" 	=> "", 
 
-		"class" 	=> "class", 				# Имя файла класса
-		"class_suffix" 	=> ".xml", 				# Cуффикс файла класса
-		"classfile"	=> "",
+	"filter" 		=> "",
+#lm
+	"show_host" 		=> "no",
 
-		"sshkey"	=> "$ENV{HOME}/.ssh/id_dsa.pub",
-		"lmssh"		=> "./lm-ssh",
-		"lminstall"	=> "./lm-install",
-		"ssh_user"	=> "root",
+# Вспомогательные программы
+#"l3-report"	=> "./lm-report",
+	"l3-report"		=> "./l3-report",
 
-		"l3scripts"	=> "l3scripts",
-		
+# Каталоги
+	"path_lilalo" 		=> "/var/lilalo/",
+	"path_classes"		=> "/var/lilalo/classes/",
+	"path_lablogs"		=> "/var/lilalo/lablogs/",
+	"courses_path"		=> "/var/lilalo/courses/",
+	"outpath"		=> "/var/lilalo/out/",
+	"path_web"		=> "/var/www/l3",	# Путь к web-отчётам
+	"path_share"		=> "./share/",		# Путь к web-отчётам
 
-		"cgi_path_info" => "",
-		"cgi2file"	=> "",
-		);
+# Файлы
+	"runfile"		=> "lm.run", 
+	"logfile"		=> "lm.log", 
+
+	"class" 		=> "class", 		# Имя файла класса
+	"class_suffix" 		=> ".xml", 		# Cуффикс файла класса
+	"classfile"		=> "",
+
+	"sshkey"		=> "$ENV{HOME}/.ssh/id_dsa.pub",
+	"lmssh"			=> "./lm-ssh",
+	"lminstall"		=> "./lm-install",
+	"ssh_user"		=> "root",
+
+	"l3scripts"		=> "l3scripts",
+
+
+	"cgi_path_info" 	=> "",
+	"cgi2file"		=> "",
+
+    "year"      =>  "2006",
+);
 
 sub read_config_file
 {
diff -r 187b6636a3be -r 93e98a3fa44d l3scripts
--- a/l3scripts	Wed Dec 28 18:44:42 2005 +0200
+++ b/l3scripts	Sat Jan 14 00:12:41 2006 +0200
@@ -7,8 +7,8 @@
 
 ###install-pm
 scp PM/* $ssh_user@$host:/tmp
-#ssh $ssh_user@$host 'cd /tmp; tar xfz Term-VT102*.gz; cd Term-VT102*[^z]; perl Makefile.PL; make ; make install'
-ssh $ssh_user@$host 'cd /tmp; tar xfz Text-Iconv*.gz; cd Text-Iconv*[^z]; perl Makefile.PL; make ; make install'
+ssh $ssh_user@$host 'cd /tmp; tar xfz Term-VT102*.gz; cd Term-VT102*[^z]; perl Makefile.PL; make ; make install'
+#ssh $ssh_user@$host 'cd /tmp; tar xfz Text-Iconv*.gz; cd Text-Iconv*[^z]; perl Makefile.PL; make ; make install'
 
 ###copy-lablogs
 for i in $dirs