Print this page
2837 - remove print/lp* from gate and use CUPS from userland

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/logadm/tester
          +++ new/usr/src/cmd/logadm/tester
↓ open down ↓ 281 lines elided ↑ open up ↑
 282  282  # logadm typically runs early every morning via an entry in
 283  283  # root's crontab (see crontab(1)).
 284  284  #
 285  285  /var/adm/messages -C 4 -P 'Thu Nov  1 16:56:42 2001' -a 'kill -HUP `cat /var/run/*syslog*pid`'
 286  286  /var/cron/log -s 512k -t /var/cron/olog
 287  287  /var/lp/logs/lpsched -C 2 -N -t '$file.$N'
 288  288  #
 289  289  # The entry below is used by turnacct(1M)
 290  290  #
 291  291  /var/adm/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never
 292      -apache -C 24 -a '/usr/apache/bin/apachectl graceful' -p 1m -t '/var/apache/old-logs/$basename.%Y-%m' '/var/apache/logs/*{access,error}_log'
 293      -/var/log/syslog -C 8 -P 'Thu Nov  1 09:16:38 2001' -a 'kill -HUP `cat /var/run/*syslog*pid`'
 294      -/var/apache/logs/access_log -P 'Thu Nov  1 08:27:56 2001'
 295      -/var/apache/logs/error_log -P 'Thu Nov  1 08:27:56 2001'
 296      -/var/apache/logs/suexec_log -P 'Thu Nov  1 08:27:56 2001'
 297      -/var/apache/logs/mod_jserv.log -P 'Thu Nov  1 08:27:56 2001'
 298      -/var/apache/logs/jserv.log -P 'Thu Nov  1 08:27:56 2001'
      292 +apache -C 24 -a '/usr/apache2/2.2/bin/apachectl graceful' -p 1m -t '/var/apache2/2.2/old-logs/$basename.%Y-%m' '/var/apache2/2.2/logs/*{access,error}_log'
      293 +/var/apache2/2.2/logs/access_log -P 'Thu Nov  1 08:27:56 2001'
      294 +/var/apache2/2.2/logs/error_log -P 'Thu Nov  1 08:27:56 2001'
      295 +/var/apache2/2.2/logs/suexec_log -P 'Thu Nov  1 08:27:56 2001'
      296 +/var/apache2/2.2/logs/mod_jserv.log -P 'Thu Nov  1 08:27:56 2001'
      297 +/var/apache2/2.2/logs/jserv.log -P 'Thu Nov  1 08:27:56 2001'
 299  298  EOF
 300  299  }
 301  300  
 302  301  
 303  302  ###########################################################################
 304  303  #
 305  304  #       conftest1 -- minimal basic test of the conf.c code
 306  305  #
 307  306  ###########################################################################
 308  307  sub conftest1 {
↓ open down ↓ 507 lines elided ↑ open up ↑
 816  815  #
 817  816  ###########################################################################
 818  817  sub logadmV1 {
 819  818          set_testconffile;
 820  819  
 821  820          set_file('std.out.expect', <<'EOF');
 822  821  /var/adm/messages -C 4 -P 'Thu Nov  1 16:56:42 2001' -a 'kill -HUP `cat /var/run/*syslog*pid`'
 823  822  /var/cron/log -s 512k -t /var/cron/olog
 824  823  /var/lp/logs/lpsched -C 2 -N -t '$file.$N'
 825  824  /var/adm/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never
 826      -apache -C 24 -a '/usr/apache/bin/apachectl graceful' -p 1m -t '/var/apache/old-logs/$basename.%Y-%m' '/var/apache/logs/*{access,error}_log'
      825 +apache -C 24 -a '/usr/apache2/2.2/bin/apachectl graceful' -p 1m -t '/var/apache2/2.2/old-logs/$basename.%Y-%m' '/var/apache2/2.2/logs/*{access,error}_log'
 827  826  /var/log/syslog -C 8 -P 'Thu Nov  1 09:16:38 2001' -a 'kill -HUP `cat /var/run/*syslog*pid`'
 828      -/var/apache/logs/access_log -P 'Thu Nov  1 08:27:56 2001'
 829      -/var/apache/logs/error_log -P 'Thu Nov  1 08:27:56 2001'
 830      -/var/apache/logs/suexec_log -P 'Thu Nov  1 08:27:56 2001'
 831      -/var/apache/logs/mod_jserv.log -P 'Thu Nov  1 08:27:56 2001'
 832      -/var/apache/logs/jserv.log -P 'Thu Nov  1 08:27:56 2001'
      827 +/var/apache2/2.2/logs/access_log -P 'Thu Nov  1 08:27:56 2001'
      828 +/var/apache2/2.2/logs/error_log -P 'Thu Nov  1 08:27:56 2001'
      829 +/var/apache2/2.2/logs/suexec_log -P 'Thu Nov  1 08:27:56 2001'
      830 +/var/apache2/2.2/logs/mod_jserv.log -P 'Thu Nov  1 08:27:56 2001'
      831 +/var/apache2/2.2/logs/jserv.log -P 'Thu Nov  1 08:27:56 2001'
 833  832  EOF
 834  833  
 835  834          set_file('checktest', <<'EOF');
 836  835  [ -s std.err ] && { cat std.err; exit 1; }
 837  836  exec /bin/diff std.out.expect std.out
 838  837  EOF
 839  838  
 840  839          set_file('runtest', <<"EOF");
 841  840  # test "logadmV1"
 842  841  $envsetup
↓ open down ↓ 1269 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX