[dw-ops] * Update jaunty to use old-releases in APT

[mark]

[commit: http://hg.dwscoalition.org/dw-ops/rev/1ab64b9ef609]

* Update jaunty to use old-releases in APT
* Remove the 20-connection-limit for now
* Update the blacklist

Files modified:

• puppet/modules/apt/templates/dreamwidth.erb
• puppet/modules/iptables/templates/dreamwidth.erb
• puppet/modules/iptables/templates/spamhaus-drop.erb

--------------------------------------------------------------------------------
diff -r d17477388439 -r 1ab64b9ef609 puppet/modules/apt/templates/dreamwidth.erb
--- a/puppet/modules/apt/templates/dreamwidth.erb	Tue Jan 03 21:38:36 2012 +0000
+++ b/puppet/modules/apt/templates/dreamwidth.erb	Mon Feb 13 19:47:29 2012 +0000
@@ -1,8 +1,10 @@
-deb http://<%= apt_uri %>/archive.ubuntu.com/ubuntu <%= ubuntu_release %> main restricted universe
-deb-src http://<%= apt_uri %>/archive.ubuntu.com/ubuntu <%= ubuntu_release %> main restricted universe
+deb http://<%= apt_uri %>/old-releases.ubuntu.com/ubuntu <%= ubuntu_release %> main restricted universe
+deb-src http://<%= apt_uri %>/old-releases.ubuntu.com/ubuntu <%= ubuntu_release %> main restricted universe
 
-deb http://<%= apt_uri %>/archive.ubuntu.com/ubuntu <%= ubuntu_release %>-updates main restricted universe
-deb-src http://<%= apt_uri %>/archive.ubuntu.com/ubuntu <%= ubuntu_release %>-updates main restricted universe
+deb http://<%= apt_uri %>/old-releases.ubuntu.com/ubuntu <%= ubuntu_release %>-updates main restricted universe
+deb-src http://<%= apt_uri %>/old-releases.ubuntu.com/ubuntu <%= ubuntu_release %>-updates main restricted universe
 
-deb http://<%= apt_uri %>/security.ubuntu.com/ubuntu <%= ubuntu_release %>-security main restricted universe
-deb-src http://<%= apt_uri %>/security.ubuntu.com/ubuntu <%= ubuntu_release %>-security main restricted universe
+#deb http://<%= apt_uri %>/security.ubuntu.com/ubuntu <%= ubuntu_release %>-security main restricted universe
+#deb-src http://<%= apt_uri %>/security.ubuntu.com/ubuntu <%= ubuntu_release %>-security main restricted universe
+
+deb http://repo.varnish-cache.org/ubuntu/ lucid varnish-3.0
diff -r d17477388439 -r 1ab64b9ef609 puppet/modules/iptables/templates/dreamwidth.erb
--- a/puppet/modules/iptables/templates/dreamwidth.erb	Tue Jan 03 21:38:36 2012 +0000
+++ b/puppet/modules/iptables/templates/dreamwidth.erb	Mon Feb 13 19:47:29 2012 +0000
@@ -44,7 +44,7 @@
 -A OUTPUT -d 80.223.173.181/32 -j DROP
 
 # Per-host connection limit on port 80
--A INPUT -p tcp --dport 80 -m connlimit --connlimit-above 20 --connlimit-mask 32 -j DROP
+#-A INPUT -p tcp --dport 80 -m connlimit --connlimit-above 20 --connlimit-mask 32 -j DROP
 
 <% end -%>
 # Accepts all established inbound connections
diff -r d17477388439 -r 1ab64b9ef609 puppet/modules/iptables/templates/spamhaus-drop.erb
--- a/puppet/modules/iptables/templates/spamhaus-drop.erb	Tue Jan 03 21:38:36 2012 +0000
+++ b/puppet/modules/iptables/templates/spamhaus-drop.erb	Mon Feb 13 19:47:29 2012 +0000
@@ -24,12 +24,14 @@
 136.228.0.0/16
 138.43.0.0/16
 139.167.0.0/16
+14.192.0.0/19
 140.170.0.0/16
 141.136.17.0/24
 141.136.22.0/24
 141.136.27.0/24
 143.135.0.0/16
 143.49.0.0/16
+146.185.212.0/24
 146.185.245.0/24
 148.105.0.0/16
 148.178.0.0/16
@@ -52,6 +54,7 @@
 170.75.0.0/16
 174.138.144.0/20
 178.218.128.0/20
+186.190.224.0/21
 188.170.192.0/21
 188.212.0.0/20
 188.247.135.0/24
@@ -95,6 +98,7 @@
 193.105.245.0/24
 193.106.172.0/22
 193.106.32.0/22
+193.107.16.0/22
 193.110.136.0/24
 193.111.235.0/24
 193.142.244.0/24
@@ -111,8 +115,8 @@
 193.243.166.0/24
 193.27.232.0/23
 193.27.246.0/23
+193.39.78.0/24
 193.41.38.0/24
-193.42.149.0/24
 193.43.134.0/24
 193.46.211.0/24
 194.0.221.0/24
@@ -132,6 +136,7 @@
 194.28.44.0/22
 194.54.156.0/22
 194.60.205.0/24
+194.60.242.0/24
 194.63.144.0/22
 194.8.74.0/23
 195.114.8.0/23
@@ -139,6 +144,7 @@
 195.149.88.0/24
 195.162.6.0/23
 195.182.57.0/24
+195.184.86.0/23
 195.190.157.0/24
 195.191.102.0/23
 195.2.212.0/23
@@ -159,13 +165,11 @@
 195.95.151.0/24
 195.95.155.0/24
 196.32.216.0/21
-198.12.32.0/19
 198.13.0.0/20
 198.151.152.0/22
 198.162.208.0/20
 198.181.64.0/19
 198.183.32.0/19
-198.186.16.0/20
 198.186.25.0/24
 198.20.16.0/20
 198.204.0.0/21
@@ -237,7 +241,6 @@
 205.142.104.0/22
 205.144.0.0/20
 205.144.176.0/20
-205.145.192.0/19
 205.159.180.0/24
 205.172.244.0/22
 205.175.160.0/19
@@ -278,6 +281,9 @@
 216.151.192.0/20
 216.212.192.0/19
 31.11.43.0/24
+31.184.226.0/24
+31.184.227.0/24
+31.184.237.0/24
 31.222.200.0/21
 41.221.112.0/20
 46.161.29.0/24
@@ -314,15 +320,17 @@
 85.202.160.0/20
 85.202.192.0/20
 85.255.112.0/20
+86.55.210.0/23
+86.55.96.0/23
 88.135.64.0/20
 88.214.211.0/24
 89.114.9.0/24
 89.114.97.0/24
-89.136.223.0/24
 89.45.14.0/24
 91.193.192.0/22
 91.193.72.0/22
 91.194.0.0/23
+91.194.214.0/23
 91.195.10.0/23
 91.196.216.0/22
 91.196.232.0/22
@@ -388,6 +396,7 @@
 91.216.73.0/24
 91.217.153.0/24
 91.217.162.0/24
+91.217.178.0/24
 91.217.249.0/24
 91.220.0.0/24
 91.220.62.0/24
@@ -395,7 +404,10 @@
 91.221.98.0/23
 91.226.78.0/24
 91.228.132.0/24
+91.229.46.0/23
 91.229.90.0/23
+91.230.143.0/24
+91.232.235.0/24
 93.120.32.0/19
 93.168.18.0/23
 93.168.20.0/23
@@ -412,11 +424,13 @@
 94.60.122.0/23
 94.61.247.0/24
 94.63.146.0/24
+94.63.147.0/24
 94.63.149.0/24
 94.63.150.0/23
+94.63.240.0/24
 94.63.241.0/24
 94.63.243.0/24
-94.63.244.0/23
+94.63.244.0/24
 94.63.245.0/24
 94.63.246.0/24
 94.63.247.0/24
--------------------------------------------------------------------------------