diff options
| author | makefu <github@syntax-fehler.de> | 2017-07-16 15:15:21 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-07-16 15:15:21 +0200 |
| commit | 7dbd54880de22cbebd95593f643f638551ca62df (patch) | |
| tree | 7b5e221134dae32eba20e4d9d737f2f1f6695622 | |
| parent | c62f1fb18d31d76ac554628721422114f9f88f8b (diff) | |
| parent | 205f3d3adbc3e0cbe3ab3755bb005ed10d84c03d (diff) | |
Merge branch 'master' of prism:stockholm
| -rw-r--r-- | krebs/3modules/krebs/default.nix | 1 | ||||
| -rw-r--r-- | lass/2configs/baseX.nix | 1 | ||||
| -rw-r--r-- | lass/2configs/websites/domsen.nix | 7 |
3 files changed, 7 insertions, 2 deletions
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 }; }; 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 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" |