1.1 --- a/l3config.pm	Thu Dec 22 11:56:06 2005 +0200
     1.2 +++ b/l3config.pm	Sat Jan 14 17:55:48 2006 +0200
     1.3 @@ -14,123 +14,125 @@
     1.4  
     1.5  
     1.6  our %Config = (
     1.7 -		"skip_empty" 			=> 	"yes",
     1.8 -		"skip_interrupted" 		=>	"no",
     1.9 -		"skip_wrong" 			=>	"no",
    1.10 -		"editors"			=>	["vi", "pico", "ee", "vim", "nano"],
    1.11 -		"pagers"			=>	["more", "less", "zmore", "zless", "info", 
    1.12 -							"man", "mc", "trafshow", "screen", "cfdisk",
    1.13 -							"trafshow-bsd", "yes", "lynx", "links", "centericq"
    1.14 -							],
    1.15 -		"terminal"			=>	["mc"],
    1.16 -		"suppress_editors"		=>	"yes",
    1.17 -		"suppress_pagers"		=>	"yes",
    1.18 -		"suppress_terminal"		=>	"yes",
    1.19 +	"skip_empty"		=> "yes",
    1.20 +	"skip_interrupted"	=> "no",
    1.21 +	"skip_wrong" 		=> "no",
    1.22 +	"editors"		    => ["vi", "pico", "ee", "vim", "nano"],
    1.23 +	"pagers"		    => ["more", "less", "zmore", "zless", "info", 
    1.24 +				        "man", "mc", "trafshow", "screen", "cfdisk",
    1.25 +				        "trafshow-bsd", "yes", "lynx", "links", "centericq"
    1.26 +				        ],
    1.27 +	"terminal"		    => ["mc"],
    1.28 +	"suppress_editors"	=> "yes",
    1.29 +	"suppress_pagers"	=> "yes",
    1.30 +	"suppress_terminal"	=> "yes",
    1.31  
    1.32 -		"terminal_width"		=> 	400,
    1.33 -		"terminal_height"		=> 	100,
    1.34 -		"verbose"			=>	"yes",
    1.35 +	"terminal_width"	=> 400,
    1.36 +	"terminal_height"	=> 100,
    1.37 +	"verbose"		    => "yes",
    1.38  
    1.39 -		"head_lines"			=> 	5,
    1.40 -		"tail_lines"			=>	5,
    1.41 -		"cache_head_lines"		=> 	50,
    1.42 -		"cache_tail_lines"		=>	50,
    1.43 -		"skip_text"			=>	"...",
    1.44 -		"show_time"			=>	"yes",
    1.45 -		"show_diffs"			=>	"yes",
    1.46 -		"show_comments"			=>	"yes",
    1.47 -		"show_notes"			=>	"yes",
    1.48 +	"head_lines"		=> 5,
    1.49 +	"tail_lines"		=> 5,
    1.50 +	"cache_head_lines"	=> 50,
    1.51 +	"cache_tail_lines"	=> 50,
    1.52 +	"skip_text"		    => "...",
    1.53 +	"show_time"		    => "yes",
    1.54 +	"show_diffs"		=> "yes",
    1.55 +	"show_comments"		=> "yes",
    1.56 +	"show_notes"		=> "yes",
    1.57  
    1.58 -		"input"				=>	"$ENV{HOME}/.lilalo",
    1.59 -		"diffs"				=>	"",
    1.60 -		"input_mask"			=>	"*.script",
    1.61 -		"encoding"			=> 	"utf-8",
    1.62 +	"input"			=> "$ENV{HOME}/.lilalo",
    1.63 +	"diffs"			=> "",
    1.64 +	"input_mask"		=> "*.script",
    1.65 +	"encoding"		=> "utf-8",
    1.66  
    1.67 -		"cache"				=>	"$ENV{HOME}/.lilalo/report.xml",
    1.68 -		"cache_stat"			=>	"$ENV{HOME}/.lilalo/.report.dat",
    1.69 +	"cache"			=> "$ENV{HOME}/.lilalo/report.xml",
    1.70 +	"cache_stat"		=> "$ENV{HOME}/.lilalo/.report.dat",
    1.71  
    1.72 -		"output"			=>	"/tmp/report.html",
    1.73 -		"output_mask"			=>	"INDEX",
    1.74 -		"output_format"			=>	"html",
    1.75 -		"frontend_css"			=>	"/l3/l3.css",
    1.76 -		"frontend_google_ico"		=>	"/l3/google.ico",
    1.77 -		"frontend_linux_ico"		=>	"/l3/linux.ico",
    1.78 -		"frontend_freebsd_ico"		=>	"/l3/freebsd.ico",
    1.79 -		"frontend_opennet_ico"		=>	"/l3/opennet.ico",
    1.80 -		"frontend_local_ico"		=>	"/l3/freebsd.ico",
    1.81 +	"output"		=> "/tmp/report.html",
    1.82 +	"output_mask"		=> "INDEX",
    1.83 +	"output_format"		=> "html",
    1.84 +	"frontend_css"		=> "/l3/l3.css",
    1.85 +	"frontend_google_ico"	=> "/l3/google.ico",
    1.86 +	"frontend_linux_ico"	=> "/l3/linux.ico",
    1.87 +	"frontend_freebsd_ico"	=> "/l3/freebsd.ico",
    1.88 +	"frontend_opennet_ico"	=> "/l3/opennet.ico",
    1.89 +	"frontend_local_ico"	=> "/l3/freebsd.ico",
    1.90  
    1.91 -		"mywi_server"			=>	"127.0.0.1",
    1.92 -		"mywi_port"			=> 	"19801",
    1.93 +	"mywi_server"		=> "127.0.0.1",
    1.94 +	"mywi_port"		=> "19801",
    1.95  
    1.96 -		"stat_inactivity_interval"	=>	"1800",
    1.97 -		
    1.98 -		"signature"			=>	"#lm:",
    1.99 -		"from"				=>	"",
   1.100 -		"to"				=>	"",
   1.101 -		"lab"				=>	"",
   1.102 -		"keywords"			=>	"linux command",
   1.103 -		"files_keywords"		=>	"linux file",
   1.104 -		
   1.105 -		comment_width			=>	"300",
   1.106 -		note_width			=>	"500",
   1.107 -		time_width			=>	"60",
   1.108 -		
   1.109 -		"mode"				=>	"daemon",		# daemon | normal
   1.110 -		"daemon_sleep_interval"		=>	"1",
   1.111 -		"detach"			=>	"yes",
   1.112 -		"agent_pidfile"			=> 	"$ENV{HOME}/.lilalo/l3-agent.pid",
   1.113 +	"stat_inactivity_interval"	=>	"1800",
   1.114  
   1.115 -		"backend_address"		=>	"192.168.15.254",
   1.116 -		"backend_port"			=> 	"18030",
   1.117 -		"backend_pidfile"		=> 	"/tmp/l3-backend.pid",
   1.118 -		"backend_datafile"		=> 	"/var/lilalo/lablogs-xml/backend.xml",
   1.119 +	"signature"		=> "#lm:",
   1.120 +	"from"			=> "",
   1.121 +	"to"			=> "",
   1.122 +	"lab"			=> "",
   1.123 +	"keywords"		=> "linux command",
   1.124 +	"files_keywords"	=> "linux file",
   1.125  
   1.126 -		"l3-agent"			=>	"l3-agent", 
   1.127 -		"l3-backend"			=>	"l3-backend", 
   1.128 -		
   1.129 -		"course-name" => "", 
   1.130 -		"course-code" => "", 
   1.131 -		"course-date" => "", 
   1.132 -		"course-center" => "", 
   1.133 -		"course-trainer" => "", 
   1.134 -		"course-student" => "", 
   1.135 +	comment_width		=> "300",
   1.136 +	note_width		=> "500",
   1.137 +	time_width		=> "60",
   1.138  
   1.139 -		"filter" => "",
   1.140 -		#lm
   1.141 -		"show_host" 	=> "no",
   1.142 +	"mode"			=> "daemon",		# daemon | normal
   1.143 +	"daemon_sleep_interval"	=> "10",
   1.144 +	"detach"		=> "yes",
   1.145 +	"agent_pidfile"		=> "$ENV{HOME}/.lilalo/l3-agent.pid",
   1.146  
   1.147 -		# Вспомогательные программы
   1.148 -		#"l3-report"	=> "./lm-report",
   1.149 -		"l3-report"	=> "./l3-report",
   1.150 +	"backend_address"	=> "192.168.15.254",
   1.151 +	"backend_port"		=> "18030",
   1.152 +	"backend_pidfile"	=> "/tmp/l3-backend.pid",
   1.153 +	"backend_datafile"	=> "/var/lilalo/lablogs-xml/backend.xml",
   1.154  
   1.155 -		# Каталоги
   1.156 -		"path_lilalo" => "/var/lilalo/",
   1.157 -		"path_classes"	=> "/var/lilalo/classes/",
   1.158 -		"path_lablogs"	=> "/var/lilalo/lablogs/",
   1.159 -		"courses_path"	=> "/var/lilalo/courses/",
   1.160 -		"outpath"	=> "/var/lilalo/out/",
   1.161 -		"path_web"	=> "/var/www/l3",		# Путь к web-отчётам
   1.162 -		"path_share"	=> "./share/",		# Путь к web-отчётам
   1.163 +	"l3-agent"		=> "l3-agent", 
   1.164 +	"l3-backend"		=> "l3-backend", 
   1.165  
   1.166 -		# Файлы
   1.167 -		"runfile"	=> "lm.run", 
   1.168 -		"logfile"	=> "lm.log", 
   1.169 +	"course-name" 		=> "", 
   1.170 +	"course-code" 		=> "", 
   1.171 +	"course-date" 		=> "", 
   1.172 +	"course-center" 	=> "", 
   1.173 +	"course-trainer" 	=> "", 
   1.174 +	"course-student" 	=> "", 
   1.175  
   1.176 -		"class" 	=> "class", 				# Имя файла класса
   1.177 -		"class_suffix" 	=> ".xml", 				# Cуффикс файла класса
   1.178 -		"classfile"	=> "",
   1.179 +	"filter" 		=> "",
   1.180 +#lm
   1.181 +	"show_host" 		=> "no",
   1.182  
   1.183 -		"sshkey"	=> "$ENV{HOME}/.ssh/id_dsa.pub",
   1.184 -		"lmssh"		=> "./lm-ssh",
   1.185 -		"lminstall"	=> "./lm-install",
   1.186 -		"ssh_user"	=> "root",
   1.187 +# Вспомогательные программы
   1.188 +#"l3-report"	=> "./lm-report",
   1.189 +	"l3-report"		=> "./l3-report",
   1.190  
   1.191 -		"l3scripts"	=> "l3scripts",
   1.192 -		
   1.193 +# Каталоги
   1.194 +	"path_lilalo" 		=> "/var/lilalo/",
   1.195 +	"path_classes"		=> "/var/lilalo/classes/",
   1.196 +	"path_lablogs"		=> "/var/lilalo/lablogs/",
   1.197 +	"courses_path"		=> "/var/lilalo/courses/",
   1.198 +	"outpath"		=> "/var/lilalo/out/",
   1.199 +	"path_web"		=> "/var/www/l3",	# Путь к web-отчётам
   1.200 +	"path_share"		=> "./share/",		# Путь к web-отчётам
   1.201  
   1.202 -		"cgi_path_info" => "",
   1.203 -		"cgi2file"	=> "",
   1.204 -		);
   1.205 +# Файлы
   1.206 +	"runfile"		=> "lm.run", 
   1.207 +	"logfile"		=> "lm.log", 
   1.208 +
   1.209 +	"class" 		=> "class", 		# Имя файла класса
   1.210 +	"class_suffix" 		=> ".xml", 		# Cуффикс файла класса
   1.211 +	"classfile"		=> "",
   1.212 +
   1.213 +	"sshkey"		=> "$ENV{HOME}/.ssh/id_dsa.pub",
   1.214 +	"lmssh"			=> "./lm-ssh",
   1.215 +	"lminstall"		=> "./lm-install",
   1.216 +	"ssh_user"		=> "root",
   1.217 +
   1.218 +	"l3scripts"		=> "l3scripts",
   1.219 +
   1.220 +
   1.221 +	"cgi_path_info" 	=> "",
   1.222 +	"cgi2file"		=> "",
   1.223 +
   1.224 +    "year"      =>  "2006",
   1.225 +);
   1.226  
   1.227  sub read_config_file
   1.228  {