mirrors/fediverse-blocklists
1
0
Fork 0
mirror of https://codeberg.org/oliphant/blocklists.git synced 2025-02-02 14:12:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

automated commit on 2023-05-01 00:18:07

Browse source
This commit is contained in:
Oliphant 2023-05-01 00:18:07 +00:00
parent 943c5496f1
commit 73d5af3f8a
18 changed files with 149 additions and 149 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
RUNNING.md
View file

@ -7,8 +7,8 @@ python3 -m pip install fediblockhole
2. Clone this Repo
```bash
mkdir /fediblockhole
cd /fediblockhole
mkdir -p /opt/fediblockhole/logs && mkdir /opt/fediblockhole/exports
cd /opt/fediblockhole
git clone https://codeberg.org/oliphant/blocklists.git .
```

26
config/100.percent.conf.toml
View file

@ -14,21 +14,21 @@ blocklist_instance_sources = []
# max_severity tells the parser to override any severities that are higher than this value
# import_fields tells the parser to only import that set of fields from a specific source
blocklist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/pleroma.envs.net.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/turtle.garden.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/union.place.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/sunny.garden.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/toot.wales.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/mastodon.art.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/rage.love.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/artisan.chat.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/solarpunk.moe.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/pleroma.envs.net.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/turtle.garden.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/union.place.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/sunny.garden.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/toot.wales.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/mastodon.art.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/rage.love.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/artisan.chat.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/solarpunk.moe.csv', format = 'csv' },
]
# assumes a git pull will proceed this check and bring down the most recent allowlist
allowlist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/birdsite.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/birdsite.csv', format = 'csv' },
]
# List of instances to write blocklist to
@ -40,10 +40,10 @@ blocklist_instance_destinations = [
save_intermediate = false
## Directory to store the local blocklist copies
savedir = '/fediblockhole/blocklists/'
savedir = '/opt/fediblockhole/blocklists/'
## File to save the fully merged blocklist into
blocklist_savefile = '/fediblockhole/blocklists/100.percent.csv'
blocklist_savefile = '/opt/fediblockhole/blocklists/100.percent.csv'
## Don't push blocklist to instances, even if they're defined above
no_push_instance = true

26
config/council.tier0.conf.toml
View file

@ -14,21 +14,21 @@ blocklist_instance_sources = []
# max_severity tells the parser to override any severities that are higher than this value
# import_fields tells the parser to only import that set of fields from a specific source
blocklist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/pleroma.envs.net.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/turtle.garden.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/union.place.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/sunny.garden.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/toot.wales.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/mastodon.art.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/rage.love.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/artisan.chat.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/solarpunk.moe.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/pleroma.envs.net.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/turtle.garden.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/union.place.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/sunny.garden.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/toot.wales.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/mastodon.art.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/rage.love.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/artisan.chat.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/solarpunk.moe.csv', format = 'csv' },
]
# assumes a git pull will proceed this check and bring down the most recent allowlist
allowlist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/birdsite.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/birdsite.csv', format = 'csv' },
]
# List of instances to write blocklist to
@ -40,10 +40,10 @@ blocklist_instance_destinations = [
save_intermediate = false
## Directory to store the local blocklist copies
savedir = '/fediblockhole/blocklists/'
savedir = '/opt/fediblockhole/blocklists/'
## File to save the fully merged blocklist into
blocklist_savefile = '/fediblockhole/blocklists/tier0-council.csv'
blocklist_savefile = '/opt/fediblockhole/blocklists/tier0-council.csv'
## Don't push blocklist to instances, even if they're defined above
no_push_instance = true

8
config/example-server-export.conf.toml
View file

@ -14,7 +14,7 @@ blocklist_instance_sources = []
# max_severity tells the parser to override any severities that are higher than this value
# import_fields tells the parser to only import that set of fields from a specific source
blocklist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/_unified_tier0_blocklist.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/_unified_tier0_blocklist.csv', format = 'csv' },
]
# List of instances to write blocklist to
@ -23,17 +23,17 @@ blocklist_instance_destinations = [
]
allowlist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
]
## Store a local copy of the remote blocklists after we fetch them
save_intermediate = false
## Directory to store the local blocklist copies
savedir = '/fediblockhole/blocklists/'
savedir = '/opt/fediblockhole/blocklists/'
## File to save the fully merged blocklist into
blocklist_savefile = '/fediblockhole/exports/example_server_blocklist.csv'
blocklist_savefile = '/opt/fediblockhole/exports/example_server_blocklist.csv'
## Don't push blocklist to instances, even if they're defined above
no_push_instance = false

