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:
6 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/fc13-dev

  • 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.