From 453da69a014c7115f55feaba36a27e0914bf0df8 Mon Sep 17 00:00:00 2001 From: Nicholas Kumia Date: Wed, 30 Aug 2023 14:47:26 -0400 Subject: [PATCH 1/2] refactor: sort domains from tld to subdomain Reference: https://serverfault.com/a/364372 --- egress/acl/development.allow.acl | 26 +++++++++++++------------- egress/acl/prod.allow.acl | 24 ++++++++++++------------ egress/acl/staging.allow.acl | 26 +++++++++++++------------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/egress/acl/development.allow.acl b/egress/acl/development.allow.acl index f3ac63c50..01cae32f9 100644 --- a/egress/acl/development.allow.acl +++ b/egress/acl/development.allow.acl @@ -1,23 +1,23 @@ -*.gov +s3-us-gov-west-1.amazonaws.com *.hub.arcgis.com -*.mil *.opendata.arcgis.com -*.tigbox.com +services3.arcgis.com bloomington.data.socrata.com -data.arlingtonva.us +nycopendata.socrata.com +*.tigbox.com +*.gov +*.mil +www.chapelhillopendata.org data.cityofchicago.org data.lacity.org data.muni.org +opendataphilly.org +www.opendataphilly.org +openei.org +portal.opentopography.org data.sfgov.org +dataworks.siouxfalls.org data.srcity.org data.townofcary.org data.wprdc.org -dataworks.siouxfalls.org -nycopendata.socrata.com -opendataphilly.org -openei.org -portal.opentopography.org -s3-us-gov-west-1.amazonaws.com -services3.arcgis.com -www.chapelhillopendata.org -www.opendataphilly.org +data.arlingtonva.us diff --git a/egress/acl/prod.allow.acl b/egress/acl/prod.allow.acl index ab41d5fd6..9bfa6e9c5 100644 --- a/egress/acl/prod.allow.acl +++ b/egress/acl/prod.allow.acl @@ -1,22 +1,22 @@ -*.gov +s3-us-gov-west-1.amazonaws.com *.hub.arcgis.com -*.mil *.opendata.arcgis.com +services3.arcgis.com bloomington.data.socrata.com -data.arlingtonva.us +nycopendata.socrata.com +*.gov +*.mil +www.chapelhillopendata.org data.cityofchicago.org data.lacity.org data.muni.org +opendataphilly.org +www.opendataphilly.org +openei.org +portal.opentopography.org data.sfgov.org +dataworks.siouxfalls.org data.srcity.org data.townofcary.org data.wprdc.org -dataworks.siouxfalls.org -nycopendata.socrata.com -opendataphilly.org -openei.org -portal.opentopography.org -s3-us-gov-west-1.amazonaws.com -services3.arcgis.com -www.chapelhillopendata.org -www.opendataphilly.org +data.arlingtonva.us diff --git a/egress/acl/staging.allow.acl b/egress/acl/staging.allow.acl index f3ac63c50..01cae32f9 100644 --- a/egress/acl/staging.allow.acl +++ b/egress/acl/staging.allow.acl @@ -1,23 +1,23 @@ -*.gov +s3-us-gov-west-1.amazonaws.com *.hub.arcgis.com -*.mil *.opendata.arcgis.com -*.tigbox.com +services3.arcgis.com bloomington.data.socrata.com -data.arlingtonva.us +nycopendata.socrata.com +*.tigbox.com +*.gov +*.mil +www.chapelhillopendata.org data.cityofchicago.org data.lacity.org data.muni.org +opendataphilly.org +www.opendataphilly.org +openei.org +portal.opentopography.org data.sfgov.org +dataworks.siouxfalls.org data.srcity.org data.townofcary.org data.wprdc.org -dataworks.siouxfalls.org -nycopendata.socrata.com -opendataphilly.org -openei.org -portal.opentopography.org -s3-us-gov-west-1.amazonaws.com -services3.arcgis.com -www.chapelhillopendata.org -www.opendataphilly.org +data.arlingtonva.us From 37134cddada5cc44caa1cff7c8e0ca09e2a011ef Mon Sep 17 00:00:00 2001 From: Nicholas Kumia Date: Wed, 30 Aug 2023 15:32:51 -0400 Subject: [PATCH 2/2] refactor: recursively sort by SLD, not TLD per @fuhuxia suggestion --- egress/acl/development.allow.acl | 46 ++++++++++++++++---------------- egress/acl/prod.allow.acl | 44 +++++++++++++++--------------- egress/acl/staging.allow.acl | 46 ++++++++++++++++---------------- 3 files changed, 68 insertions(+), 68 deletions(-) diff --git a/egress/acl/development.allow.acl b/egress/acl/development.allow.acl index 01cae32f9..e9b2a1a56 100644 --- a/egress/acl/development.allow.acl +++ b/egress/acl/development.allow.acl @@ -1,23 +1,23 @@ -s3-us-gov-west-1.amazonaws.com -*.hub.arcgis.com -*.opendata.arcgis.com -services3.arcgis.com -bloomington.data.socrata.com -nycopendata.socrata.com -*.tigbox.com -*.gov -*.mil -www.chapelhillopendata.org -data.cityofchicago.org -data.lacity.org -data.muni.org -opendataphilly.org -www.opendataphilly.org -openei.org -portal.opentopography.org -data.sfgov.org -dataworks.siouxfalls.org -data.srcity.org -data.townofcary.org -data.wprdc.org -data.arlingtonva.us + *.gov + *.mil + s3-us-gov-west-1.amazonaws.com + *.hub.arcgis.com + *.opendata.arcgis.com + services3.arcgis.com + data.arlingtonva.us + www.chapelhillopendata.org + data.cityofchicago.org + data.lacity.org + data.muni.org + opendataphilly.org + www.opendataphilly.org + openei.org + portal.opentopography.org + data.sfgov.org + dataworks.siouxfalls.org + bloomington.data.socrata.com + nycopendata.socrata.com + data.srcity.org + *.tigbox.com + data.townofcary.org + data.wprdc.org diff --git a/egress/acl/prod.allow.acl b/egress/acl/prod.allow.acl index 9bfa6e9c5..16246e4d9 100644 --- a/egress/acl/prod.allow.acl +++ b/egress/acl/prod.allow.acl @@ -1,22 +1,22 @@ -s3-us-gov-west-1.amazonaws.com -*.hub.arcgis.com -*.opendata.arcgis.com -services3.arcgis.com -bloomington.data.socrata.com -nycopendata.socrata.com -*.gov -*.mil -www.chapelhillopendata.org -data.cityofchicago.org -data.lacity.org -data.muni.org -opendataphilly.org -www.opendataphilly.org -openei.org -portal.opentopography.org -data.sfgov.org -dataworks.siouxfalls.org -data.srcity.org -data.townofcary.org -data.wprdc.org -data.arlingtonva.us + *.gov + *.mil + s3-us-gov-west-1.amazonaws.com + *.hub.arcgis.com + *.opendata.arcgis.com + services3.arcgis.com + www.chapelhillopendata.org + data.cityofchicago.org + data.lacity.org + data.muni.org + opendataphilly.org + www.opendataphilly.org + openei.org + portal.opentopography.org + data.sfgov.org + dataworks.siouxfalls.org + bloomington.data.socrata.com + nycopendata.socrata.com + data.srcity.org + data.townofcary.org + data.wprdc.org + data.arlingtonva.us diff --git a/egress/acl/staging.allow.acl b/egress/acl/staging.allow.acl index 01cae32f9..e1610ae1a 100644 --- a/egress/acl/staging.allow.acl +++ b/egress/acl/staging.allow.acl @@ -1,23 +1,23 @@ -s3-us-gov-west-1.amazonaws.com -*.hub.arcgis.com -*.opendata.arcgis.com -services3.arcgis.com -bloomington.data.socrata.com -nycopendata.socrata.com -*.tigbox.com -*.gov -*.mil -www.chapelhillopendata.org -data.cityofchicago.org -data.lacity.org -data.muni.org -opendataphilly.org -www.opendataphilly.org -openei.org -portal.opentopography.org -data.sfgov.org -dataworks.siouxfalls.org -data.srcity.org -data.townofcary.org -data.wprdc.org -data.arlingtonva.us + *.gov + *.mil + s3-us-gov-west-1.amazonaws.com + *.hub.arcgis.com + *.opendata.arcgis.com + services3.arcgis.com + www.chapelhillopendata.org + data.cityofchicago.org + data.lacity.org + data.muni.org + opendataphilly.org + www.opendataphilly.org + openei.org + portal.opentopography.org + data.sfgov.org + dataworks.siouxfalls.org + bloomington.data.socrata.com + nycopendata.socrata.com + data.srcity.org + *.tigbox.com + data.townofcary.org + data.wprdc.org + data.arlingtonva.us