12
config/ms-noblock.conf.toml
View file

@ -14,7 +14,7 @@ blocklist_instance_sources = []
# max_severity tells the parser to override any severities that are higher than this value
# import_fields tells the parser to only import that set of fields from a specific source
blocklist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/_unified_tier0_blocklist.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/_unified_tier0_blocklist.csv', format = 'csv' },
]
# List of instances to write blocklist to
@ -23,19 +23,19 @@ blocklist_instance_destinations = [
]
allowlist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/birdsite.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/mastodon.social.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/birdsite.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/mastodon.social.csv', format = 'csv' },
]
## Store a local copy of the remote blocklists after we fetch them
save_intermediate = false
## Directory to store the local blocklist copies
savedir = '/fediblockhole/blocklists/'
savedir = '/opt/fediblockhole/blocklists/'
## File to save the fully merged blocklist into
blocklist_savefile = '/fediblockhole/blocklists/missing-tier0-mastodon.social.csv'
blocklist_savefile = '/opt/fediblockhole/blocklists/missing-tier0-mastodon.social.csv'
## Don't push blocklist to instances, even if they're defined above
no_push_instance = true

10
config/ms-we-block.conf.toml
View file

@ -14,7 +14,7 @@ blocklist_instance_sources = []
# max_severity tells the parser to override any severities that are higher than this value
# import_fields tells the parser to only import that set of fields from a specific source
blocklist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/mastodon.social.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/mastodon.social.csv', format = 'csv' },
]
# List of instances to write blocklist to
@ -23,18 +23,18 @@ blocklist_instance_destinations = [
]
allowlist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/birdsite.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/_unified_tier0_blocklist.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/birdsite.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/_unified_tier0_blocklist.csv', format = 'csv' },
]
## Store a local copy of the remote blocklists after we fetch them
save_intermediate = false
## Directory to store the local blocklist copies
savedir = '/fediblockhole/blocklists/'
savedir = '/opt/fediblockhole/blocklists/'
## File to save the fully merged blocklist into
blocklist_savefile = '/fediblockhole/blocklists/council-missing-mastodon.social.csv'
blocklist_savefile = '/opt/fediblockhole/blocklists/council-missing-mastodon.social.csv'
## Don't push blocklist to instances, even if they're defined above
no_push_instance = true

6
config/pull.conf.toml
View file

@ -34,7 +34,7 @@ blocklist_url_sources = [
# assumes a git pull will proceed this check and bring down the most recent allowlist
allowlist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
]
# List of instances to write blocklist to
@ -46,10 +46,10 @@ blocklist_instance_destinations = [
save_intermediate = true
## Directory to store the local blocklist copies
savedir = '/fediblockhole/blocklists/'
savedir = '/opt/fediblockhole/blocklists/'
## File to save the fully merged blocklist into
blocklist_savefile = '/fediblockhole/blocklists/_unified_max_blocklist.csv'
blocklist_savefile = '/opt/fediblockhole/blocklists/_unified_max_blocklist.csv'
## Don't push blocklist to instances, even if they're defined above
no_push_instance = true

14
config/tier0.conf.toml
View file

@ -14,9 +14,9 @@ blocklist_instance_sources = []
# max_severity tells the parser to override any severities that are higher than this value
# import_fields tells the parser to only import that set of fields from a specific source
blocklist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/tier0.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/gardenfence.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/tier0-council.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/tier0.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/gardenfence.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/tier0-council.csv', format = 'csv' },
]
# List of instances to write blocklist to
@ -25,18 +25,18 @@ blocklist_instance_destinations = [
]
allowlist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/birdsite.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/birdsite.csv', format = 'csv' },
]
## Store a local copy of the remote blocklists after we fetch them
save_intermediate = false
## Directory to store the local blocklist copies
savedir = '/fediblockhole/blocklists/'
savedir = '/opt/fediblockhole/blocklists/'
## File to save the fully merged blocklist into
blocklist_savefile = '/fediblockhole/blocklists/_unified_tier0_blocklist.csv'
blocklist_savefile = '/opt/fediblockhole/blocklists/_unified_tier0_blocklist.csv'
## Don't push blocklist to instances, even if they're defined above
no_push_instance = true

26
config/tier1-threshold.conf.toml
View file

