diff --git a/src/build.js b/src/build.js index c4ecb95..71dcb27 100644 --- a/src/build.js +++ b/src/build.js @@ -14,8 +14,8 @@ const rootPath = join(__dirname, '..') const tmpPath = join(rootPath, 'tmp') const publicPath = join(rootPath, 'public') const zipPath = join(tmpPath, 'artifacts.zip') -const artifactsUrl = 'https://gitlab.com/curben/tracking-filter/-/jobs/artifacts/main/download?job=pages' -const pipelineUrl = 'https://gitlab.com/curben/tracking-filter/badges/main/pipeline.svg' +const artifactsUrl = 'https://gitlab.com/malware-filter/tracking-filter/-/jobs/artifacts/main/download?job=pages' +const pipelineUrl = 'https://gitlab.com/malware-filter/tracking-filter/badges/main/pipeline.svg' const ghMirror = 'https://nightly.link/curbengh/tracking-filter/workflows/pages/main/public.zip' const pipelineStatus = async (url) => { diff --git a/src/gitlab_status.sh b/src/gitlab_status.sh index c777ec0..f16d3b8 100644 --- a/src/gitlab_status.sh +++ b/src/gitlab_status.sh @@ -1,7 +1,7 @@ #!/bin/sh -ARTIFACT_STATUS=$(curl -sSIL "https://gitlab.com/curben/tracking-filter/-/jobs/artifacts/main/download?job=pages" | grep -F "HTTP/2 200") -PIPELINE_STATUS=$(curl -sSL "https://gitlab.com/curben/tracking-filter/badges/main/pipeline.svg" | grep -F "failed") +ARTIFACT_STATUS=$(curl -sSIL "https://gitlab.com/malware-filter/tracking-filter/-/jobs/artifacts/main/download?job=pages" | grep -F "HTTP/2 200") +PIPELINE_STATUS=$(curl -sSL "https://gitlab.com/malware-filter/tracking-filter/badges/main/pipeline.svg" | grep -F "failed") GITLAB_STATUS="up" if [ -z "$ARTIFACT_STATUS" ] || [ -n "$PIPELINE_STATUS" ]; then diff --git a/src/script.sh b/src/script.sh index 3a9d75a..a8a2bf1 100644 --- a/src/script.sh +++ b/src/script.sh @@ -40,12 +40,10 @@ CURRENT_TIME="$(date -R -u)" FIRST_LINE="! Title: Tracking JS Blocklist" SECOND_LINE="! Updated: $CURRENT_TIME" THIRD_LINE="! Expires: 7 day (update frequency)" -FOURTH_LINE="! Homepage: https://gitlab.com/curben/tracking-filter" -FIFTH_LINE="! License: https://gitlab.com/curben/tracking-filter#license" +FOURTH_LINE="! Homepage: https://gitlab.com/malware-filter/tracking-filter" +FIFTH_LINE="! License: https://gitlab.com/malware-filter/tracking-filter#license" SIXTH_LINE="! Source: https://github.com/duckduckgo/tracker-radar" -ANNOUNCEMENT_1="\n! 2021/01/08: There has been a major change to the mirrors, check the repo for the new mirrors." -ANNOUNCEMENT_2="! Old mirrors will be deprecated in 3 months. The main download link \"curben.gitlab.io/malware-filter/\" _is not affected_." -COMMENT_UBO="$FIRST_LINE\n$SECOND_LINE\n$THIRD_LINE\n$FOURTH_LINE\n$FIFTH_LINE\n$SIXTH_LINE\n$ANNOUNCEMENT_1\n$ANNOUNCEMENT_2" +COMMENT_UBO="$FIRST_LINE\n$SECOND_LINE\n$THIRD_LINE\n$FOURTH_LINE\n$FIFTH_LINE\n$SIXTH_LINE" mkdir -p "../public/"