summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2019-01-31 14:40:57 +0100
committerlassulus <lassulus@lassul.us>2019-02-08 05:19:48 +0100
commitbc4984c7fa6a50052436399364d2de7f76f1cd2e (patch)
tree682280cc31040f77ae766b4b990301d779e62574
parent6830a9b32a19d3347f005a491d7a2c8f4094090c (diff)
retiolum-hosts: RIP
-rw-r--r--krebs/3modules/default.nix1
-rw-r--r--krebs/3modules/retiolum-hosts.nix8
-rw-r--r--lass/2configs/websites/lassulus.nix2
3 files changed, 1 insertions, 10 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 9303a81fb..c72215e79 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -45,7 +45,6 @@ let
./reaktor2.nix
./realwallpaper.nix
./retiolum-bootstrap.nix
- ./retiolum-hosts.nix
./rtorrent.nix
./secret.nix
./setuid.nix
diff --git a/krebs/3modules/retiolum-hosts.nix b/krebs/3modules/retiolum-hosts.nix
deleted file mode 100644
index 2da174bea..000000000
--- a/krebs/3modules/retiolum-hosts.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-with import <stockholm/lib>;
-{ config, pkgs, ... }: {
- nixpkgs.config.packageOverrides = super: {
- retiolum-hosts =
- trace "pkgs.retiolum-hosts is deprecated, use pkgs.krebs-hosts-retiolum instead"
- pkgs.krebs-hosts-retiolum;
- };
-}
diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index 27cadd100..526909e8a 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -61,7 +61,7 @@ in {
alias ${config.krebs.tinc.retiolum.hostsArchive};
'';
locations."= /retiolum.hosts".extraConfig = ''
- alias ${pkgs.retiolum-hosts};
+ alias ${pkgs.krebs-hosts-retiolum};
'';
locations."= /wireguard-key".extraConfig = ''
alias ${pkgs.writeText "prism.wg" config.krebs.hosts.prism.nets.wiregrill.wireguard.pubkey};