@ -14,15 +14,15 @@ blocklist_instance_sources = []
# max_severity tells the parser to override any severities that are higher than this value
# import_fields tells the parser to only import that set of fields from a specific source
blocklist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/union.place.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/sunny.garden.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/mastodon.art.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/artisan.chat.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/toot.wales.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/rage.love.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/pleroma.envs.net.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/turtle.garden.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/solarpunk.moe.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/union.place.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/sunny.garden.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/mastodon.art.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/artisan.chat.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/toot.wales.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/rage.love.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/pleroma.envs.net.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/turtle.garden.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/solarpunk.moe.csv', format = 'csv' },
]
# List of instances to write blocklist to
@ -31,18 +31,18 @@ blocklist_instance_destinations = [
]
allowlist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/birdsite.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/birdsite.csv', format = 'csv' },
]
## Store a local copy of the remote blocklists after we fetch them
save_intermediate = false
## Directory to store the local blocklist copies
savedir = '/fediblockhole/blocklists/'
savedir = '/opt/fediblockhole/blocklists/'
## File to save the fully merged blocklist into
blocklist_savefile = '/fediblockhole/blocklists/_working_tier1.csv'
blocklist_savefile = '/opt/fediblockhole/blocklists/_working_tier1.csv'
## Don't push blocklist to instances, even if they're defined above
no_push_instance = true

12
config/tier1.conf.toml
View file

@ -15,14 +15,14 @@ blocklist_instance_sources = []
# import_fields tells the parser to only import that set of fields from a specific source
blocklist_url_sources = [
# bring in tier0
{ url = 'file:///fediblockhole/blocklists/_unified_tier0_blocklist.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/_unified_tier0_blocklist.csv', format = 'csv' },
# tier 1
{ url = 'file:///fediblockhole/blocklists/_working_tier1.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/_working_tier1.csv', format = 'csv' },
]
allowlist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/birdsite.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/birdsite.csv', format = 'csv' },
]
# List of instances to write blocklist to
@ -34,10 +34,10 @@ blocklist_instance_destinations = [
save_intermediate = false
## Directory to store the local blocklist copies
savedir = '/fediblockhole/blocklists/'
savedir = '/opt/fediblockhole/blocklists/'
## File to save the fully merged blocklist into
blocklist_savefile = '/fediblockhole/blocklists/_unified_tier1_blocklist.csv'
blocklist_savefile = '/opt/fediblockhole/blocklists/_unified_tier1_blocklist.csv'
## Don't push blocklist to instances, even if they're defined above
no_push_instance = true

26
config/tier2-threshold.conf.toml
View file

@ -14,15 +14,15 @@ blocklist_instance_sources = []
# max_severity tells the parser to override any severities that are higher than this value
# import_fields tells the parser to only import that set of fields from a specific source
blocklist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/union.place.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/sunny.garden.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/mastodon.art.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/artisan.chat.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/toot.wales.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/rage.love.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/pleroma.envs.net.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/turtle.garden.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/solarpunk.moe.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/union.place.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/sunny.garden.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/mastodon.art.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/artisan.chat.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/toot.wales.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/rage.love.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/pleroma.envs.net.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/turtle.garden.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/solarpunk.moe.csv', format = 'csv' },
]
# List of instances to write blocklist to
@ -31,18 +31,18 @@ blocklist_instance_destinations = [
]
allowlist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/birdsite.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/birdsite.csv', format = 'csv' },
]
## Store a local copy of the remote blocklists after we fetch them
save_intermediate = false
## Directory to store the local blocklist copies
savedir = '/fediblockhole/blocklists/'
savedir = '/opt/fediblockhole/blocklists/'
## File to save the fully merged blocklist into
blocklist_savefile = '/fediblockhole/blocklists/_working_tier2.csv'
blocklist_savefile = '/opt/fediblockhole/blocklists/_working_tier2.csv'
## Don't push blocklist to instances, even if they're defined above
no_push_instance = true

12
config/tier2.conf.toml
View file

