Lcarr has submitted this change and it was merged.
Change subject: updating apt-proxy ip range and tftp ip range
......................................................................
updating apt-proxy ip range and tftp ip range
Change-Id: I453ac7538e45c566fbd49c1ca30e39b259247fa4
---
M files/squid/apt-proxy.conf
M manifests/misc/install-server.pp
2 files changed, 3 insertions(+), 5 deletions(-)
Approvals:
Lcarr: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/squid/apt-proxy.conf b/files/squid/apt-proxy.conf
index fc74bb2..ab08da9 100644
--- a/files/squid/apt-proxy.conf
+++ b/files/squid/apt-proxy.conf
@@ -2422,12 +2422,9 @@
acl wikimedia src 208.80.152.0/22
acl wikimedia src 91.198.174.0/24
-acl wikimedia src 198.35.26.0/28
+acl wikimedia src 198.35.26.0/22
acl wikimedia src 185.15.56.0/22
-acl wikimedia src 10.0.0.0/16
-acl wikimedia src 10.64.0.0/12
-acl wikimedia src 10.4.16.0/24
-acl wikimedia src 10.4.0.0/21
+acl wikimedia src 10.0.0.0/8
# TAG: follow_x_forwarded_for
# Note: This option is only available if Squid is rebuilt with the
diff --git a/manifests/misc/install-server.pp b/manifests/misc/install-server.pp
index 7cec180..4b02ae1 100644
--- a/manifests/misc/install-server.pp
+++ b/manifests/misc/install-server.pp
@@ -52,6 +52,7 @@
/sbin/iptables -A tftp -s 10.0.0.0/8 -j ACCEPT;
/sbin/iptables -A tftp -s 208.80.152.0/22 -j ACCEPT;
/sbin/iptables -A tftp -s 91.198.174.0/24 -j ACCEPT;
+ /sbin/iptables -A tftp -s 198.35.26.0/22 -j ACCEPT;
/sbin/iptables -A tftp -j DROP;
/sbin/iptables -I INPUT -p udp --dport tftp -j tftp
'
--
To view, visit https://gerrit.wikimedia.org/r/84867
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I453ac7538e45c566fbd49c1ca30e39b259247fa4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr <lc...@wikimedia.org>
Gerrit-Reviewer: Lcarr <lc...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
