my-privacy-dns/adblocker-rules
my-privacy-dns
/
adblocker-rules
1
0
Fork 0
Code Wiki

Why do the runner keep searching for framagit?

This commit is contained in:
Spirillen 2023-03-22 15:43:56 +01:00
parent 0a658ad9e1
commit eb8e3e04b1
No known key found for this signature in database
GPG Key ID: 30562ED6FB236E4E
8 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitlab-ci.yml
View File

@ -11,7 +11,7 @@ before_script:
- apt-get install -yqqf bash git pgp python3-pip python3.10 rsync npm
- git config --global user.email "spirillen@danwin1210.de"
- git config --global user.name "spirillen"
- git remote set-url origin https://spirillen:$mypdns_CI_ACCESS_TOKEN@0xacab.org/$CI_PROJECT_PATH.git
- git remote set-url origin https://spirillen:$CI_ACCESS_TOKEN@0xacab.org/$CI_PROJECT_PATH.git
# - python --version # For debugging
- if [ -f requirements.txt ]; then python3.10 -m pip install --no-cache -I -r requirements.txt; fi
@ -24,7 +24,7 @@ after_script:
- git add _public/blockrules.txt
- git commit -m "AdBlocker list updated. BuildID $CI_JOB_ID [ci-skip]"
- git pull --rebase
- git push "https://spirillen:${mypdns_CI_ACCESS_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_REF_NAME}" -o skip-ci
- git push "https://spirillen:${CI_ACCESS_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_REF_NAME}" -o skip-ci
- git status
run:
@ -36,7 +36,7 @@ run:
# - git add _public/blockrules.txt
# - git commit -m "AdBlocker list updated. BuildID $BUILD"
# - git pull --rebase
# - git push "https://spirillen:${mypdns_CI_ACCESS_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_REF_NAME}" -o skip-ci
# - git push "https://spirillen:${CI_ACCESS_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_REF_NAME}" -o skip-ci
pages:
stage: deploy
@ -55,4 +55,5 @@ pages:
paths:
- public
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
#- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH

24
README.md
View File