@ -15,14 +15,14 @@ blocklist_instance_sources = []
# import_fields tells the parser to only import that set of fields from a specific source
blocklist_url_sources = [
# bring in tier0
{ url = 'file:///fediblockhole/blocklists/_unified_tier0_blocklist.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/_unified_tier0_blocklist.csv', format = 'csv' },
# tier 2
{ url = 'file:///fediblockhole/blocklists/_working_tier2.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/_working_tier2.csv', format = 'csv' },
]
allowlist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/birdsite.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/birdsite.csv', format = 'csv' },
]
# List of instances to write blocklist to
@ -34,10 +34,10 @@ blocklist_instance_destinations = [
save_intermediate = false
## Directory to store the local blocklist copies
savedir = '/fediblockhole/blocklists/'
savedir = '/opt/fediblockhole/blocklists/'
## File to save the fully merged blocklist into
blocklist_savefile = '/fediblockhole/blocklists/_unified_tier2_blocklist.csv'
blocklist_savefile = '/opt/fediblockhole/blocklists/_unified_tier2_blocklist.csv'
## Don't push blocklist to instances, even if they're defined above
no_push_instance = true

26
config/tier3-threshold.conf.toml
View file

@ -14,15 +14,15 @@ blocklist_instance_sources = []
# max_severity tells the parser to override any severities that are higher than this value
# import_fields tells the parser to only import that set of fields from a specific source
blocklist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/union.place.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/sunny.garden.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/mastodon.art.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/artisan.chat.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/toot.wales.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/rage.love.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/pleroma.envs.net.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/turtle.garden.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/solarpunk.moe.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/union.place.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/sunny.garden.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/mastodon.art.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/artisan.chat.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/toot.wales.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/rage.love.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/pleroma.envs.net.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/turtle.garden.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/solarpunk.moe.csv', format = 'csv' },
]
# List of instances to write blocklist to
@ -31,18 +31,18 @@ blocklist_instance_destinations = [
]
allowlist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/birdsite.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/birdsite.csv', format = 'csv' },
]
## Store a local copy of the remote blocklists after we fetch them
save_intermediate = false
## Directory to store the local blocklist copies
savedir = '/fediblockhole/blocklists/'
savedir = '/opt/fediblockhole/blocklists/'
## File to save the fully merged blocklist into
blocklist_savefile = '/fediblockhole/blocklists/_working_tier3.csv'
blocklist_savefile = '/opt/fediblockhole/blocklists/_working_tier3.csv'
## Don't push blocklist to instances, even if they're defined above
no_push_instance = true

12
config/tier3.conf.toml
View file

