Print this page
Bump Apache dependency to Apache 2

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