From b3ec53afcaed51cfbc47abe532d8298928bd61dd Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Thu, 3 Mar 2022 12:13:58 +0100
Subject: [PATCH] okarin: Migrate sbruder.xyz from yuzuru

---
 machines/okarin/configuration.nix                | 16 ++++++++++++++++
 .../services/sbruder.xyz/.gitignore              |  0
 .../services/sbruder.xyz/default.nix             |  0
 .../services/sbruder.xyz/index.md                |  5 ++---
 .../services/sbruder.xyz/metadata.yaml           |  0
 machines/yuzuru/configuration.nix                |  1 -
 6 files changed, 18 insertions(+), 4 deletions(-)
 rename machines/{yuzuru => okarin}/services/sbruder.xyz/.gitignore (100%)
 rename machines/{yuzuru => okarin}/services/sbruder.xyz/default.nix (100%)
 rename machines/{yuzuru => okarin}/services/sbruder.xyz/index.md (95%)
 rename machines/{yuzuru => okarin}/services/sbruder.xyz/metadata.yaml (100%)

diff --git a/machines/okarin/configuration.nix b/machines/okarin/configuration.nix
index e3cc111..73c9612 100644
--- a/machines/okarin/configuration.nix
+++ b/machines/okarin/configuration.nix
@@ -4,6 +4,8 @@
   imports = [
     ./hardware-configuration.nix
     ../../modules
+
+    ./services/sbruder.xyz
   ];
 
   sbruder = {
@@ -15,4 +17,18 @@
   networking.hostName = "okarin";
 
   system.stateVersion = "21.11";
+
+  services.nginx = {
+    enable = true;
+
+    recommendedGzipSettings = true;
+    recommendedOptimisation = true;
+    recommendedProxySettings = true;
+    recommendedTlsSettings = true;
+  };
+
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
 }
diff --git a/machines/yuzuru/services/sbruder.xyz/.gitignore b/machines/okarin/services/sbruder.xyz/.gitignore
similarity index 100%
rename from machines/yuzuru/services/sbruder.xyz/.gitignore
rename to machines/okarin/services/sbruder.xyz/.gitignore
diff --git a/machines/yuzuru/services/sbruder.xyz/default.nix b/machines/okarin/services/sbruder.xyz/default.nix
similarity index 100%
rename from machines/yuzuru/services/sbruder.xyz/default.nix
rename to machines/okarin/services/sbruder.xyz/default.nix
diff --git a/machines/yuzuru/services/sbruder.xyz/index.md b/machines/okarin/services/sbruder.xyz/index.md
similarity index 95%
rename from machines/yuzuru/services/sbruder.xyz/index.md
rename to machines/okarin/services/sbruder.xyz/index.md
index c56134c..84bddc4 100644
--- a/machines/yuzuru/services/sbruder.xyz/index.md
+++ b/machines/okarin/services/sbruder.xyz/index.md
@@ -14,7 +14,7 @@ and configuring the addresses to point to this server.
 However, please note the following if you want to use them:
 
  * These services are provided as-is without any guarantees.
- * You must not use these services for any activities illegal under Finnish or German law.
+ * You must not use these services for any activities illegal under German law.
  * You must not use these services to interfere with the operation of the services
    or the sites that originally provide the data.
  * Please don’t over/abuse these services.
@@ -25,7 +25,7 @@ Also note the following service-specific things:
  * **Invidious**: There are no backups, so you are responsible for using the data export feature to back up important data.
 
 The VPS providing the services is running NixOS.
-The configuration is available [here](https://git.sbruder.de/simon/nixos-config/src/branch/master/machines/yuzuru).
+The configuration is available [here](https://git.sbruder.de/simon/nixos-config/src/branch/master/machines/okarin).
 
 If you have any questions, please [contact me](https://sbruder.de).
 
@@ -54,7 +54,6 @@ You can export or delete that data by using its built-in data control feature.
 
 In the case of an error, details of the problematic request might be stored on the server
 and used strictly for debugging and fixing the error.
-Those logs will be deleted after one week.
 
 #### Fine Print
 
diff --git a/machines/yuzuru/services/sbruder.xyz/metadata.yaml b/machines/okarin/services/sbruder.xyz/metadata.yaml
similarity index 100%
rename from machines/yuzuru/services/sbruder.xyz/metadata.yaml
rename to machines/okarin/services/sbruder.xyz/metadata.yaml
diff --git a/machines/yuzuru/configuration.nix b/machines/yuzuru/configuration.nix
index fc458ec..a421e2a 100644
--- a/machines/yuzuru/configuration.nix
+++ b/machines/yuzuru/configuration.nix
@@ -8,7 +8,6 @@
     ./services/invidious
     ./services/libreddit.nix
     ./services/nitter.nix
-    ./services/sbruder.xyz
     ./services/schabernack.nix
   ];