@ -15,14 +15,14 @@ blocklist_instance_sources = []
# import_fields tells the parser to only import that set of fields from a specific source
blocklist_url_sources = [
# bring in tier0
{ url = 'file:///fediblockhole/blocklists/_unified_tier0_blocklist.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/_unified_tier0_blocklist.csv', format = 'csv' },
# tier 0
{ url = 'file:///fediblockhole/blocklists/_working_tier3.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/_working_tier3.csv', format = 'csv' },
]
allowlist_url_sources = [
{ url = 'file:///fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///fediblockhole/blocklists/birdsite.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/__allowlist.csv', format = 'csv' },
{ url = 'file:///opt/fediblockhole/blocklists/birdsite.csv', format = 'csv' },
]
# List of instances to write blocklist to
@ -34,10 +34,10 @@ blocklist_instance_destinations = [
save_intermediate = false
## Directory to store the local blocklist copies
savedir = '/fediblockhole/blocklists/'
savedir = '/opt/fediblockhole/blocklists/'
## File to save the fully merged blocklist into
blocklist_savefile = '/fediblockhole/blocklists/_unified_tier3_blocklist.csv'
blocklist_savefile = '/opt/fediblockhole/blocklists/_unified_tier3_blocklist.csv'
## Don't push blocklist to instances, even if they're defined above
no_push_instance = true

2
fedisync-example-server.sh
View file

@ -5,5 +5,5 @@ set -e
SYNC=`which fediblock-sync`
# use secretconfig subfolder
${SYNC} -c /fediblockhole/config/example-server-export.conf.toml
${SYNC} -c /opt/fediblockhole/config/example-server-export.conf.toml

6
fedisync-git.sh
View file

@ -1,11 +1,11 @@
#!/bin/bash
set -e
# generate files
#exec > >(tee /fediblockhole/logs/fedisync.log) 2>&1
exec 2> >(tee /fediblockhole/logs/fedisync-git.log)
#exec > >(tee /opt/fediblockhole/logs/fedisync.log) 2>&1
exec 2> >(tee /opt/fediblockhole/logs/fedisync-git.log)
echo "Pushing up git changes..."
cd /fediblockhole
cd /opt/fediblockhole
date=$(date '+%Y-%m-%d %H:%M:%S')

6
fedisync-push.sh
View file

@ -1,11 +1,11 @@
#!/bin/bash
set -e
# generate files
exec > >(tee /fediblockhole/logs/fedisync-production.log) 2>&1
exec > >(tee /opt/fediblockhole/logs/fedisync-production.log) 2>&1
# push to github and codeberg
# note: copy your own version to /fediblockhole/local
/fediblockhole/fedisync-git.sh
/opt/fediblockhole/fedisync-git.sh
# push to remote servers
/fediblockhole/fedisync-example-server.sh
/opt/fediblockhole/fedisync-example-server.sh

64
fedisync.sh
View file

@ -2,61 +2,61 @@
set -e
# generate files
#exec > >(tee /fediblockhole/logs/fedisync.log) 2>&1
exec 2> >(tee /fediblockhole/logs/fedisync.log)
#exec > >(tee /opt/fediblockhole/logs/fedisync.log) 2>&1
exec 2> >(tee /opt/fediblockhole/logs/fedisync.log)
echo "Pulling down all blocklist sources..."
cd /fediblockhole
cd /opt/fediblockhole
GIT=`which git`
${GIT} fetch
#${GIT} fetchall
SYNC=`which fediblock-sync`
${SYNC} -c /fediblockhole/config/pull.conf.toml # pull down all files, create max list
${SYNC} -c /opt/fediblockhole/config/pull.conf.toml # pull down all files, create max list
# rename and remove intermediate files
rm -f /fediblockhole/blocklists/file:---fediblockhole-blocklists-__allowlist.csv.csv
mv /fediblockhole/blocklists/https:--seirdy.one-pb-tier0.csv.csv /fediblockhole/blocklists/tier0.csv
mv /fediblockhole/blocklists/https:--seirdy.one-pb-pleroma.envs.net.csv.csv /fediblockhole/blocklists/pleroma.envs.net.csv
mv /fediblockhole/blocklists/https:--turtle.garden-blocklist.csv.csv /fediblockhole/blocklists/turtle.garden.csv
mv /fediblockhole/blocklists/https:--raw.githubusercontent.com-gardenfence-blocklist-main-gardenfence-fediblocksync.csv.csv /fediblockhole/blocklists/gardenfence.csv
mv /fediblockhole/blocklists/https:--artisan.chat-api-v1-instance-domain_blocks.csv /fediblockhole/blocklists/artisan.chat.csv
mv /fediblockhole/blocklists/https:--mastodon.art-api-v1-instance-domain_blocks.csv /fediblockhole/blocklists/mastodon.art.csv
mv /fediblockhole/blocklists/https:--mastodon.online-api-v1-instance-domain_blocks.csv /fediblockhole/blocklists/mastodon.online.csv
mv /fediblockhole/blocklists/https:--mastodon.social-api-v1-instance-domain_blocks.csv /fediblockhole/blocklists/mastodon.social.csv
mv /fediblockhole/blocklists/https:--rage.love-api-v1-instance-domain_blocks.csv /fediblockhole/blocklists/rage.love.csv
mv /fediblockhole/blocklists/https:--sunny.garden-api-v1-instance-domain_blocks.csv /fediblockhole/blocklists/sunny.garden.csv
mv /fediblockhole/blocklists/https:--toot.wales-api-v1-instance-domain_blocks.csv /fediblockhole/blocklists/toot.wales.csv
mv /fediblockhole/blocklists/https:--union.place-api-v1-instance-domain_blocks.csv /fediblockhole/blocklists/union.place.csv
mv /fediblockhole/blocklists/https:--solarpunk.moe-api-v1-instance-domain_blocks.csv /fediblockhole/blocklists/solarpunk.moe.csv
rm -f /opt/fediblockhole/blocklists/file:---opt-fediblockhole-blocklists-__allowlist.csv.csv
mv /opt/fediblockhole/blocklists/https:--seirdy.one-pb-tier0.csv.csv /opt/fediblockhole/blocklists/tier0.csv
mv /opt/fediblockhole/blocklists/https:--seirdy.one-pb-pleroma.envs.net.csv.csv /opt/fediblockhole/blocklists/pleroma.envs.net.csv
mv /opt/fediblockhole/blocklists/https:--turtle.garden-blocklist.csv.csv /opt/fediblockhole/blocklists/turtle.garden.csv
mv /opt/fediblockhole/blocklists/https:--raw.githubusercontent.com-gardenfence-blocklist-main-gardenfence-fediblocksync.csv.csv /opt/fediblockhole/blocklists/gardenfence.csv
mv /opt/fediblockhole/blocklists/https:--artisan.chat-api-v1-instance-domain_blocks.csv /opt/fediblockhole/blocklists/artisan.chat.csv
mv /opt/fediblockhole/blocklists/https:--mastodon.art-api-v1-instance-domain_blocks.csv /opt/fediblockhole/blocklists/mastodon.art.csv
mv /opt/fediblockhole/blocklists/https:--mastodon.online-api-v1-instance-domain_blocks.csv /opt/fediblockhole/blocklists/mastodon.online.csv
mv /opt/fediblockhole/blocklists/https:--mastodon.social-api-v1-instance-domain_blocks.csv /opt/fediblockhole/blocklists/mastodon.social.csv
mv /opt/fediblockhole/blocklists/https:--rage.love-api-v1-instance-domain_blocks.csv /opt/fediblockhole/blocklists/rage.love.csv
mv /opt/fediblockhole/blocklists/https:--sunny.garden-api-v1-instance-domain_blocks.csv /opt/fediblockhole/blocklists/sunny.garden.csv
mv /opt/fediblockhole/blocklists/https:--toot.wales-api-v1-instance-domain_blocks.csv /opt/fediblockhole/blocklists/toot.wales.csv
mv /opt/fediblockhole/blocklists/https:--union.place-api-v1-instance-domain_blocks.csv /opt/fediblockhole/blocklists/union.place.csv
mv /opt/fediblockhole/blocklists/https:--solarpunk.moe-api-v1-instance-domain_blocks.csv /opt/fediblockhole/blocklists/solarpunk.moe.csv
# destroy the 'max' list
rm -f /fediblockhole/blocklists/_unified_max_blocklist.csv
rm -f /opt/fediblockhole/blocklists/_unified_max_blocklist.csv
# create fedi council tier0 file and 100% file
${SYNC} -c /fediblockhole/config/council.tier0.conf.toml && \
${SYNC} -c /fediblockhole/config/100.percent.conf.toml
${SYNC} -c /opt/fediblockhole/config/council.tier0.conf.toml && \
${SYNC} -c /opt/fediblockhole/config/100.percent.conf.toml
# create unified tier0 file
${SYNC} -c /fediblockhole/config/tier0.conf.toml
${SYNC} -c /opt/fediblockhole/config/tier0.conf.toml
# create missing from mastodon.social blocklist file, and the inverse file
${SYNC} -c /fediblockhole/config/ms-noblock.conf.toml && \
${SYNC} -c /fediblockhole/config/ms-we-block.conf.toml
${SYNC} -c /opt/fediblockhole/config/ms-noblock.conf.toml && \
${SYNC} -c /opt/fediblockhole/config/ms-we-block.conf.toml
# create intermediate working tier files
${SYNC} -c /fediblockhole/config/tier1-threshold.conf.toml -m min && \
${SYNC} -c /fediblockhole/config/tier2-threshold.conf.toml -m min && \
${SYNC} -c /fediblockhole/config/tier3-threshold.conf.toml -m min
${SYNC} -c /opt/fediblockhole/config/tier1-threshold.conf.toml -m min && \
${SYNC} -c /opt/fediblockhole/config/tier2-threshold.conf.toml -m min && \
${SYNC} -c /opt/fediblockhole/config/tier3-threshold.conf.toml -m min
# merge in associated tier file with tier0 blocks
${SYNC} -c /fediblockhole/config/tier1.conf.toml -m min && \
${SYNC} -c /fediblockhole/config/tier2.conf.toml -m min && \
${SYNC} -c /fediblockhole/config/tier3.conf.toml -m min && \
cp /fediblockhole/blocklists/_unified_tier0_blocklist.csv /fediblockhole/blocklists/_unified_min_blocklist.csv
${SYNC} -c /opt/fediblockhole/config/tier1.conf.toml -m min && \
${SYNC} -c /opt/fediblockhole/config/tier2.conf.toml -m min && \
${SYNC} -c /opt/fediblockhole/config/tier3.conf.toml -m min && \
cp /opt/fediblockhole/blocklists/_unified_tier0_blocklist.csv /opt/fediblockhole/blocklists/_unified_min_blocklist.csv
# cleanup working tier files
rm -f /fediblockhole/blocklists/_working_*.csv
rm -f /opt/fediblockhole/blocklists/_working_*.csv
echo "Pull complete."