@ -31,7 +31,7 @@ filters/rules (uBlock Origin) or User Rules (AdGuard).
## Webfront
Our HTML front end can be found at
- Framagit: <https://my-privacy-dns.frama.io/adblocker-rules/>
- 0xacab: <https://my-privacy-dns.frama.io/adblocker-rules/>
- GitHub: <https://mypdns.github.io/adblocker-rules/>
@ -39,25 +39,25 @@ Our HTML front end can be found at
[Click here to activate these rules in you uBlock Origin][Subscribe]
The following Lnks will provide you with different resulting filters.
Framagit Editions should be the most advanced and compressed thanks to
0xacab Editions should be the most advanced and compressed thanks to
the @adguard/hostlist-compiler compiler, where the GH editions relay on
the abp filter script.
- Framagit edition via [adblocker.mypdns.org][Subscribe]
- Framagit edition via [my-privacy-dns.frama.io][Subscribefg]
- 0xacab edition via [adblocker.mypdns.org][Subscribe]
- 0xacab edition via [my-privacy-dns.frama.io][Subscribefg]
- Github edition via [mypdns.github.io][Subscribegh]
You should also be able to subscripbe directly to the rules by
right-click any of the following urls, choose <uBlock Origin> =>
<Subscribe to the filterlist>
- <a href="abp:subscribe?location=https://adblocker.mypdns.org/adblocker-rules/blockrules.txt&title=My%20Privacy%20DNS%20%E2%80%93%20Adblock%20Rules&requiresLocation=https://adblocker.mypdns.org/adblocker-rules/blockrules.txt&requiresTitle=My%20Privacy%20DNS%20%E2%80%93%20Adblock%20Rules%20%E2%80%93%20Framagit%20Edition"
title="Subscribe to My Privacy DNS adblocker rurless (Framagit
edition)">adblocker.mypdns.org | Adblock Rules (Framagit edition)
- <a href="abp:subscribe?location=https://adblocker.mypdns.org/adblocker-rules/blockrules.txt&title=My%20Privacy%20DNS%20%E2%80%93%20Adblock%20Rules&requiresLocation=https://adblocker.mypdns.org/adblocker-rules/blockrules.txt&requiresTitle=My%20Privacy%20DNS%20%E2%80%93%20Adblock%20Rules%20%E2%80%93%200xacab%20Edition"
title="Subscribe to My Privacy DNS adblocker rurless (0xacab
edition)">adblocker.mypdns.org | Adblock Rules (0xacab edition)
</a>
- <a href="abp:subscribe?location=https://my-privacy-dns.frama.io/adblocker-rules/blockrules.txt&title=My%20Privacy%20DNS%20–%20Adblock%20Rules&requiresLocation=https://0xacab.org/my-privacy-dns/adblocker-rules/blockrules.txt&requiresTitle=My%20Privacy%20DNS%20–%20Adblock%20Rules%20%E2%80%93%20Framagit%20Edition"
target="_top" title="Subscribe this list to adblockers (Framagit
edition)">my-privacy-dns.frama.io | Adblock Rules (Framagit edition)
- <a href="abp:subscribe?location=https://my-privacy-dns.frama.io/adblocker-rules/blockrules.txt&title=My%20Privacy%20DNS%20–%20Adblock%20Rules&requiresLocation=https://0xacab.org/my-privacy-dns/adblocker-rules/blockrules.txt&requiresTitle=My%20Privacy%20DNS%20–%20Adblock%20Rules%20%E2%80%93%200xacab%20Edition"
target="_top" title="Subscribe this list to adblockers (0xacab
edition)">my-privacy-dns.frama.io | Adblock Rules (0xacab edition)
</a>
- <a href="abp:subscribe?location=https://mypdns.github.io/adblocker-rules/blockrules.txt&title=My%20Privacy%20DNS%20–%20Adblock%20Rules&requiresLocation=https://mypdns.github.io/adblocker-rules/blockrules.txt&requiresTitle=My%20Privacy%20DNS%20–%20Adblock%20Rules%20%E2%80%93%20Github%20Edition"
target="_top" title="Subscribe to My Privacy DNS adblocker rurles
@ -210,8 +210,8 @@ spreading the knowledge of how rules should be made :smiley:
[issues]: https://spirillen.atlassian.net/jira/software/c/projects/UBOR/issues
[commits]: https://gitlab.com/my-external-stuff/ublock-origin-rules
[support]: https://spirillen.atlassian.net/jira/software/c/projects/UBOR/pages
[Subscribe]: abp:subscribe?location=https://adblocker.mypdns.org/adblocker-rules/blockrules.txt&title=My%20Privacy%20DNS%20%E2%80%93%20Framagit%20Edition%20%E2%80%93%20Adblock%20Rules
[Subscribefg]: abp:subscribe?location=https://my-privacy-dns.frama.io/adblocker-rules/blockrules.txt&title=My%20Privacy%20DNS%20%E2%80%93%20Framagit%20Edition%20%E2%80%93%20Adblock%20Rules
[Subscribe]: abp:subscribe?location=https://adblocker.mypdns.org/adblocker-rules/blockrules.txt&title=My%20Privacy%20DNS%20%E2%80%93%200xacab%20Edition%20%E2%80%93%20Adblock%20Rules
[Subscribefg]: abp:subscribe?location=https://my-privacy-dns.frama.io/adblocker-rules/blockrules.txt&title=My%20Privacy%20DNS%20%E2%80%93%200xacab%20Edition%20%E2%80%93%20Adblock%20Rules
[Subscribegh]: abp:subscribe?location=https://mypdns.github.io/adblocker-rules/blockrules.txt&title=My%20Privacy%20DNS%20%E2%80%93%20Github%20Edition%20%E2%80%93%20Adblock%20Rules
<!-- External Links -->

6
_public/index.html
View File

@ -9,7 +9,7 @@
<meta name="author" content="@spirillen">
<link rel="preload" href="style.css">
<link rel="stylesheet" href="style.css">
<link rel="license" href="https://0xacab.org/my-privacy-dns/adblocker-rules-/blob/master/LICENSE">
<link rel="license" href="https://0xacab.org/my-privacy-dns/adblocker-rules/-/blob/master/LICENSE">
<link rel="prefetch" href="https://0xacab.org/">
<meta name="description" content="adblocking rules by My Privacy DNS">
<meta name="keywords" content="ad blocking, anti tracking, privacy, my privacy dns, tracking protection">
@ -58,12 +58,12 @@
<ul>
<li>
Framagit edition via
0xacab edition via
<a href="abp:subscribe?location=https://adblocker.mypdns.org/adblocker-rules/blockrules.txt&title=My%20Privacy%20DNS%20–%20Adblock%20Rules&requiresLocation=https://0xacab.org/my-privacy-dns/adblocker-rules/blockrules.txt&requiresTitle=My%20Privacy%20DNS%20–%20Adblock%20Rules"
target="_top" title="Subscribe this list to adblocker">adblocker.mypdns.org</a>
</li>
<li>
Framagit edition via
0xacab edition via
<a href="abp:subscribe?location=https://my-privacy-dns.frama.io/adblocker-rules/blockrules.txt&title=My%20Privacy%20DNS%20–%20Adblock%20Rules&requiresLocation=https://0xacab.org/my-privacy-dns/adblocker-rules/blockrules.txt&requiresTitle=My%20Privacy%20DNS%20–%20Adblock%20Rules"
target="_top" title="Subscribe this list to adblocker">my-privacy-dns.frama.io</a>
</li>

