Changeset 1690


Ignore:
Timestamp:
Oct 23, 2010, 1:51:30 AM (12 years ago)
Author:
andersk
Message:
Merge r1675:1689 from trunk to branches/fc13-dev
Location:
branches/fc13-dev
Files:
16 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/fc13-dev

  • branches/fc13-dev/locker/bin

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/locker/bin/scripts-remove

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/locker/bin/signup-minimal

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/locker/bin/signup-sql

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/locker/deploy/bin

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/locker/deploy/bin/rails

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/locker/deploy/bin/trac

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/locker/deploy/bin/turbogears

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/locker/sql/bin/save-password

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/lvs/debian/config/etc/ha.d/ldirectord.cf

    r1471 r1690  
    77# iptables rules caused SMTP to use FWM 3
    88virtual=3
    9         real=18.181.0.53:25 gate 1
    10         real=18.181.0.57:25 gate 1
    11         real=18.181.0.167:25 gate 6144
    12         real=18.181.0.228:25 gate 6144
    13         real=18.181.0.234:25 gate 4096
    14         real=18.181.0.235:25 gate 4096
    15         real=18.181.0.237:25 gate 4096
     9        #real=18.181.0.53:25  gate 4096 # old-faithful
     10        #real=18.181.0.57:25  gate 4096 # better-mousetrap
     11        real=18.181.0.167:25 gate 6144 # bees-knees
     12        real=18.181.0.228:25 gate 6144 # cats-whiskers
     13        real=18.181.0.234:25 gate 4096 # busy-beaver
     14        real=18.181.0.235:25 gate 4096 # real-mccoy
     15        #real=18.181.0.237:25 gate 4096 # pancake-bunny
     16        #real=18.181.0.236:25 gate 4096 # whole-enchilada
     17        #real=18.181.0.135:25 gate 4096 # shining-armor
    1618        service=smtp
    1719        scheduler=wlc
     
    2325# Apache (80, 443, and 444) uses FWM 2
    2426virtual=2
    25         real=18.181.0.53 gate 1
    26         real=18.181.0.57 gate 1
    27         real=18.181.0.167 gate 6144
    28         real=18.181.0.228 gate 6144
    29         real=18.181.0.234 gate 4096
    30         real=18.181.0.235 gate 4096
    31         real=18.181.0.237 gate 4096
     27        real=18.181.0.53  gate 3096 # old-faithful
     28        real=18.181.0.57  gate 3096 # better-mousetrap
     29        real=18.181.0.167 gate 6144 # bees-knees
     30        real=18.181.0.228 gate 6144 # cats-whiskers
     31        real=18.181.0.234 gate 4096 # busy-beaver
     32        real=18.181.0.235 gate 4096 # real-mccoy
     33        real=18.181.0.237 gate 4096 # pancake-bunny
     34        real=18.181.0.236 gate 4096 # whole-enchilada
     35        real=18.181.0.135 gate 4096 # shining-armor
    3236        fallback=127.0.0.1 gate
    3337        service=http
     
    4347# Everything else uses FWM 1 and gets sent only to the primary
    4448virtual=1
    45         real=18.181.0.53 gate "heartbeat/services", "1"
    46         real=18.181.0.57 gate "heartbeat/services", "2"
    47         real=18.181.0.167 gate "heartbeat/services", "3"
    48         real=18.181.0.228 gate "heartbeat/services", "4"
    49         real=18.181.0.234 gate "heartbeat/services", "5"
    50         real=18.181.0.235 gate "heartbeat/services", "6"
    51         real=18.181.0.237 gate "heartbeat/services", "7"
     49        real=18.181.0.53  gate "heartbeat/services", "1" # old-faithful
     50        real=18.181.0.57  gate "heartbeat/services", "2" # better-mousetrap
     51        real=18.181.0.167 gate "heartbeat/services", "3" # bees-knees
     52        real=18.181.0.228 gate "heartbeat/services", "4" # cats-whiskers
     53        real=18.181.0.234 gate "heartbeat/services", "5" # busy-beaver
     54        real=18.181.0.235 gate "heartbeat/services", "6" # real-mccoy
     55        real=18.181.0.237 gate "heartbeat/services", "7" # pancake-bunny
     56        real=18.181.0.236 gate "heartbeat/services", "8" # whole-enchilada
     57        real=18.181.0.135 gate "heartbeat/services", "9" # shining-armor
    5258        service=http
    5359        scheduler=wrr
  • branches/fc13-dev/server/common/oursrc/execsys/execsys-binfmt

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/server/common/oursrc/php_scripts/php_scripts-config.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/server/doc/install-howto.sh

    r1681 r1690  
    297297    chkconfig httpd on
    298298
     299# nrpe is required for nagios alerts
     300    chkconfig nrpe on
     301
    299302# Check sql user credentials (needs to be done after LDAP is setup)
    300303    chown sql /etc/sql-mit-edu.cfg.php
  • branches/fc13-dev/server/fedora/config/etc/sysconfig/iptables

    r1436 r1690  
    11# Generated by iptables-save v1.3.5 on Tue Jul 18 01:46:04 2006
    2 *mangle
    3 :PREROUTING ACCEPT [857:1670874]
    4 :INPUT ACCEPT [857:1670874]
     2*filter
     3:INPUT ACCEPT [0:0]
     4-A INPUT -p udp -m udp --dport 161 ! -s 18.0.0.0/8 -j REJECT
    55:FORWARD ACCEPT [0:0]
    6 :OUTPUT ACCEPT [1197:347244]
    7 :POSTROUTING ACCEPT [1195:345719]
     6:OUTPUT ACCEPT [0:0]
    87COMMIT
    98# Completed on Tue Jul 18 01:46:04 2006
    10 # Generated by iptables-save v1.3.5 on Tue Jul 18 01:46:04 2006
    11 *nat
    12 :OUTPUT ACCEPT [0:0]
    13 :PREROUTING ACCEPT [0:0]
    14 :POSTROUTING ACCEPT [0:0]
    15 #-A PREROUTING -p tcp -m tcp --dport 3306 -j DNAT --to-destination 18.181.0.52:3306
    16 #-A POSTROUTING -p tcp -m tcp -d 18.181.0.52 --dport 3306 -j MASQUERADE
    17 COMMIT
    18 # Completed on Tue Jul 18 01:46:04 2006
    19 # Generated by iptables-save v1.3.5 on Tue Jul 18 01:46:04 2006
    20 *filter
    21 :INPUT ACCEPT [292118:164733476]
    22 -A INPUT -p udp -m udp --dport 161 ! -s 18.0.0.0/8 -j REJECT
    23 :FORWARD ACCEPT [0:0]
    24 :OUTPUT ACCEPT [500523:537785790]
    25 COMMIT
    26 # Completed on Tue Jul 18 01:46:04 2006
  • branches/fc13-dev/server/fedora/config/etc/sysctl.conf

    r1006 r1690  
    1313net.ipv4.tcp_keepalive_time = 825
    1414afs.GCPAGs = 0
     15kernel.modprobe = /etc/scripts/modprobe
Note: See TracChangeset for help on using the changeset viewer.