Changeset 1690 for branches/fc13-dev/server/fedora

Timestamp:

Oct 23, 2010, 1:51:30 AM (14 years ago)

Author:

andersk

Message:

Merge r1675:1689 from trunk to branches/fc13-dev

Location:

branches/fc13-dev

Files:

• . (modified) (1 prop)
• server/fedora/config/etc/scripts (copied) (copied from trunk/server/fedora/config/etc/scripts)
• server/fedora/config/etc/sysconfig/iptables (modified) (1 diff)
• server/fedora/config/etc/sysctl.conf (modified) (1 diff)

branches/fc13-dev/server/fedora/config/etc/sysconfig/iptables

@@ -1 +1 @@
 # Generated by iptables-save v1.3.5 on Tue Jul 18 01:46:04 2006
-*mangle
-:PREROUTING ACCEPT [857:1670874]
-:INPUT ACCEPT [857:1670874]
+*filter
+:INPUT ACCEPT [0:0]
+-A INPUT -p udp -m udp --dport 161 ! -s 18.0.0.0/8 -j REJECT
 :FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [1197:347244]
-:POSTROUTING ACCEPT [1195:345719]
+:OUTPUT ACCEPT [0:0]
 COMMIT
 # Completed on Tue Jul 18 01:46:04 2006
-# Generated by iptables-save v1.3.5 on Tue Jul 18 01:46:04 2006
-*nat
-:OUTPUT ACCEPT [0:0]
-:PREROUTING ACCEPT [0:0]
-:POSTROUTING ACCEPT [0:0]
-#-A PREROUTING -p tcp -m tcp --dport 3306 -j DNAT --to-destination 18.181.0.52:3306
-#-A POSTROUTING -p tcp -m tcp -d 18.181.0.52 --dport 3306 -j MASQUERADE
-COMMIT
-# Completed on Tue Jul 18 01:46:04 2006
-# Generated by iptables-save v1.3.5 on Tue Jul 18 01:46:04 2006
-*filter
-:INPUT ACCEPT [292118:164733476]
--A INPUT -p udp -m udp --dport 161 ! -s 18.0.0.0/8 -j REJECT
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [500523:537785790]
-COMMIT
-# Completed on Tue Jul 18 01:46:04 2006

branches/fc13-dev/server/fedora/config/etc/sysctl.conf

@@ -13 +13 @@
 net.ipv4.tcp_keepalive_time = 825
 afs.GCPAGs = 0
+kernel.modprobe = /etc/scripts/modprobe