Compare commits

..

6 Commits

Author SHA1 Message Date
0e428a79cc don't know why rules are broken 2025-06-27 18:43:45 -05:00
b1202e9a7d I don't know 2025-06-27 18:42:15 -05:00
ee395ba8a2 logging changes 2025-06-27 18:40:46 -05:00
79002e80bc use short SHA for version 2025-06-27 17:50:07 -05:00
7286a21464 build it 2025-06-27 17:45:43 -05:00
fdd6b2288e remove some log output 2025-06-27 17:39:47 -05:00
3 changed files with 9 additions and 24 deletions

View File

@@ -1,19 +1,8 @@
.rules-changes: &rules-changes
rules:
- changes:
- Jenkinsfile
- .gitlab-ci.yml
- README.md
- docs/*
when: never
- when: on_success
stages:
- build
"Build Release":
stage: build
<<: *rules-changes
image:
name: registry.c.test-chamber-13.lan/dockerhub/library/golang:alpine
allow_failure: false
@@ -43,19 +32,17 @@ stages:
"Create Release":
stage: build
image:
name: registry.gitlab.com/gitlab-org/release-cli:latest
<<: *rules-changes
needs:
- job: "Build Release"
artifacts: true
script:
- printf '%s\n' "Creating Release"
release:
name: Version $CI_COMMIT_TAG
tag_name: $CI_COMMIT_TAG
description: Release created using the release-cli. Release $CI_COMMIT_TAG
name: Version $CI_COMMIT_SHORT_SHA
tag_name: $CI_COMMIT_SHORT_SHA
description: Release created using the release-cli. Release $CI_COMMIT_SHORT_SHA
assets:
links:
- name: bind-response-policy-zone-creator-linux-arm

View File

@@ -57,8 +57,8 @@ sources:
- "https://raw.githubusercontent.com/dibdot/DoH-IP-blocklists/master/doh-domains.txt"
- "https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt"
- "https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-malware.txt"
- "https://big.oisd.nl/"
adBlockURLs:
- "https://big.oisd.nl"
- "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/pro.txt"
- "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/tif.txt"
- "https://github.com/KnightmareVIIVIIXC/AIO-Firebog-Blocklists/raw/main/lists/firebogadmal.txt"
@@ -77,18 +77,22 @@ allowList:
- (^|\.)apiservices\.krxd\.net$
- (^|\.)app-measurement\.com$
- (^|\.)assets\.adobedtm\.com$
- (^|\.)bato\.to$
- (^|\.)brandify\.com$
- (^|\.)clients.\.google\.com$
- (^|\.)cpng\.lol$
- (^|\.)doubleclick\.net$
- (^|\.)duckduckgo\.com$
- (^|\.)events\.data\.microsoft\.com$
- (^|\.)ghostery\.net$
- (^|\.)googleadservices\.com$
- (^|\.)kochava\.com$
- (^|\.)launchdarkly\.com$
- (^|\.)logfiles-va\.zoom\.us$
- (^|\.)logfiles\.zoom\.us$
- (^|\.)login\.live\.com$
- (^|\.)magiskmanager\.com$
- (^|\.)mimojp\.store$
- (^|\.)msn\.com$
- (^|\.)nest\.com$
- (^|\.)nexusrules\.officeapps\.live\.com$
@@ -100,8 +104,6 @@ allowList:
- (^|\.)unagi-na\.amazon\.com$
- (^|\.)unagi\.amazon\.com$
- (^|\.)vercel-dns\.com$
- (^|\.)launchdarkly\.com$
- (^|\.)mimojp\.store$
- ^\w+-\d{4}\.\w+-msedge\.net$
- ^ctldl\.windowsupdate\.com$
- ^settings-win\.data\.microsoft\.com$

View File

@@ -1,7 +1,6 @@
package main
import (
"fmt"
"regexp"
"sort"
@@ -29,15 +28,12 @@ func cleanBadDomains(domains []string) []string {
// remove duplicates
domains = removeDuplicateStr(domains)
fmt.Printf("Processing: \n")
for _, domain := range domains {
// removing trailing dots
domain = regexp.MustCompile(`\.$`).ReplaceAllString(domain, "")
// skip domains that are too long
if len([]rune(domain)) > 230 {
fmt.Printf("-")
continue
}
@@ -50,7 +46,7 @@ func cleanBadDomains(domains []string) []string {
}
}
if skip {
fmt.Printf(".")
log.Trace("Skipping Domain", "domain", domain)
continue
}