From 97c9da9af23dd69c6d2751b6f95865272b88b0db Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 14 Jul 2017 20:40:54 +0200 Subject: [PATCH 1/3] l websites domsen: serve www. for habsys --- lass/2configs/websites/domsen.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 36ded3b30..3bc5570c4 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -28,7 +28,12 @@ in { (servePage [ "karlaskop.de" ]) (servePage [ "makeup.apanowicz.de" ]) (servePage [ "pixelpocket.de" ]) - (servePage [ "habsys.de" "habsys.eu" ]) + (servePage [ + "habsys.de" + "habsys.eu" + "www.habsys.de" + "www.habsys.eu" + ]) (serveOwncloud [ "o.ubikmedia.de" ]) (serveWordpress [ "ubikmedia.de" From b91a4c4b0f0958cdc5e7c0d60523326083f275d4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 14 Jul 2017 20:41:33 +0200 Subject: [PATCH 2/3] l baseX: add hledger to pkgs --- lass/2configs/baseX.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 3e2e325d8..2357d6d26 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -50,6 +50,7 @@ in { dmenu gitAndTools.qgit lm_sensors + haskellPackages.hledger much ncdu nmap From 205f3d3adbc3e0cbe3ab3755bb005ed10d84c03d Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 16 Jul 2017 12:10:09 +0200 Subject: [PATCH 3/3] krebs: remove duplicate mail setting --- krebs/3modules/krebs/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/krebs/3modules/krebs/default.nix b/krebs/3modules/krebs/default.nix index 780aeb1cf..0aa0cac9d 100644 --- a/krebs/3modules/krebs/default.nix +++ b/krebs/3modules/krebs/default.nix @@ -68,7 +68,6 @@ in { } // testHosts; users = { krebs = { - mail = "spam@krebsco.de"; pubkey = "lol"; # TODO krebs.users.krebs.pubkey should be unnecessary }; };