fix: migrate to malware-filter group

- BREAKING CHANGE
- gitlab.com/malware-filter/pup-filter

README.md

@@ -1,6 +1,6 @@
 # PUP Domains Blocklist
 
-> Announcement: curben.gitlab.io will be migrated to malware-filter.gitlab.io on 2022/05/21
+> Announcement (2022/05/21): curben.gitlab.io has been migrated to malware-filter.gitlab.io
 
 A blocklist of domains that host potentially unwanted programs (PUP), based on the [malware-discoverer](https://github.com/zhouhanc/malware-discoverer). Blocklist is updated twice a day.
 
@@ -21,13 +21,13 @@ There are multiple formats available, refer to the appropriate section according
 - [Snort3](#snort3)
 - [Suricata](#suricata)
 
-Not sure which format to choose? See [Compatibility](https://gitlab.com/curben/urlhaus-filter/wikis/compatibility) page.
+Not sure which format to choose? See [Compatibility](https://gitlab.com/malware-filter/urlhaus-filter/wikis/compatibility) page.
 
 Check out my other filters:
 
-- [urlhaus-filter](https://gitlab.com/curben/urlhaus-filter)
-- [phishing-filter](https://gitlab.com/curben/phishing-filter)
-- [tracking-filter](https://gitlab.com/curben/tracking-filter)
+- [urlhaus-filter](https://gitlab.com/malware-filter/urlhaus-filter)
+- [phishing-filter](https://gitlab.com/malware-filter/phishing-filter)
+- [tracking-filter](https://gitlab.com/malware-filter/tracking-filter)
 
 ## URL-based
 
@@ -440,13 +440,13 @@ This blocklist operates by blocking the **whole** website, popular websites are
 
 *Popular* websites are as listed in the [Umbrella Popularity List](https://s3-us-west-1.amazonaws.com/umbrella-static/index.html) (top 1M domains + subdomains), [Tranco List](https://tranco-list.eu/) (top 1M domains) and this [custom list](src/exclude.txt).
 
-If you wish to exclude certain website(s) that you believe is sufficiently well-known, please create an [issue](https://gitlab.com/curben/pup-filter/issues) or [merge request](https://gitlab.com/curben/pup-filter/merge_requests).
+If you wish to exclude certain website(s) that you believe is sufficiently well-known, please create an [issue](https://gitlab.com/malware-filter/pup-filter/issues) or [merge request](https://gitlab.com/malware-filter/pup-filter/merge_requests).
 
 This blocklist **only** accepts new malicious URLs from [malware-discoverer](https://github.com/zhouhanc/malware-discoverer).
 
 ## FAQ and Guides
 
-See [wiki](https://gitlab.com/curben/malware-filter/-/wikis/home)
+See [wiki](https://gitlab.com/malware-filter/malware-filter/-/wikis/home)
 
 ## License
 

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/pup-filter/-/jobs/artifacts/main/download?job=pages'
-const pipelineUrl = 'https://gitlab.com/curben/pup-filter/badges/main/pipeline.svg'
+const artifactsUrl = 'https://gitlab.com/malware-filter/pup-filter/-/jobs/artifacts/main/download?job=pages'
+const pipelineUrl = 'https://gitlab.com/malware-filter/pup-filter/badges/main/pipeline.svg'
 const ghMirror = 'https://nightly.link/curbengh/pup-filter/workflows/pages/main/public.zip'
 
 const pipelineStatus = async (url) => {

src/gitlab_status.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-ARTIFACT_STATUS=$(curl -sSIL "https://gitlab.com/curben/pup-filter/-/jobs/artifacts/main/download?job=pages" | grep -F "HTTP/2 200")
-PIPELINE_STATUS=$(curl -sSL "https://gitlab.com/curben/pup-filter/badges/main/pipeline.svg" | grep -F "failed")
+ARTIFACT_STATUS=$(curl -sSIL "https://gitlab.com/malware-filter/pup-filter/-/jobs/artifacts/main/download?job=pages" | grep -F "HTTP/2 200")
+PIPELINE_STATUS=$(curl -sSL "https://gitlab.com/malware-filter/pup-filter/badges/main/pipeline.svg" | grep -F "failed")
 GITLAB_STATUS="up"
 
 if [ -z "$ARTIFACT_STATUS" ] || [ -n "$PIPELINE_STATUS" ]; then

src/script.sh

@@ -84,10 +84,10 @@ CURRENT_TIME="$(date -R -u)"
 FIRST_LINE="! Title: PUP Domains Blocklist\n! Description: Block domains that host potentially unwanted programs (PUP)"
 SECOND_LINE="! Updated: $CURRENT_TIME"
 THIRD_LINE="! Expires: 1 day (update frequency)"
-FOURTH_LINE="! Homepage: https://gitlab.com/curben/pup-filter"
-FIFTH_LINE="! License: https://gitlab.com/curben/pup-filter#license"
+FOURTH_LINE="! Homepage: https://gitlab.com/malware-filter/pup-filter"
+FIFTH_LINE="! License: https://gitlab.com/malware-filter/pup-filter#license"
 SIXTH_LINE="! Source: https://github.com/zhouhanc/malware-discoverer"
-ANNOUNCEMENT_1="\n! Announcement: curben.gitlab.io will be migrated to malware-filter.gitlab.io on 2022/05/21"
+ANNOUNCEMENT_1="\n! Announcement (2022/05/21): curben.gitlab.io has been migrated to malware-filter.gitlab.io"
 COMMENT_UBO="$FIRST_LINE\n$SECOND_LINE\n$THIRD_LINE\n$FOURTH_LINE\n$FIFTH_LINE\n$SIXTH_LINE\n$ANNOUNCEMENT_1"
 
 mkdir -p "../public/"