summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2020-12-27 15:47:34 +0100
committertv <tv@krebsco.de>2020-12-27 15:47:34 +0100
commitf78ceaffa2c35cf6b665ed827018ad080cf51aa9 (patch)
tree922126984d5d45d81537f0f4e9a9319010e7fe6b /krebs
parent20d546e8b6755577f79e2df71281ca2b93ef405c (diff)
parent2cbed4cab9bf40fa6d712375b740bfcd41503470 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/exim-retiolum.nix23
-rw-r--r--krebs/5pkgs/simple/realwallpaper/default.nix5
-rw-r--r--krebs/nixpkgs-unstable.json8
-rw-r--r--krebs/nixpkgs.json11
4 files changed, 38 insertions, 9 deletions
diff --git a/krebs/3modules/exim-retiolum.nix b/krebs/3modules/exim-retiolum.nix
index 118a8b2d5..a16661c9f 100644
--- a/krebs/3modules/exim-retiolum.nix
+++ b/krebs/3modules/exim-retiolum.nix
@@ -10,6 +10,11 @@ with import <stockholm/lib>;
(s: substring 1 (stringLength s - 2) s)
(toJSON value);
+ to-lsearch = concatMapStrings ({ from, to, ... }: "${from}: ${to}\n");
+ lsearch = mapAttrs (name: set: toFile name (to-lsearch set)) ({
+ inherit (cfg) system-aliases;
+ });
+
in {
options.krebs.exim-retiolum = {
enable = mkEnableOption "krebs.exim-retiolum";
@@ -59,6 +64,19 @@ in {
};
};
};
+ system-aliases = mkOption {
+ type = types.listOf (types.submodule ({
+ options = {
+ from = mkOption {
+ type = types.str; # TODO e-mail address
+ };
+ to = mkOption {
+ type = types.str; # TODO e-mail address / TODO listOf
+ };
+ };
+ }));
+ default = [];
+ };
};
imports = [
{
@@ -145,6 +163,11 @@ in {
begin routers
+ system_aliases:
+ debug_print = "R: system_aliases for $local_part@$domain"
+ driver = redirect
+ data = ''${lookup{$local_part}lsearch{${lsearch.system-aliases}}}
+
local:
driver = accept
domains = +local_domains
diff --git a/krebs/5pkgs/simple/realwallpaper/default.nix b/krebs/5pkgs/simple/realwallpaper/default.nix
index 72a314ba9..56a7dfb98 100644
--- a/krebs/5pkgs/simple/realwallpaper/default.nix
+++ b/krebs/5pkgs/simple/realwallpaper/default.nix
@@ -108,7 +108,10 @@ pkgs.writers.writeDashBin "generate-wallpaper" ''
'https://neo.sci.gsfc.nasa.gov/view.php?datasetId=MOD14A1_E_FIRE') &
# regular fetches
- fetch marker.json "$marker_url" &
+ fetch marker.json.tmp "$marker_url"
+ if [ -s marker.json.tmp ]; then
+ mv marker.json.tmp marker.json
+ fi
fetch sun-raw.jpg 'https://sdo.gsfc.nasa.gov/assets/img/latest/latest_512_0171.jpg' &
wait
diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json
index aa78bef29..4f07b0e88 100644
--- a/krebs/nixpkgs-unstable.json
+++ b/krebs/nixpkgs-unstable.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/NixOS/nixpkgs",
- "rev": "a322b32e9d74fb476944ff6cfb55833dc69cfaaa",
- "date": "2020-11-19T01:15:20+01:00",
- "path": "/nix/store/cgb65l8rr7v7dd4hk5sv05bnmqkcgl0n-nixpkgs",
- "sha256": "1r0mkiqxija75spnyksmh8x5j4smnrxv5f7768s81gsl570kls0l",
+ "rev": "e9158eca70ae59e73fae23be5d13d3fa0cfc78b4",
+ "date": "2020-12-09T15:09:49+01:00",
+ "path": "/nix/store/cx4wf6pi1l2p01sz7png891m65kinfz3-nixpkgs",
+ "sha256": "0cnmvnvin9ixzl98fmlm3g17l6w95gifqfb3rfxs55c0wj2ddy53",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index b21087764..44e373b81 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,7 +1,10 @@
{
"url": "https://github.com/NixOS/nixpkgs",
- "rev": "f41c0fc7d8e49d94220f74495d4d702922df2a67",
- "date": "2020-11-15T21:38:00-06:00",
- "sha256": "01wim7ayn69y056q28ifw2f0mdypidpc0z15dda54aj5yy5vai09",
- "fetchSubmodules": false
+ "rev": "3d2d8f281a27d466fa54b469b5993f7dde198375",
+ "date": "2020-12-20T14:17:36+01:00",
+ "path": "/nix/store/mqn37480fj6x9xbq3igz4haw3m2lc7fm-nixpkgs",
+ "sha256": "1hfis53xyzy6hfdivlwkwdy7irbhk7c500a4lf7x43cfkijx5ks1",
+ "fetchSubmodules": false,
+ "deepClone": false,
+ "leaveDotGit": false
}