diff options
| author | Ben Busby <contact@benbusby.com> | 2022-08-04 13:16:58 -0600 |
|---|---|---|
| committer | Ben Busby <contact@benbusby.com> | 2022-08-04 13:16:58 -0600 |
| commit | e1e46dcd9271e68492db5fe259c1593f02e7ef84 (patch) | |
| tree | d65f727bfe0e3408805857551c47266da0d93589 /.github | |
| parent | e16d4bb3308922ceafaa5aed0b15182f940e4a3f (diff) | |
| download | farside-e1e46dcd9271e68492db5fe259c1593f02e7ef84.tar.gz | |
Remove cloudflare filter from update workflow
The cloudflare filter, when performed as part of the github action
workflow, doesn't seem to work nearly as reliably when run on an actual
machine.
The farside server will instead run the un-cloudflare script whenever it
pulls in new changes to services-full.json, which should be a much more
reliable approach to filtering out cloudflare instances.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/update-instances.yml | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/.github/workflows/update-instances.yml b/.github/workflows/update-instances.yml index 17da660..7f483ac 100644 --- a/.github/workflows/update-instances.yml +++ b/.github/workflows/update-instances.yml @@ -27,33 +27,6 @@ jobs: sed -i 's/\/"/"/g' services-full.json } - function remove_cf_instances() { - rm -f out.json - file="services-full.json" - - while read -r line; do - if [[ "$line" == "\"https://"* ]]; then - domain=$(echo "$line" | sed -e "s/^\"https:\/\///" -e "s/\",//" -e "s/\"//") - ns=$(dig ns "$domain" || true) - if [[ "$ns" == *"cloudflare"* ]]; then - echo "\"$domain\" using cloudflare, skipping..." - elif [[ "$ns" != *"NOERROR"* ]]; then - echo "Unable to verify records for \"$domain\", skipping..." - else - echo "$line" >> out.json - fi - else - echo "$line" >> out.json - fi - done <$file - - # Remove any trailing commas from new instance lists - sed -i -e ':begin' -e '$!N' -e 's/,\n]/\n]/g' -e 'tbegin' -e 'P' -e 'D' out.json - - cat out.json | jq --indent 2 . > services.json - rm -f out.json - } - # ============================================================== # Git config # ============================================================== @@ -217,11 +190,6 @@ jobs: # ============================================================== # ============================================================== - # Remove cloudflare instances - # ============================================================== - remove_cf_instances - - # ============================================================== # Push changes # ============================================================== git add services.json services-full.json |