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