diff options
author | Silas Schöffel <sils@sils.li> | 2025-01-25 21:39:14 +0100 |
---|---|---|
committer | Silas Schöffel <sils@sils.li> | 2025-01-25 21:40:45 +0100 |
commit | cd1c9cb118ea7aec54907e5130ee61bd7e9fa66c (patch) | |
tree | 7d561cc2ca33bb609a5b1eeaea298d3a8afd69fe | |
parent | feat(etesync): migrate to server2 (diff) | |
download | nixos-server-cd1c9cb118ea7aec54907e5130ee61bd7e9fa66c.zip |
feat(hosts)!: remove server1
This host is unused and therefore unneeded
-rw-r--r-- | hosts/by-name/server1/configuration.nix | 38 | ||||
-rw-r--r-- | hosts/by-name/server1/hardware.nix | 14 | ||||
-rw-r--r-- | hosts/by-name/server1/networking.nix | 52 | ||||
-rw-r--r-- | hosts/by-name/server1/secrets/backuppass.age | 14 | ||||
-rw-r--r-- | hosts/by-name/server1/secrets/backupssh.age | 23 | ||||
-rw-r--r-- | hosts/host-names.toml | 1 | ||||
-rw-r--r-- | secrets.nix | 3 |
7 files changed, 0 insertions, 145 deletions
diff --git a/hosts/by-name/server1/configuration.nix b/hosts/by-name/server1/configuration.nix deleted file mode 100644 index 7a6e5b2..0000000 --- a/hosts/by-name/server1/configuration.nix +++ /dev/null @@ -1,38 +0,0 @@ -{config, ...}: { - imports = [ - ./networking.nix # network configuration that just works - ./hardware.nix - - ../../../system - ]; - - vhack = { - backup = { - enable = true; - privateSshKey = ./secrets/backupssh.age; - privatePassword = ./secrets/backuppass.age; - user = "u384702-sub2"; - }; - nginx.enable = true; - openssh.enable = true; - postgresql.enable = true; - users.enable = true; - persist = { - enable = true; - directories = [ - "/var/log" - - # TODO(@bpeetz): Instead of persisting that, encode each uid/gid directly in the - # config. <2024-12-24> - "/var/lib/nixos" - ]; - }; - }; - - boot.tmp.cleanOnBoot = true; - zramSwap.enable = true; - networking.hostName = "server1"; - networking.domain = "vhack.eu"; - - system.stateVersion = "22.11"; -} diff --git a/hosts/by-name/server1/hardware.nix b/hosts/by-name/server1/hardware.nix deleted file mode 100644 index 9abc64c..0000000 --- a/hosts/by-name/server1/hardware.nix +++ /dev/null @@ -1,14 +0,0 @@ -{modulesPath, ...}: { - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - (modulesPath + "/profiles/headless.nix") - ]; - - vhack.disko = { - enable = true; - # FIXME: Find a better way to specify the disk - disk = "/dev/vda"; - }; - boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"]; - boot.initrd.kernelModules = []; -} diff --git a/hosts/by-name/server1/networking.nix b/hosts/by-name/server1/networking.nix deleted file mode 100644 index dd9b9af..0000000 --- a/hosts/by-name/server1/networking.nix +++ /dev/null @@ -1,52 +0,0 @@ -{lib, ...}: { - # This file was populated at runtime with the networking - # details gathered from the active system. - networking = { - nameservers = [ - "8.8.8.8" - ]; - defaultGateway = { - address = "89.58.56.1"; - interface = "eth0"; - }; - defaultGateway6 = { - address = "fe80::1"; - interface = "eth0"; - }; - dhcpcd.enable = false; - usePredictableInterfaceNames = lib.mkForce false; - interfaces = { - eth0 = { - ipv4.addresses = [ - { - address = "89.58.58.33"; - prefixLength = 22; - } - ]; - ipv6.addresses = [ - { - address = "2a03:4000:6a:3f3::1"; - prefixLength = 64; - } - ]; - ipv4.routes = [ - { - address = "89.58.56.1"; - prefixLength = 32; - } - ]; - ipv6.routes = [ - { - address = "fe80::1"; - prefixLength = 128; - } - ]; - }; - }; - }; - - # cat /sys/class/net/eth0/address - services.udev.extraRules = '' - ATTR{address}=="66:22:6d:82:93:9b", NAME="eth0" - ''; -} diff --git a/hosts/by-name/server1/secrets/backuppass.age b/hosts/by-name/server1/secrets/backuppass.age deleted file mode 100644 index 8ec40a9..0000000 --- a/hosts/by-name/server1/secrets/backuppass.age +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDNDcxbkFiWndxZGdwR2lB -N2lxQjdxZS9FTTl1UDdTbGMyaEtaZ29aM1NVClE0L1dDdllIQUx3MXlJUEJya3N1 -Y1ovWVh4YjNUUXluKzAzd1VKZWFkUHMKLT4gWDI1NTE5IC9YR3JnQVQxYWhSVVdy -c3p2OExkb0xnbStKUHFRZkE0QTBpTStaYjBBak0KRnQ3enZLaXRNbVdtNXBveTN1 -U1FmZDBXZXJpZlorQVd5eXFSTVYxMHZaWQotPiBzc2gtZWQyNTUxOSBPRDhUNGcg -empPMTdrZWZGclAzdnBBbUFjZVB6YTl1VnMxY0dIenhjRGtnSUVjTktIcwpsRFFv -TURIVkswM1EreVgvWWZiSEU0aDBGYWZlZFk2dnZnNExLY3NBbVJvCi0+IGhJY2xX -anwtZ3JlYXNlIEw4S0Q2bHVyIFg1dSAjNnRcdWwKaU53OENqWUVJMWgrZURNbzQ5 -VjZzb1hNbndVCi0tLSBCNktxeXFiVzVlNjdQeXdNZnJtQ0NlVzZuWVpaMExZUVEv -RzdtaU1URzBJCoHd8ODHla1b7opUSmrEAm9S7Ul3QD0iLIyTpKn/PnB5vQ4oVd4H -kgB9FFvfYUpRSVebVyOh/Ocqq0Lalc6Gjc1+/tTbkcJLrhyO6G8x/519Sm0o7qXE -5/jXBpzFoFrsR68= ------END AGE ENCRYPTED FILE----- diff --git a/hosts/by-name/server1/secrets/backupssh.age b/hosts/by-name/server1/secrets/backupssh.age deleted file mode 100644 index bd7cafa..0000000 --- a/hosts/by-name/server1/secrets/backupssh.age +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0VkhnUmpGU3hycEExSWxz -ZVAzM3B5M2pFbFFUMXVGWnRaa3Y1a2VtSDM4ClVncXlpUnNUc1JiM01YcmU4dnNQ -WGZXSFBUQ3FIN0U2K2lBZjVHOFlidXMKLT4gWDI1NTE5IFV4VUczSXJ5TVNEdHdN -VVVJYVgzMTN3Rm5IeXRoekt0dEx5eUVlUGFGVzQKZUJGcU9yWUIzaGVCMDE4bW5m -dGhXM1VDL1c1U0N0NDJEK1J5ODdsNTdqcwotPiBzc2gtZWQyNTUxOSBPRDhUNGcg -TDVjckpka2w2TFRFSXdNbTlOeDBYcFlvajBpMlp0eGJTOUdldlRTck9HRQovdGhY -TkxMZlhEZjVLZ0pPa29Zc09DcjY5YzArYnV4YklQU3Q2U0ZpenhJCi0+IH5SQFt+ -RGlILWdyZWFzZSB2MDBhTnw1OiBmIEhaQiBHZUVaKHErClMwOWlZVGhJcG1LOERw -dTVyOXhVVG5YSGNsd2xYR2lyMkh6cEtHbmYreWIwMU13OFJSYW1xTUVWZm5ySTRy -TzYKKzFwY1RpelpudDFZUzBpKzlMWEV6MnhhUDFpaTRMbVhKQkcrYVFlYnQxSFBj -bnhubmdyYzBiWVBOZwotLS0gV2xIaVhsSVBmU2xINDFXMFlyckJ3WjMxdzluSmFT -bUp2TnFnUHdQUmcxbwpOQ5eYFn1lvDjatNZLdErDyyi+b1xLzhkErEaqDxuY++9b -owQ0rdzFRCokI34Vsa4OOrHOhDUyp7n0EmfXGTrkroTF3hyzpr+2M4jnwVFC7uLU -BbU+ZvekUjekXYBy7WXSt30E9RiUJbiHF5FtOboS2A7j+BXbVaHWPEJgnHDbqVy/ -ejESfOaCkg6avXx32rTkV8FfqQmLSxOpwPnsKgiPeZlE6gXViZ0pLm4pwLr5w75s -ln1ksjjfqQ/wBZn+/tTPEpbwAulEe2qEutCL5NbUih8knx1Wvvm/oFtYvjjaA2ZQ -VizCl+v9cRNfkYfczKSTIrGHRuToADqxzxbA88oZFGHu7td6NCVdWIxenA8yaaT+ -csUCfCVUOd6EoKmEKhTqy0EPfDq807c/+lK4il7DbB2geXs/GiMc0he8KGWuruHU -U2wbOaMYdN9Uez1tlBWJhKrnwOPw3Jad615B/MRt9/rDOAaBVI5ttxpNkLcrx22k -rpLItm23yg35+4e+a9Vl03L7kTOqIurS4JRsMyJpRvrRPJMa5cEVMZ4ZzLe3HrGQ -WrH6OXPGKbq4ZB+1mSE= ------END AGE ENCRYPTED FILE----- diff --git a/hosts/host-names.toml b/hosts/host-names.toml index 6b6d25a..2cf2833 100644 --- a/hosts/host-names.toml +++ b/hosts/host-names.toml @@ -1,3 +1,2 @@ -server1 = "server1.vhack.eu" server2 = "server2.vhack.eu" server3 = "server3.vhack.eu" diff --git a/secrets.nix b/secrets.nix index aef461e..635208a 100644 --- a/secrets.nix +++ b/secrets.nix @@ -30,9 +30,6 @@ in { "./modules/by-name/ma/mastodon/mail.age".publicKeys = server3; "./modules/by-name/ma/matrix/passwd.age".publicKeys = server3; - "./hosts/by-name/server1/secrets/backuppass.age".publicKeys = server1; - "./hosts/by-name/server1/secrets/backupssh.age".publicKeys = server1; - "./hosts/by-name/server2/secrets/backuppass.age".publicKeys = server2; "./hosts/by-name/server2/secrets/backupssh.age".publicKeys = server2; "./hosts/by-name/server2/secrets/etesync/secret_file.age".publicKeys = server2; |