Ignore:
Timestamp:
Nov 16, 2011, 1:13:13 PM (12 years ago)
Author:
achernya
Message:
Merge r2039-r2054 from trunk to branches/fc15-dev
Location:
branches/fc15-dev
Files:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • branches/fc15-dev

  • branches/fc15-dev/lvs/debian/config/etc/ha.d/ldirectord-http.sh

    r1203 r2055  
    2121"
    2222echo "<html><head><title>scripts.mit.edu server status</title></head><body><h1>scripts.mit.edu server status</h1><p>The following table shows a list of the servers that are currently handling web requests for scripts.mit.edu:</p><table>"
    23 /sbin/ipvsadm -L -f 2 | sed 's/:0//; s/:Port//' | awk 'BEGIN { OFS="</td><td>" } /->/ { print "<tr><td>" $2, $4, $5, $6 "</td></tr>"}'
     23/sbin/ipvsadm | sed 's/:0//; s/:Port//' | awk 'BEGIN { OFS="</td><td>"; show=1 } /^FWM  2 / { show=1 } /^FWM  [^2] / { show=0 } /->/ { if (show==1) print "<tr><td>" $2, $4, $5, $6 "</td></tr>"}'
    2424echo "</table></body></html>"

  • branches/fc15-dev/lvs/debian/config/etc/munin/munin-node.conf

    r1359 r2055  
    1414user root
    1515group root
    16 setsid yes
     16setsid 1
    1717
    1818# Regexps for files to ignore
    1919
    20 ignore_file ~$
     20#ignore_file [#~]$  # FIX doesn't work. '#' starts a comment
     21ignore_file DEADJOE$
    2122ignore_file \.bak$
    2223ignore_file %$
    2324ignore_file \.dpkg-(tmp|new|old|dist)$
    2425ignore_file \.rpm(save|new)$
     26ignore_file \.pod$
    2527
    2628# Set this if the client doesn't report the correct hostname when

  • branches/fc15-dev/lvs/debian/config/etc/nagios/nrpe.cfg

    r1938 r2055  
    2424# user and is running in standalone mode.
    2525
    26 pid_file=/var/run/nrpe.pid
     26pid_file=/var/run/nagios/nrpe.pid
    2727
    2828
Note: See TracChangeset for help on using the changeset viewer.