diff options
| author | lassulus <lassulus@lassul.us> | 2020-05-25 16:07:42 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-05-25 16:07:42 +0200 |
| commit | 6c8210f93ae6715cbf5aa2adfef8bfd6bfc908b2 (patch) | |
| tree | f4f87d2212f9c3f628c7ed6b5f652e323642fd52 /krebs | |
| parent | d8386001a04b081e5779386b911cf7d4e9fd30e0 (diff) | |
| parent | 4ba18c6d2a442834e79b5526eff0aa2c5f8398e8 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 2 | ||||
| -rw-r--r-- | krebs/nixpkgs.json | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index c76ed0ad1..e204b4f31 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -182,7 +182,9 @@ in { gum IN A ${nets.internet.ip4.addr} io IN NS gum.krebsco.de. iso.euer IN A ${nets.internet.ip4.addr} + feed.euer IN A ${nets.internet.ip4.addr} board.euer IN A ${nets.internet.ip4.addr} + etherpad.euer IN A ${nets.internet.ip4.addr} rss.euer IN A ${nets.internet.ip4.addr} mediengewitter IN CNAME over.dose.io. mon.euer IN A ${nets.internet.ip4.addr} diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index d180b5f3b..ecf2df035 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels", - "rev": "5adf2a6c11646898742b0c08f7e94101620ba707", - "date": "2020-05-11T09:54:07+01:00", - "sha256": "0wf7pwma2qyfak39b242mcq8z7cdj65sds7hcjxchy0448shapzi", + "rev": "f45ccd9d20b4e90e43c4562b9941ea1dbd8f07a4", + "date": "2020-05-20T11:42:56+02:00", + "sha256": "10476ij19glhs2yy1pmvm0azd75ifjchpfbljn7h1cnnpii1xprc", "fetchSubmodules": false } |