4
adblocker-rules.template
View File

@ -11,7 +11,7 @@
! Redirect: https://my-privacy-dns.frama.io/adblocker-rules/blockrules.txt
!
! License:
! https://0xacab.org/my-privacy-dns/adblocker-rules-/blob/master/LICENSE
! https://0xacab.org/my-privacy-dns/adblocker-rules/-/blob/master/LICENSE
! Homepage: https://0xacab.org/my-privacy-dns/adblocker-rules
!
! Please report any unblocked content or problems on the Issue board.
@ -35,7 +35,7 @@
! - https://spirillen.youtrack.cloud/users/spirillen
! - The individual lists maintainers
! - The individual contributor
! https://0xacab.org/my-privacy-dns/adblocker-rules-/network/master
! https://0xacab.org/my-privacy-dns/adblocker-rules/activity
!
! Description: This list is originally thought as a private project
! between two friends @spirillen and @AnonymousPoster

2
flrender.sh
View File

@ -34,7 +34,7 @@ sed -i -e "s/\! BuildID:/\! BuildID: $BUILD/g" _public/blockrules.txt
head -n 5 _public/blockrules.txt
# git add _public/blockrules.txt && git commit -am "New build"
# git push "https://spirillen:${mypdns_CI_ACCESS_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_REF_NAME}" -o skip-ci
# git push "https://spirillen:${CI_ACCESS_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_REF_NAME}" -o skip-ci
# Copyright: https://mypdns.org/
# Content: https://mypdns.org/spirillen/

4
rules/noise.txt
View File

@ -5,7 +5,7 @@
! https://0xacab.org/my-privacy-dns/adblocker-rules-/tree/master/rules/noise.txt
!
! License:
! https://0xacab.org/my-privacy-dns/adblocker-rules-/blob/master/LICENSE
! https://0xacab.org/my-privacy-dns/adblocker-rules/-/blob/master/LICENSE
! Homepage: https://0xacab.org/my-privacy-dns/adblocker-rules
!
! Please report any unblocked content or problems on the Issue board.
@ -30,7 +30,7 @@
! - https://spirillen.jetbrains.space/m/spirillen
! - The individual lists maintainers
! - The individual contributor
! - https://0xacab.org/my-privacy-dns/adblocker-rules-/network/master
! - https://0xacab.org/my-privacy-dns/adblocker-rules/activity
! WARNING!!!!
! Notice, The following filters, WILL bring the sites down from fully function

4
template_header.txt
View File

@ -1,7 +1,7 @@
!
! License:
! MCRAE GENERAL PUBLIC LICENSE (version 4.r53m2)
! https://0xacab.org/my-privacy-dns/adblocker-rules-/blob/master/LICENSE
! https://0xacab.org/my-privacy-dns/adblocker-rules/-/blob/master/LICENSE
! Homepage: https://0xacab.org/my-privacy-dns/adblocker-rules
!
! Please report any unblocked content or problems on the Issue board.
@ -27,4 +27,4 @@
! - https://spirillen.jetbrains.space/m/spirillen
! - The individual lists maintainers
! - The individual contributor
! https://0xacab.org/my-privacy-dns/adblocker-rules-/network/master
! https://0xacab.org/my-privacy-dns/adblocker-rules/activity

5
tools/hostlistcompiler.sh
View File

@ -1,6 +1,7 @@
#!/usr/bin/env sh
set -e -x
set -e
# set -x
BUILD="$(git rev-parse --short HEAD)"
GIT_DIR="$(git rev-parse --show-toplevel)"
@ -23,4 +24,4 @@ echo ""
# git add _public/blockrules.txt
# git commit -m "AdBlocker list updated. BuildID $BUILD"
# git pull --rebase
# git push "https://spirillen:${mypdns_CI_ACCESS_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_REF_NAME} [skip-ci]"
# git push "https://spirillen:${CI_ACCESS_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_REF_NAME} [skip-ci]"