3 changed files with 40 additions and 59 deletions
--- a/info/Blocks.md
+++ b/info/Blocks.md
@ -4,24 +4,10 @@
 # Instances who have blocked us:
-|Instance name|Type|Provided Reasoning|Informed us?|My Comment|
+|Instance name|Type|Provided Reasoning|My Comment|
-|-------------|----|------------------|------------|----------|
+|-------------|----------|------------------|----------|
-|anticapitalist.party|Full block|None provided|No|N/A|
+|icosahedron.website|Full block|"makework trolls"|Reason too vague for me to know what it means|
-|berries.space|Full block|"incompatible with rules"|No|N/A|
+|vulpine.club|Full block|asshat/racist ratio too high (including admin previously banned from m.s)|I've not been banned from mastodon.social, no idea what they're talking about. My [OG account](https://mastodon.social/@quad) is still online and fine, even if it's not being used.|
 |cybre.space|Silence and Media Block|None provided|No|N/A|
 |icosahedron.website|Full block|"makework trolls"|No|Reason too vague for me to know what it means|
 |infinite.pink|Full block|None provided|No|N/A|
 |merveilles.town|Full block|None provided|No|N/A|
 |plush.city|Full block|"Abusive users, Incompatible CoC"|No|This instance seems to just block pretty much everyone|
 |snouts.online|Full block|"alt-right, right libertarian or nazi"|No|N/A|
 |vulpine.club|Full block|"asshat/racist ratio too high (including admin previously banned from m.s)"|No|I've not been banned from mastodon.social, no idea what they're talking about. My [OG account](https://mastodon.social/@quad) is still online and fine, even if it's not being used. They did however suspend the former masto.quad.moe, without providing a reason|
 |yiff.life|Full block|"Content violation"|No|N/A|
 Block types explained:
 - Full block: Called "suspend" by Mastodon. The server basically auto-deletes anything sent to it from the blocked instance. Users typically do not see any visual indicator of the block. They'll just "for some reason" be unable to see the posts from our instance
 - Silence: Posts from us will be invisible to anyone who isn't a follower. Your friends can still follow you, but they won't be able to look you up or find you unless you give them your username.
 - Media block: The instance does not display media from us. Pretty self-explanatory. Images we post will just fail to load for users who have media blocked us.
 # Blocklists we are on:
--- a/info/Rules.md
+++ b/info/Rules.md
@ -1,43 +1,37 @@
 # Rules / Terms of Service
 ## Instance description:
 Weeaboo.space is an instance focused on general discussion, but often anime or tech. Any subject is allowed on this instance as long as you don't break any of the rules. We support people's freedom of expression and encourage discussions of any kind, not just anime-related, as the name might imply.
 It's understandable that some other instances don't like this free-for-all nature. But if you must block, I urge you to block on a per-user level rather than the whole instance. That is better both for your users, and for the fediverse as a whole.
 ## We **do not** allow:
- - Spoiling of somewhat recent movies, games, books, etc. Use the content warning / subject field.
+ - Spoiling of somewhat recent movies, games, books, etc. Use the content warning / subject field
- - Pornographic avatars. (No I won't complain about half-naked anime girls, just keep nipples and genitals away)
+ - Pornographic avatars (No I won't complain about half-naked anime girls, just keep nipples and genitals away)
- - Untagged NSFW.
+ - Untagged NSFW
 - Continued, intentional and targeted bullying/spamming.
- - Exiling/Threatening someone for their opinion. People have the right to say what they want as long as their actions don't break any other rules. If you don't like someone, you block them and call it a day.
+ - Exiling/Threatening someone for their opinion. You're not obligated to listen, nor to care, but they still have the right to say what they want as long as their actions don't break any other rules. If you don't like someone, you block them and call it a day
- - Imagebots that spam your waifu every hour (Waste of storage space)
+ - Nothing that's actually illegal. Like child pornography or unironic bomb threats
- - Nothing that's actually illegal according to Norwegian jurisdiction. Like child pornography or unironic bomb threats.
+ - In short: Tag your porn and don't be an asshole
-In short: Tag your porn and don't be an asshole
+### Fine details
 - Boosting untagged NSFW is not considered the same as posting untagged NSFW. Blame the original instance for those posts if you must.
 - "Somewhat recent movies, games[...]" means anything from the past 10 years. If the year is 2018, you would not need to hide images/text of you playing a game that's from 2007 or earlier. Of course, if you know that a person is playing a story-based game, don't intentionally spoil them, that falls under the "Don't be an asshole" rule.
 - Yes, you can use words like "nigger" or "weeb" as long as they're not intended as flat out insults. But if the person says they're uncomfortable with such words, stop writing them to the person in question. 
 - If someone finds your joke distasteful, you apologize and move on. But if you keep writing similar distasteful jokes after the person tells you to stop, you are bullying/spamming, and/or being an asshole.
 ## We **do** allow:
- - Controversial opinions.
+ - Controversial opinions
 - "Questionable jokes"
- - Shitposting. (But no spamming people)
+ - Shitposting (But stop spamming people if they ask. They should not have to ask multiple times)
- - Text bots that comply with other rules
+ - In short: Most things that aren't simply rude/annoying, and/or illegal.
 In short: Most things that aren't simply rude/annoying, or illegal.
 ### Fine details / Extended explanation of rules
 - Boosting untagged NSFW is not punished like posting untagged NSFW is. We can't control whether another instance tags their stuff properly.
 - "Somewhat recent movies, games[...]" is open to interpretation, but generally means anything that hasn't been very popular in the past 5 years. Of course, if you know that a person is playing a game, don't intentionally spoil them, that falls under "Don't be an asshole".
   - For example Shin Megami Tensei Nocturne released in 2003/2004 so there's no real point in tagging all the spoilers. But in 2020, an HD remaster of the game was announced, starting at that point, story-related content should be tagged again, until that HD remaster has also been mostly forgotten.
 - Yes, you can use words like "nigger" or "weeb" as long as they're not intended as flat out insults. But if the person says they're uncomfortable with such words, stop writing them to the person in question. 
 - If someone finds your joke distasteful, you apologize and move on. If you keep writing similar distasteful jokes after the person tells you to stop, you are spamming and/or being an asshole.
 ## Additional policies/details:
 - We do not use instance-wide blocks except to combat spamhives. Each user is responsible for their own timeline. I am responsible for the local timeline. And the federated timeline is a free-for-all.
- - Targeting someone for their opinion may be overruled where someone's opinion is central to the discussion at hand. e.g while discussing presidential elections, as their personalities is most of the discussion material. Or while drama arises on subjects such as the mental state of a school shooter. In other words: If a bunch of news sites around the world are already complaining about it, it's probably okay for you to complain too.
+ - Targeting someone for their opinion may be overruled where someone's opinion is central to the discussion at hand. e.g while discussing presidential elections, since their personalities is most of the discussion material. Or while drama arises on subjects such as the mental state of a school shooter. In other words: If a bunch of news sites around the world are already complaining about it, it's probably okay for you to complain too.
- - No. We're not an "alt-right" instance. Free expression does not mean we're nazis. But it does mean people on this instance won't pretend that they agree with you. "If you can't take the heat, get out of the kitchen"
+ - No. We're not an "alt-right" instance. Free speech does not mean we're nazis. But it does mean people on this instance are not obligated to pretend that they agree with you. "If you can't take the heat, get out of the kitchen"
 ## Instance description:
 Weeaboo.space is an invite-only instance focused on general discussion, but often anime or tech. Any subject is allowed on this instance as long as you don't break any of the rules. We support free speech "within reason".
 We understand that some other instances don't like this free-for-all nature. But if you must block, I urge you to block on a per-user level rather than the whole instance. That is better both for your users, and for the fediverse as a whole.
--- a/info/Server.md
+++ b/info/Server.md
@ -2,26 +2,27 @@
 ## Hardware
-Weeaboo.space runs on my Proxmox cluster in a virtual machine named "Droite". The hosts each have a E3-1220v2 CPU and 32GB of RAM with 2x1 Gbit network connectivity to a dedicated switch. The virtual machine currently has these specs assigned to it:
+Weeaboo.space runs on the host [Kiss-Shot Acerola-Orion Heart-Under-Blade](https://kiss-shot-acerola-orion-heart-under-blade.quad.moe/) (Henceforth "Shinobu"), which is a VM from [Hetzner](http://hetzner.cloud/) with the model name "CX31" and the following specs:
- 2 CPU cores
+- 2 CPU cores (Intel Skylake)
- 2GB RAM
+- 8GB RAM
- 80GB Storage
+- 80GB NVMe SSD
 - 20TB Transfer
-Storage is provided by a Qnap TS-963X over iSCSI on a dedicated VLAN. Currently the virtual machine runs on HDD storage, although I plan to get it onto solid-state storage once I can find a good deal on some quality SSDs. The NAS has over 12TB of capacity, so expansion is not an issue.
+It is located in Helsinki, Finland. (Hetzner's "hel1-dc2")
 The server is located in Florø, Norway.
 ## Software
-Droite runs Debian 10 and currently hosts the weeaboo.space pleroma instance exclusively.
+Shinobu runs FreeBSD 11.2 and currently hosts the weeaboo.space pleroma instance exclusively.
-Pleroma runs with an unprivileged user (no sudo access) and cannot see processes initiated by other users in applications such as `htop`. Pleroma is configured to be reachable over IPv4, no IPv6 yet unfortunately. I am working on getting some kind of IPv6 setup in place.
+Pleroma runs with an unprivileged user (no sudo access) and cannot see processes initiated by other users in applications such as `htop`. Pleroma is configured to be reachable over both IPv4 and IPv6, while pf prevents externals from accessing Pleroma without passing through nginx.
-Caching of proxied media is handled by a separate nginx VM named "Loki". As such, proxied media does not affect the storage of the instance itself.
+Monitoring of the server is handled by [nixstats](https://nixstats.com/)
 Various rate-limits are in place to prevent spam, although I will not publicly disclose them all, if you get stopped with an error code 503 during sign-up, please wait a few minutes and try again. If you spam an extreme amount of posts, you will also be limited.
 ## Backups
-Full backups of Pleroma's VM run nightly, these are stored on a separate storage server, so if the main storage server fails entirely, this will not affect the nightly backups. Generally I keep backups a week or two back in time.
+Backups are run to a server that is located both on a different site and on a different host. Hetzner's backup service is also enabled as a failover.
 The database is backed up every hour, while the pleroma folder containing all data and uploads gets backed up once every two hours. Hetzner's full VM backups are performed between 04:00 and 08:00 every night (GMT+2. While Shinobu is in Finland, Hetzner is a German company. Hetzner does not currently seem to differentiate between the two timezones as far as I can tell)
 Recovery will likely be performed from one of Hetzner's backups if it is recent enough. Alternatively the pleroma folder and a database dump will be pulled from my off-site backup server.