From 58bcb94a987d2409a6efb0c7355af256cc3ec35b Mon Sep 17 00:00:00 2001
From: Oliphant <oliphant@oliphant.social>
Date: Mon, 1 May 2023 15:40:39 +0000
Subject: [PATCH] automated commit on 2023-05-01 15:40:39

---
 .../council-missing-mastodon.social.csv       | 49 -------------------
 .../missing-tier0-mastodon.social.csv         |  0
 config/ms-noblock.conf.toml                   |  2 +-
 config/ms-we-block.conf.toml                  |  2 +-
 fedisync.sh                                   |  4 +-
 5 files changed, 4 insertions(+), 53 deletions(-)
 delete mode 100644 blocklists/council-missing-mastodon.social.csv
 rename blocklists/{ => other}/missing-tier0-mastodon.social.csv (100%)

diff --git a/blocklists/council-missing-mastodon.social.csv b/blocklists/council-missing-mastodon.social.csv
deleted file mode 100644
index 3a91b98..0000000
--- a/blocklists/council-missing-mastodon.social.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-domain,severity,reject_media,reject_reports,public_comment,obfuscate
-beta.birdsite.live,suspend,False,False,,False
-birb.elfenban.de,suspend,False,False,,False
-bird.froth.zone,suspend,False,False,,False
-birdbridge.autonomy.earth,suspend,False,False,,False
-birdsite.jemverse.xyz,suspend,False,False,,False
-birdsite.skye.cx,suspend,False,False,,False
-brands.town,suspend,False,False,,False
-bridge.birb.space,suspend,False,False,,False
-bsd.moe,silence,False,False,,False
-chaurocks.com,suspend,False,False,,False
-cnet.site,suspend,False,False,,False
-coom.club,suspend,False,False,,False
-cum.desupost.soy,suspend,False,False,,False
-daffodil-11.org,suspend,False,False,,False
-dlf.social,suspend,False,False,,False
-fedi.app,suspend,False,False,,False
-feminism.lgbt,suspend,False,False,,False
-firebird.mullet.social,suspend,False,False,,False
-gab.com,suspend,False,False,,False
-getgle.org,suspend,False,False,,False
-gitmo.life,suspend,False,False,,False
-jaeger.website,suspend,False,False,,False
-krdtube.org,silence,False,False,,False
-localtunnel.me,suspend,False,False,,False
-mastodonhub.com,suspend,False,False,,False
-monstergirl.space,suspend,False,False,,False
-mstdn.foxfam.club,silence,False,False,,False
-ngrok.io,suspend,False,False,,False
-ns.auction,suspend,False,False,,False
-pleroma.fun,suspend,False,False,,False
-pleroma.kitsunemimi.club,suspend,False,False,,False
-raplst.town,suspend,False,False,,False
-shitpisscum.mooo.com,suspend,False,False,,False
-shitposting.army,suspend,False,False,,False
-sinblr.com,silence,False,False,,False
-social.projectsegfau.lt,suspend,False,False,,False
-social.quodverum.com,silence,False,False,,False
-solagg.com,suspend,False,False,,False
-switter.at,suspend,False,False,,False
-toot.love,silence,False,False,,False
-twitiverse.com,suspend,False,False,,False
-twitter.1d4.us,suspend,False,False,,False
-twitter.activitypub.actor,suspend,False,False,,False
-twtr.wappie.land,suspend,False,False,,False
-wagesofsinisdeath.com,suspend,False,False,,False
-waifu.social,suspend,False,False,,False
-waifuappreciation.club,suspend,False,False,,False
-weedis.life,suspend,False,False,,False
diff --git a/blocklists/missing-tier0-mastodon.social.csv b/blocklists/other/missing-tier0-mastodon.social.csv
similarity index 100%
rename from blocklists/missing-tier0-mastodon.social.csv
rename to blocklists/other/missing-tier0-mastodon.social.csv
diff --git a/config/ms-noblock.conf.toml b/config/ms-noblock.conf.toml
index 930b9a8..0ff31ea 100644
--- a/config/ms-noblock.conf.toml
+++ b/config/ms-noblock.conf.toml
@@ -35,7 +35,7 @@ save_intermediate = false
 savedir = '/opt/fediblockhole/blocklists/'
 
 ## File to save the fully merged blocklist into
-blocklist_savefile = '/opt/fediblockhole/blocklists/missing-tier0-mastodon.social.csv'
+blocklist_savefile = '/opt/fediblockhole/blocklists/other/missing-tier0-mastodon.social.csv'
 
 ## Don't push blocklist to instances, even if they're defined above
 no_push_instance = true
diff --git a/config/ms-we-block.conf.toml b/config/ms-we-block.conf.toml
index 16ec082..5d2a3e7 100644
--- a/config/ms-we-block.conf.toml
+++ b/config/ms-we-block.conf.toml
@@ -34,7 +34,7 @@ save_intermediate = false
 savedir = '/opt/fediblockhole/blocklists/'
 
 ## File to save the fully merged blocklist into
-blocklist_savefile = '/opt/fediblockhole/blocklists/council-missing-mastodon.social.csv'
+blocklist_savefile = '/opt/fediblockhole/blocklists/other/council-missing-mastodon.social.csv'
 
 ## Don't push blocklist to instances, even if they're defined above
 no_push_instance = true
diff --git a/fedisync.sh b/fedisync.sh
index ad3f268..a71e4a3 100755
--- a/fedisync.sh
+++ b/fedisync.sh
@@ -41,8 +41,8 @@ ${SYNC} -c /opt/fediblockhole/config/100.percent.conf.toml
 ${SYNC} -c /opt/fediblockhole/config/tier0.conf.toml
 
 # create missing from mastodon.social blocklist file, and the inverse file
-${SYNC} -c /opt/fediblockhole/config/ms-noblock.conf.toml && \
-${SYNC} -c /opt/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 /opt/fediblockhole/config/tier1-threshold.conf.toml -m min && \