From 141bfa4f462cbe64c3ef16e2259cd746a392071b Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sat, 9 Apr 2022 10:12:12 +0200 Subject: [PATCH] yuzuru: Remove It no longer hosts any services so it is going to be removed. --- machines/default.nix | 5 --- machines/renge/services/prometheus.nix | 1 - machines/yuzuru/README.md | 18 -------- machines/yuzuru/configuration.nix | 34 -------------- machines/yuzuru/hardware-configuration.nix | 39 ---------------- machines/yuzuru/secrets.yaml | 52 ---------------------- modules/wireguard/home.nix | 4 -- 7 files changed, 153 deletions(-) delete mode 100644 machines/yuzuru/README.md delete mode 100644 machines/yuzuru/configuration.nix delete mode 100644 machines/yuzuru/hardware-configuration.nix delete mode 100644 machines/yuzuru/secrets.yaml diff --git a/machines/default.nix b/machines/default.nix index 6481ee5..b889943 100644 --- a/machines/default.nix +++ b/machines/default.nix @@ -33,11 +33,6 @@ in hardware.common-pc-ssd ]; }; - yuzuru = { - system = "x86_64-linux"; - - targetHost = "yuzuru.sbruder.xyz"; - }; okarin = { system = "x86_64-linux"; diff --git a/machines/renge/services/prometheus.nix b/machines/renge/services/prometheus.nix index 170bed3..a1dfcff 100644 --- a/machines/renge/services/prometheus.nix +++ b/machines/renge/services/prometheus.nix @@ -67,7 +67,6 @@ in "renge.vpn.sbruder.de:9100" "sayuri.vpn.sbruder.de:9100" "vueko.vpn.sbruder.de:9100" - "yuzuru.vpn.sbruder.de:9100" ]; } { diff --git a/machines/yuzuru/README.md b/machines/yuzuru/README.md deleted file mode 100644 index c71ebd8..0000000 --- a/machines/yuzuru/README.md +++ /dev/null @@ -1,18 +0,0 @@ -# yuzuru - -## Hardware - -[Hetzner Cloud](https://hetzner.com/cloud) CX11 (1 vCPU, 2 GB RAM, 20 GB SSD). -It has no swap, since the disk is already small enough. - -## Purpose - -It provides privacy-friendly proxies/alternatives to popular web services: - - * Invidious - * Libreddit - * Nitter - -## Name - -Yuzuru Nishimiya is a character from *A Silent Voice* diff --git a/machines/yuzuru/configuration.nix b/machines/yuzuru/configuration.nix deleted file mode 100644 index 766c05c..0000000 --- a/machines/yuzuru/configuration.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ./hardware-configuration.nix - ../../modules - ]; - - sbruder = { - nginx.hardening.enable = true; - wireguard.home.enable = true; - full = false; - trusted = false; - }; - - networking.hostName = "yuzuru"; - - system.stateVersion = "21.05"; - - networking.firewall.allowedTCPPorts = [ 80 443 ]; - - services.nginx = { - enable = true; - - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - }; - - services.journald.extraConfig = '' - MaxRetentionSec=1week - ''; -} diff --git a/machines/yuzuru/hardware-configuration.nix b/machines/yuzuru/hardware-configuration.nix deleted file mode 100644 index 1fae7f2..0000000 --- a/machines/yuzuru/hardware-configuration.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - ]; - - boot = { - initrd.kernelModules = [ "nvme" ]; - loader.grub.device = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-0"; - }; - - fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/b8ceb0bf-1a67-484b-bf57-c16653c23716"; - fsType = "btrfs"; - options = [ "discard=async" "noatime" "compress=zstd" ]; - }; - }; - - networking = { - useDHCP = false; - usePredictableInterfaceNames = false; - interfaces.eth0 = { - useDHCP = true; - ipv6.addresses = lib.singleton { - address = "2a01:4f9:c010:e4a7::"; - prefixLength = 64; - }; - }; - defaultGateway6 = { - address = "fe80::1"; - interface = "eth0"; - }; - }; - - # no smart on qemu disk - services.smartd.enable = false; -} diff --git a/machines/yuzuru/secrets.yaml b/machines/yuzuru/secrets.yaml deleted file mode 100644 index 459d8f3..0000000 --- a/machines/yuzuru/secrets.yaml +++ /dev/null @@ -1,52 +0,0 @@ -wg-home-private-key: ENC[AES256_GCM,data:KIUvsIhz2Rc4uHRQla714xfOxL9ke1WzRAbXVTDd6UyNkYQkuYIxIpmXQw4=,iv:usnONR35DtIVH2CV4tGSBz5FsZyMlEDzSQiYLDQLRnw=,tag:M1V4HhtByXogMacjajl1iw==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: [] - lastmodified: "2022-03-03T11:42:01Z" - mac: ENC[AES256_GCM,data:WDFDnF+bsB72n13Udh9SRsQH0l9lhLozceze2tF/RDKYY+T0CHwkAkSOqeUhL6Euasp2pQuapCrwWT9jyd9XfbwlWgnSUgy4TFIQtiS++dHsUfq69Z9y4gLeY7vQLWVcW3CVVX0Tg61iwihEdd49ARsTre1livvgE33glwcz6O0=,iv:2THxHyoq6qNMzd2LObfUSXMU2KakPXQK5ta+4D9jSBw=,tag:usug6AqI5toJ8VHvIQxGGg==,type:str] - pgp: - - created_at: "2021-09-08T16:11:14Z" - enc: | - -----BEGIN PGP MESSAGE----- - - hQIMAwDgSONkM+d4ARAAhB2PfDQ+KeTI22tc2i4Bc5mVUMDHVpUFn81GzEubwrL0 - xKqhDgCYfOogahJ7nvor/kLo0YSQuNs8mSJEgnBVnC4GnzeTQucJ5y8Ke/erBV0P - xscrZSINv4XtUllGFKc6LcKC+J9sbEcjDUMLwTiMBMcnhjm6mjOkT46ldIwXfnVq - vbKaVvUj0U/6awt0f/mqmce8PNfHzJ6rubcEEplBTLG/Qu+tmYFNVcWtsmP21SCt - u3Va9JeKmkIa83MY1khtnpSA2rnUa/acZL7vTRTcpCh8qvShtfoMrn9BKTjFhV6i - ggrkZKf4StJ+A1wgqw2IbwTH+M+5FM5loI4/9xQnkPkyiJIQByZXwQP2/EmuFpPE - sF5UByFTrpC/d7kN7R/xXFcGDIf384RM7Ia4W4XleyKUJ4XHWDkecFU1oT1kLcsA - kIYNgjEq4TSAVJMCKa4q3fQilaJ0K27Bvs3p90brzVEnM128k6eavpkrcjojs0JU - mV3ixEcS9OBwFfmQolekEt9TJebGNVmzg89TAQ3xn3DAJJPtBsmgM1LliJ39/ev3 - SeO1rQPBWaxurKksWsDoqcqUtB0r+yR/flfh+Lr+iAgi+fS4W67WwcPm/9SENlUV - 8OJ/YEkFxhBGiwJEudIGXQ965Z7+wSbpn1ILUaEvGvWvuOg1L6KjCUVbIbH92fjS - XAETVqe2zqU2IENVIY/HiMfUQG58M+CVytaWr4zyQ9X4Fc9BmvmjUgSn/4d/LdU3 - kDT/tDL1fvdX1prXIGUseScSQGPxOamWFB3TPqzWdjhvbkEtT8wp8FqKP/Es - =rPPP - -----END PGP MESSAGE----- - fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC - - created_at: "2021-09-08T16:11:14Z" - enc: | - -----BEGIN PGP MESSAGE----- - - hQIMA2dFplKjEYbbARAAyvcLSp8ktZ/dqVROfa+xeeIFt9J5EGREnAgES2h9wy8m - 21tsQWPajIwD3H52XW6Z1s0nxG8qUe1bz9RWvd51sonmZZobezagr9YfDMTMji8Z - Hmj+fQ0OdhQdJgaUc8JObvmTNeJyjodKS4TbOZqT/SCheS7DhnzcucqlN0uiVuHT - DIUzhM1uzHKcU8IOSclz4LPWLrKvn1yuRGKOplBuvwvd5g2I4QA5obq9Je4WYKEv - XL9quQfWW2OBV5XMK132Ttv6aXSJcrxDiI5CsvKivOcB+Rw9wjEesMJ9wBe8Od0L - jP/ehkGBsxq107M9srbn2WKjkvXFwpdDzpaQG2w1ZSIwHnsNunlDiU95oIDUcW3Y - p0JeL9Nn7uBvsnOKkBMCgXNH1VOBSLxRUDHlDVJIHWNl7TCqPfzKCc8ttq+lbmOf - dbATPhXh9wXQ1GgduexFGK4DSKteqSC8bgKC5JnmLx2ijOSgLGxaL4snAs3oqD2Q - gQptmLgiuFlof98l3TVJDN1yc6ononyIA72gvQ7e+zme6Q7UkkXU7gJHnd9k9YAL - 7GQcxn9kTCz/iXxC3+ac/IMZae9b5bz8UGZdsI47RoovZ3dJlGj8jkjPJ7QTfZml - 9EVuGkO0qWyPDzy14VTaCtKjtTOGm5iZwd8G63BPbaAlfyd6412QbisyC5ClICLS - TgF/ABxdrd/GbBzs3w7/8bAjR13EAVJWzqUQgKxluP0UxIthZn5od2f3pPaEyvfd - 30eBLqpclcaQNIbGtv0qr5Ehjs26uKbAOXmNX+GbdA== - =h33S - -----END PGP MESSAGE----- - fp: F4B5F6971A1FAEA1216FCE1C6745A652A31186DB - unencrypted_suffix: _unencrypted - version: 3.7.1 diff --git a/modules/wireguard/home.nix b/modules/wireguard/home.nix index dca83ed..5de1216 100644 --- a/modules/wireguard/home.nix +++ b/modules/wireguard/home.nix @@ -18,10 +18,6 @@ let address = "10.80.0.9"; publicKey = "nnLdgywXmDg8HWH6I0G28Z2zb4OmmyFDpnvvEBzKJTg="; }; - yuzuru = { - address = "10.80.0.8"; - publicKey = "2pQ2r0q+960dq7wXr1c5Shcz6K+rdhIA8fKAu2Lnhl0="; - }; okarin = { address = "10.80.0.10"; publicKey = "wspALdgkj8Sw+ehNSwHziYE5ZTVyF6rRBKvDHl7moj8=";