diff --git a/depot/hosts/samhain/nixos.nix b/depot/hosts/samhain/nixos.nix index 917f8819..01ff3917 100644 --- a/depot/hosts/samhain/nixos.nix +++ b/depot/hosts/samhain/nixos.nix @@ -16,6 +16,7 @@ in { users.kat.guiFull services.netdata services.nginx + services.katsplash services.node-exporter services.promtail services.restic diff --git a/depot/hosts/yule/nixos.nix b/depot/hosts/yule/nixos.nix index e15db898..423c4a74 100644 --- a/depot/hosts/yule/nixos.nix +++ b/depot/hosts/yule/nixos.nix @@ -57,10 +57,6 @@ with lib; useDHCP = false; wireless.interfaces = singleton "wlp2s0"; interfaces = { - enp1s0.ipv4.addresses = singleton { - inherit (config.network.addresses.private.ipv4) address; - prefixLength = 24; - }; wlp2s0.ipv4.addresses = singleton { inherit (config.network.addresses.private.ipv4) address; prefixLength = 24; diff --git a/depot/services/katsplash/default.nix b/depot/services/katsplash/default.nix new file mode 100644 index 00000000..530f92a7 --- /dev/null +++ b/depot/services/katsplash/default.nix @@ -0,0 +1,8 @@ +{ config, pkgs, kw, ... }: + +let splashy = pkgs.kat-splash config.networking.hostName; in { + services.nginx.virtualHosts = kw.virtualHostGen { + networkFilter = ["private"]; + block.locations."/" = { root = splashy; }; + }; +} diff --git a/depot/services/website/default.nix b/depot/services/website/default.nix index 7a610745..0bbe2c1c 100644 --- a/depot/services/website/default.nix +++ b/depot/services/website/default.nix @@ -4,8 +4,6 @@ services.nginx.virtualHosts = { "${config.network.dns.domain}" = { root = pkgs.kat-website; - enableACME = true; - forceSSL = true; }; }; } diff --git a/pkgs/default.nix b/pkgs/default.nix index a663e780..e00ce4b3 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -78,6 +78,8 @@ let withBackends = [ "freeimage" "libjpeg" "libpng" "librsvg" "libnsgif" "libheif" "libtiff" ]; }; + kat-splash = self.callPackage ./kat-splash { }; + kat-glauca-dns = self.callPackage ./kat-glauca-dns { }; kat-gpg-status = self.callPackage ./kat-gpg-status { }; diff --git a/pkgs/kat-splash/default.nix b/pkgs/kat-splash/default.nix new file mode 100644 index 00000000..a7bdc9f1 --- /dev/null +++ b/pkgs/kat-splash/default.nix @@ -0,0 +1,22 @@ +{ writeTextFile, linkFarm }: hostname: + +let mewp = writeTextFile { + name = "index.html"; + text = '' + +
+
+
+ stop snooping, it's mean! o:
+ + +''; }; mewy = "${./splash.jpg}"; +in linkFarm "index" [ + { name = "index.html"; path = mewp; } + { name = "splash.jpg"; path = mewy; } +]