diff --git a/config/hosts/hydra/configuration.nix b/config/hosts/hydra/configuration.nix index 9b554d8..eff89d1 100644 --- a/config/hosts/hydra/configuration.nix +++ b/config/hosts/hydra/configuration.nix @@ -24,7 +24,6 @@ users.users.builder = { isNormalUser = true; openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK/plZfxF/RtB+pJsUYx9HUgRcB56EoO0uj+j3AGzZta root@cherry" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKeIiHkHA5c6/jZx+BB28c5wchdzlFI7R1gbvNmPyoOg root@kiara" ]; }; diff --git a/config/hosts/ikiwiki/configuration.nix b/config/hosts/ikiwiki/configuration.nix deleted file mode 100644 index 632c401..0000000 --- a/config/hosts/ikiwiki/configuration.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ ... }: -{ - boot.loader.grub = { - enable = true; - device = "/dev/vda"; - }; - - networking = { - hostName = "ikiwiki"; - firewall = { - enable = true; - allowedTCPPorts = [ 80 8443 ]; - }; - }; - - fileSystems = { - # partition data disk with `sudo mkfs.ext4 /dev/vdx` - # label data disk with `e2label /dev/vdx "data"` - "/mnt/data" = { - device = "/dev/disk/by-label/data"; - fsType = "ext4"; - autoResize = true; - }; - }; - - system.stateVersion = "24.05"; -} diff --git a/config/hosts/ikiwiki/default.nix b/config/hosts/ikiwiki/default.nix deleted file mode 100644 index bc9766c..0000000 --- a/config/hosts/ikiwiki/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: -{ - imports = [ - ./configuration.nix - ./ikiwiki.nix - ./nginx.nix - ]; -} diff --git a/config/hosts/ikiwiki/ikiwiki.nix b/config/hosts/ikiwiki/ikiwiki.nix deleted file mode 100644 index 35fea70..0000000 --- a/config/hosts/ikiwiki/ikiwiki.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, config, ... }: -{ - environment.systemPackages = with pkgs; [ - ikiwiki-full - ]; - - services.fcgiwrap.instances."ikiwiki" = { - socket = { - user = config.services.nginx.user; - group = config.services.nginx.group; - }; - process = { - user = config.services.nginx.user; - group = config.services.nginx.group; - }; - }; -} diff --git a/config/hosts/ikiwiki/nginx.nix b/config/hosts/ikiwiki/nginx.nix deleted file mode 100644 index b78131f..0000000 --- a/config/hosts/ikiwiki/nginx.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ pkgs, ... }: -{ - services.nginx = { - enable = true; - virtualHosts."fi.nekover.se" = { - forceSSL = true; - enableACME = true; - listen = [ - { - addr = "0.0.0.0"; - port = 80; - } - { - addr = "0.0.0.0"; - port = 8443; - ssl = true; - extraParameters = [ "proxy_protocol" ]; - } - ]; - root = "/mnt/data/public_html/fi-zone"; - locations = { - "/" = { - tryFiles = "$uri $uri/ =404"; - }; - "~ .cgi" = { - extraConfig = '' - gzip off; - fastcgi_pass unix:/var/run/fcgiwrap-ikiwiki.sock; - include ${pkgs.nginx}/conf/fastcgi_params; - ''; - }; - }; - extraConfig = '' - set_real_ip_from 10.202.41.100; - real_ip_header proxy_protocol; - ''; - }; - }; -} diff --git a/config/hosts/web-public-2/nginx.nix b/config/hosts/web-public-2/nginx.nix index 1f14695..8debb31 100644 --- a/config/hosts/web-public-2/nginx.nix +++ b/config/hosts/web-public-2/nginx.nix @@ -20,7 +20,6 @@ birdsite.nekover.se 10.202.41.107:8443; cloud.nekover.se 10.202.41.122:8443; element.nekover.se 127.0.0.1:8443; - fi.nekover.se 10.202.41.125:8443; gameserver.grzb.de 127.0.0.1:8443; git.grzb.de 127.0.0.1:8443; git.nekover.se 10.202.41.106:8443; diff --git a/config/hosts/web-public-2/virtualHosts/acme-challenge.nix b/config/hosts/web-public-2/virtualHosts/acme-challenge.nix index 59b9d3a..558aa95 100644 --- a/config/hosts/web-public-2/virtualHosts/acme-challenge.nix +++ b/config/hosts/web-public-2/virtualHosts/acme-challenge.nix @@ -7,7 +7,6 @@ let "netbox.grzb.de" = "netbox.vs.grzb.de"; "git.nekover.se" = "forgejo.vs.grzb.de"; "grafana.grzb.de" = "metrics.vs.grzb.de"; - "fi.nekover.se" = "ikiwiki.vs.grzb.de"; "jackett.grzb.de" = "torrent.vs.grzb.de"; "jellyseerr.grzb.de" = "jellyseerr.vs.grzb.de"; "keycloak-admin.nekover.se" = "keycloak.vs.grzb.de"; diff --git a/flake.lock b/flake.lock index 8912e2b..4534930 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730963269, - "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=", + "lastModified": 1730142757, + "narHash": "sha256-O2/v/ocUL0KsACqEIK5eD5XeX46duRIgKdOu6uCKarw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc", + "rev": "dd6d18bf8d291daca03a444973bd4f9aa5c1f681", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1730992357, - "narHash": "sha256-YsODAqOF2xAHyK4+pKiS9nmGu+vQW+9kc5P7uRCirIM=", + "lastModified": 1730209337, + "narHash": "sha256-WPGVR8NW9ctqwLMtYV23b94ExQulTFoTKqD21WI3fbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b651050919c85b9131fa0d2640115ffd9266daad", + "rev": "ec7caabec9679b1a9008e0cbcfa4b14a2b600774", "type": "github" }, "original": { @@ -117,11 +117,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1730945957, - "narHash": "sha256-fhkxOv9RGEoPZNyl7VOpHf0Xoqc+bu0J/uW3BSg7tOs=", + "lastModified": 1730157240, + "narHash": "sha256-P8wF4ag6Srmpb/gwskYpnIsnspbjZlRvu47iN527ABQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0093b93ec307d42f51ced7ce90dda6c37516e98a", + "rev": "75e28c029ef2605f9841e0baa335d70065fe7ae2", "type": "github" }, "original": { diff --git a/hosts.nix b/hosts.nix index 4515394..363f377 100644 --- a/hosts.nix +++ b/hosts.nix @@ -26,14 +26,13 @@ let }) hosts; in generateDefaults { + #fee = { + # site = "wg"; + #}; hydra = { site = "vs"; environment = "proxmox"; }; - ikiwiki = { - site = "vs"; - environment = "proxmox"; - }; iperf = { site = "vs"; environment = "proxmox";