Merge pull request 'structure update' (#8) from followup0602/cloudflare-tor:master into master

23 files changed, 48 insertions, 8 deletions

diff --git a/PEOPLE.md b/PEOPLE.md
index 50868792..b0898568 100644
--- a/PEOPLE.md
+++ b/PEOPLE.md
@@ -116,6 +116,8 @@ Awesome! Use Cloudflare!
 
 (Just don't add Medium.com articles. It's Cloudflared. Whether the content is good or not doesn't matter.)
 
+"[Die zentralisierung des Internets](https://blog.bka.li/~/JustForFun/cloudflare/)"
+
 "[Is Cloudflare safe yet?](https://iscloudflaresafeyet.com)"
 
 "[Mozilla - Devil Incarnate: DNS over HTTPS](http://digdeep4orxw6psc33yxa2dgmuycj74zi6334xhxjlgppw6odvkzkiad.onion/ghost/mozilla.html#cloudflare)" by [​DigDeeper](http://digdeep4orxw6psc33yxa2dgmuycj74zi6334xhxjlgppw6odvkzkiad.onion/)
@@ -229,6 +231,8 @@ Awesome! Use Cloudflare!
 
 "[Some images from Cloudflare don't load up and a 403 Forbidden is returned](https://trac.torproject.org/projects/tor/ticket/32582)"
 
+"[Do you know how Cloudflare works? It's literally a proxy.](https://endchan.org/pol/res/72923.html#q74241)"
+
 "[website not working properly since update](https://trac.torproject.org/projects/tor/ticket/32430)"
 
 "[Cloudflare to MITM your traffic is an extraordinary security and privacy problem.](https://www.reddit.com/r/Bitcoin/comments/e303gh/bitcoincoreorg_expired_ssl_cert/f8zqcf9/)" by [hva32](https://www.reddit.com/user/hva32/)
@@ -2567,6 +2571,12 @@ Found many things that I use regularly wouldn't work anymore like they were bloc
 
 > Too many to list here. It is IMPOSSIBLE to list them all! [See for yourself](https://mastodon.social/tags/cloudflare). (#Cloudflare)
 
+"Ich bin mir sicher, dass du eine Antwort bekommst. Nur bin ich mir sicher, dass die sich nicht wieder wirklich darauf einlassen, das Ding zu deaktivieren. Wenn sie wenigstens TOR Verbindungen ohne Hindernisse durch lassen würden 🙄 Aber naja ... gz #Cloudflare. Ihr habt erfolgreich das Internet zentralisiert. Was der Struktur des Internets zu Urteilen nie Sinn und Zweck war" by @[kromonos](https://social.snopyta.org/@kromonos/104258729962672240)
+
+"Du hast eine Domain bei #INWX liegen? Du findest #cloudflare scheiße? Dann schreib bitte eine Mail an den Support, dass die cloudflare für deren Webseite bitte wieder abschalten sollen. Ja, aktuell ist die ganze Seite samt Zertifikat von bzw. hinter Cloudflare versteckt. Je mehr Leute sich beschweren, desto besser stehen die Erfolgschancen. Bitte teilen!" by @[nuron](https://social.tchncs.de/@nuron/104258767881075941)
+
+"Wenn wir von heute auf morgen alle über #TOR Routen würden, wäre #Cloudflare auf einmal nicht mehr scheiß egal." by @[kromonos](https://social.snopyta.org/@kromonos/104213914131776937)
+
 "the irony of linking to #gitlab, while criticizing the usage of #cloudflare: gitlab also uses cloudflare. It's a mess..." by @[syster](https://social.linux.pizza/@syster/104207835323296120)
 
 "I was going to start contributing to that wiki, but then I noticed it's a #CloudFlare site.  I will not contribute to a CF asset." by @[aktivismoEstasMiaLuo](https://activism.openworlds.info/@aktivismoEstasMiaLuo/104149529821644159)
diff --git a/anti-tor_users/fqdn/anti_tor_fqdn.txt b/anti-tor_users/fqdn/anti_tor_fqdn.txt
deleted file mode 100644
index c82f4344..00000000
--- a/anti-tor_users/fqdn/anti_tor_fqdn.txt
+++ /dev/null
diff --git a/anti-tor_users/fqdn/attd.txt b/anti-tor_users/fqdn/attd.txt
new file mode 100644
index 00000000..9bce5eec
--- /dev/null
+++ b/anti-tor_users/fqdn/attd.txt
@@ -0,0 +1 @@
+attd.txt
\ No newline at end of file
diff --git a/anti-tor_users/fqdn/attd_com.txt b/anti-tor_users/fqdn/attd_com.txt
new file mode 100644
index 00000000..e538f603
--- /dev/null
+++ b/anti-tor_users/fqdn/attd_com.txt
@@ -0,0 +1 @@
+attd_com.txt
\ No newline at end of file
diff --git a/anti-tor_users/fqdn/attd_net.txt b/anti-tor_users/fqdn/attd_net.txt
new file mode 100644
index 00000000..ef690eed
--- /dev/null
+++ b/anti-tor_users/fqdn/attd_net.txt
@@ -0,0 +1 @@
+attd_net.txt
\ No newline at end of file
diff --git a/anti-tor_users/fqdn/attd_org.txt b/anti-tor_users/fqdn/attd_org.txt
new file mode 100644
index 00000000..532985c2
--- /dev/null
+++ b/anti-tor_users/fqdn/attd_org.txt
@@ -0,0 +1 @@
+attd_org.txt
\ No newline at end of file
diff --git a/instructions.md b/instructions.md
index 6791e228..5032a10d 100644
--- a/instructions.md
+++ b/instructions.md
@@ -15,7 +15,7 @@
 
 | List name | Description |
 | -------- | -------- |
-| **/domain/cloudflare_?.txt**     | **Split files (base domain)**     |
+| /domain/cloudflare_?.txt     | Split files (base domain)     |
 | ex_cloudflare_users.txt     | Domains which used Cloudflare in the past, not anymore     |
 | cloudflare_supporter.txt | who is using Cloudflare or endorsing Cloudflare. (URL only) |
 
@@ -93,9 +93,22 @@ Are you sure? *Remove* it from /split/ list and *add* to "[ex_cloudflare_users.t
 
 | List name | Description |
 | -------- | -------- |
-| **/domain/(cdnName).txt**     | **Split files (FQDN)**     |
+| /domain/zcdn_(CDN_Code).txt     | Split files (FQDN)     |
 | /cidr_data/?.txt     |  CIDR, ASN    |
 
+```
+CDN_Code
+
+Z1 Amazon
+Z2 Akamai
+//Z3 Cloudflare
+Z4 Imperva
+Z5 Google
+Z6 Microsoft
+Z7 INAP
+Z8 Sucuri
+Z9 Fastly
+```
 
 - Add-on "[Kiu retejo malakceptis min?](subfiles/about.urjm.md)" will help your domain collection.
 
@@ -140,7 +153,8 @@ This is a collection of websites that ban Tor exits, other than through Cloudfla
 
 | List name | Description |
 | -------- | -------- |
-| **/fqdn/anti_tor_fqdn.txt**     | **Split files (FQDN)**     |
+| /fqdn/attd.txt     | Split files, Everything (FQDN)     |
+| /fqdn/attd_(com|net|org).txt     | Split files, .com/.net/.org only (FQDN)     |
 
 
 - Add-on "[Kiu retejo malakceptis min?](subfiles/about.urjm.md)" will help your domain collection.
@@ -177,9 +191,12 @@ If your website is on this list, you better talk with your network administrator
 
 Are you sure? There are two ways to remove yourself.
 First option is just _*remove* it from the list_ and _create a pull request_.
-Second option is _wait 1 year_. Our system will revisit your website as a Tor user. If you're not blocking us, you will be removed automatically.
+Second option is _wait 1 year_. Our system will revisit your website as a Tor user.
 
-**If your website is using Cloudflare, there's a higher chance that we receive rejection webpage. Do not use cloudflare.**
+If you're not blocking Tor users, you will be removed automatically.
+
+- If your website is using Cloudflare
+ - There's a higher chance that we receive rejection webpage from Cloudflare. Do not use cloudflare.
 
 </details>
 
@@ -197,7 +214,7 @@ A or B will be enough. Thank you for your contribution.
 - Type A: Push to CodeBerg
 
 1. Log in to *CodeBerg*.
-  - Do note that Codeberg is blocking temporary email services.
+  - **WARNING**: Do note that Codeberg is blocking temporary email services and some minor email providers(not temporary email).
   - If you're Tor user, we recommend 'type B'.
 2. Click "*Fork*" button. (top-left corner)
 3. Edit text file.
@@ -211,7 +228,7 @@ A or B will be enough. Thank you for your contribution.
 - Anti-TOR
   - Just use "_Is it blocking Tor?_" API.
 
-Your contribution will be pushed to Codeberg(or PSS' you) automatically within a week.
+Your contribution will be pushed to Codeberg automatically within a week.
 
 </details>
 
@@ -334,6 +351,7 @@ If `the owner` moved away from `cloudflare` **completely**, you are welcome to a
 4. If you got `---Finish---`, the domain _might_ stopped using Cloudflare. We'll _investigate_ and remove it - or not.
   - wait some days and scan again to see whether the domain is removed
 
+
 `Only a few Cloudflare user leave Cloudflare. False positive is uncommon.`
 
 </details>
diff --git a/not_cloudflare/domains/README.md b/not_cloudflare/domains/README.md
index 0f139f1e..2aa00002 100644
--- a/not_cloudflare/domains/README.md
+++ b/not_cloudflare/domains/README.md
@@ -1,6 +1,6 @@
 # CDN users FQDN list
 
-- Cloudflare data is [/cloudflare_users/domains](../../cloudflare_users/domains)
+- Cloudflare data (code "Z3") is [/cloudflare_users/domains](../../cloudflare_users/domains)
 
 
 
diff --git a/not_cloudflare/domains/akamai.txt b/not_cloudflare/domains/akamai.txt
deleted file mode 100644
index 17f7f7a0..00000000
--- a/not_cloudflare/domains/akamai.txt
+++ /dev/null
diff --git a/not_cloudflare/domains/amazon.txt b/not_cloudflare/domains/amazon.txt
deleted file mode 100644
index 5874febe..00000000
--- a/not_cloudflare/domains/amazon.txt
+++ /dev/null
diff --git a/not_cloudflare/domains/google.txt b/not_cloudflare/domains/google.txt
deleted file mode 100644
index c68079a6..00000000
--- a/not_cloudflare/domains/google.txt
+++ /dev/null
diff --git a/not_cloudflare/domains/imperva.txt b/not_cloudflare/domains/imperva.txt
deleted file mode 100644
index 174e28dc..00000000
--- a/not_cloudflare/domains/imperva.txt
+++ /dev/null
diff --git a/not_cloudflare/domains/inap.txt b/not_cloudflare/domains/inap.txt
deleted file mode 100644
index 6ff58641..00000000
--- a/not_cloudflare/domains/inap.txt
+++ /dev/null
diff --git a/not_cloudflare/domains/microsoft.txt b/not_cloudflare/domains/microsoft.txt
deleted file mode 100644
index 298da7b9..00000000
--- a/not_cloudflare/domains/microsoft.txt
+++ /dev/null
diff --git a/not_cloudflare/domains/sucuri.txt b/not_cloudflare/domains/sucuri.txt
deleted file mode 100644
index 13d7e2d8..00000000
--- a/not_cloudflare/domains/sucuri.txt
+++ /dev/null
diff --git a/not_cloudflare/domains/zcdn_Z1.txt b/not_cloudflare/domains/zcdn_Z1.txt
new file mode 100644
index 00000000..46576eb4
--- /dev/null
+++ b/not_cloudflare/domains/zcdn_Z1.txt
@@ -0,0 +1 @@
+zcdn_Z1.txt
\ No newline at end of file
diff --git a/not_cloudflare/domains/zcdn_Z2.txt b/not_cloudflare/domains/zcdn_Z2.txt
new file mode 100644
index 00000000..07ba6f33
--- /dev/null
+++ b/not_cloudflare/domains/zcdn_Z2.txt
@@ -0,0 +1 @@
+zcdn_Z2.txt
\ No newline at end of file
diff --git a/not_cloudflare/domains/zcdn_Z4.txt b/not_cloudflare/domains/zcdn_Z4.txt
new file mode 100644
index 00000000..e4697d26
--- /dev/null
+++ b/not_cloudflare/domains/zcdn_Z4.txt
@@ -0,0 +1 @@
+zcdn_Z4.txt
\ No newline at end of file
diff --git a/not_cloudflare/domains/zcdn_Z5.txt b/not_cloudflare/domains/zcdn_Z5.txt
new file mode 100644
index 00000000..ec9048e0
--- /dev/null
+++ b/not_cloudflare/domains/zcdn_Z5.txt
@@ -0,0 +1 @@
+zcdn_Z5.txt
\ No newline at end of file
diff --git a/not_cloudflare/domains/zcdn_Z6.txt b/not_cloudflare/domains/zcdn_Z6.txt
new file mode 100644
index 00000000..af8d1821
--- /dev/null
+++ b/not_cloudflare/domains/zcdn_Z6.txt
@@ -0,0 +1 @@
+zcdn_Z6.txt
\ No newline at end of file
diff --git a/not_cloudflare/domains/zcdn_Z7.txt b/not_cloudflare/domains/zcdn_Z7.txt
new file mode 100644
index 00000000..41af98ec
--- /dev/null
+++ b/not_cloudflare/domains/zcdn_Z7.txt
@@ -0,0 +1 @@
+zcdn_Z7.txt
\ No newline at end of file
diff --git a/not_cloudflare/domains/zcdn_Z8.txt b/not_cloudflare/domains/zcdn_Z8.txt
new file mode 100644
index 00000000..f64ba803
--- /dev/null
+++ b/not_cloudflare/domains/zcdn_Z8.txt
@@ -0,0 +1 @@
+zcdn_Z8.txt
\ No newline at end of file
diff --git a/not_cloudflare/domains/zcdn_Z9.txt b/not_cloudflare/domains/zcdn_Z9.txt
new file mode 100644
index 00000000..3da6ea2b
--- /dev/null
+++ b/not_cloudflare/domains/zcdn_Z9.txt
@@ -0,0 +1 @@
+zcdn_Z9.txt
\ No newline at end of file