From 1f5ead321ef325b1b333d16dfeea2a8195e99230 Mon Sep 17 00:00:00 2001 From: J <91372088+jarelllama@users.noreply.github.com> Date: Fri, 20 Dec 2024 22:48:54 +0800 Subject: [PATCH] Run parked domains check daily instead of weekly --- .github/workflows/auto_retrieve.yml | 9 ++++----- .github/workflows/check_parked.yml | 6 +++--- scripts/update_readme.sh | 10 +++++----- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/auto_retrieve.yml b/.github/workflows/auto_retrieve.yml index b25c564c2..1a93e2627 100644 --- a/.github/workflows/auto_retrieve.yml +++ b/.github/workflows/auto_retrieve.yml @@ -33,11 +33,10 @@ jobs: if: ${{ ! cancelled() && needs.test.result == 'success' }} uses: ./.github/workflows/check_dead.yml - # Moved to weekly workflow - #prune-parked: - # needs: [test, prune-dead] - # if: ${{ ! cancelled() && needs.test.result == 'success' }} - # uses: ./.github/workflows/check_parked.yml + check-parked: + needs: [test, check-dead] + if: ${{ ! cancelled() && needs.test.result == 'success' }} + uses: ./.github/workflows/check_parked.yml validate: needs: [test, check-dead] diff --git a/.github/workflows/check_parked.yml b/.github/workflows/check_parked.yml index 69bdfb938..72ca9ede9 100644 --- a/.github/workflows/check_parked.yml +++ b/.github/workflows/check_parked.yml @@ -2,10 +2,10 @@ name: Check for parked domains run-name: Check for parked domains on: workflow_dispatch: - schedule: + #schedule: # Run weekly to give external organisations time to flag NRDs. - - cron: '0 4 * * 0' - #workflow_call: + # - cron: '0 4 * * 0' + workflow_call: permissions: contents: write diff --git a/scripts/update_readme.sh b/scripts/update_readme.sh index 9eba0b3a5..8cfa39ac8 100644 --- a/scripts/update_readme.sh +++ b/scripts/update_readme.sh @@ -2,7 +2,7 @@ # Updates the README.md content and statistics. -# TODO: mawk '{sum += $1} END {print sum}' can be used to print 0 when there is no value. +# Note: mawk '{sum += $1} END {print sum}' can be used to print 0 when there is no value. update_readme() { cat << EOF > README.md @@ -123,16 +123,16 @@ Resurrected domains added today: $(mawk "/${TODAY},resurrected_count/" "$DOMAIN_ ### Parked domains -Parked domains are removed weekly. A list of common parked domain messages is used to automatically detect these domains. This list can be viewed here: [parked_terms.txt](https://github.com/jarelllama/Scam-Blocklist/blob/main/config/parked_terms.txt). +Parked domains are removed daily. A list of common parked domain messages is used to automatically detect these domains. This list can be viewed here: [parked_terms.txt](https://github.com/jarelllama/Scam-Blocklist/blob/main/config/parked_terms.txt). Parked sites no longer containing any of the parked messages are assumed to be unparked and are included back into the blocklist. > [!TIP] -For list maintainers interested in integrating the parked domains as a source, a list of weekly-updated parked domains can be found here: [parked_domains.txt](https://github.com/jarelllama/Scam-Blocklist/blob/main/data/parked_domains.txt) (capped to newest 50000 entries). +For list maintainers interested in integrating the parked domains as a source, the list of parked domains can be found here: [parked_domains.txt](https://github.com/jarelllama/Scam-Blocklist/blob/main/data/parked_domains.txt) (capped to newest 50000 entries). \`\`\` text -Parked domains removed this month: $(mawk "/${THIS_MONTH},parked_count/" "$DOMAIN_LOG" | csvcut -c 3 | mawk '{sum += $1} END {print sum}') -Unparked domains added this month: $(mawk "/${THIS_MONTH},unparked_count/" "$DOMAIN_LOG" | csvcut -c 3 | mawk '{sum += $1} END {print sum}') +Parked domains removed today: $(mawk "/${TODAY},parked_count/" "$DOMAIN_LOG" | csvcut -c 3 | mawk '{sum += $1} END {print sum}') +Unparked domains added today: $(mawk "/${TODAY},unparked_count/" "$DOMAIN_LOG" | csvcut -c 3 | mawk '{sum += $1} END {print sum}') \`\`\` ## Resources / See also