diff options
| author | lassulus <lassulus@lassul.us> | 2021-01-28 18:07:02 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2021-01-28 18:07:02 +0100 |
| commit | 10a397b299698f94561115e8239ed0cd8877c0fe (patch) | |
| tree | 5a58fe88ab8551763818a400f6ebbbd7c69c56ea /krebs | |
| parent | 549f3fd553155412f04870a31849b29776a63d59 (diff) | |
| parent | 0ea65cef9aa2f936f357c624fc53a393f79d8fcc (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 9 | ||||
| -rw-r--r-- | krebs/nixpkgs.json | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 2cb70eec4..c8e1e0386 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -197,6 +197,15 @@ in { wg.euer IN A ${nets.internet.ip4.addr} wiki.euer IN A ${nets.internet.ip4.addr} wikisearch IN A ${nets.internet.ip4.addr} + + meet.euer IN A ${nets.internet.ip4.addr} + work.euer IN A ${nets.internet.ip4.addr} + admin.work.euer IN A ${nets.internet.ip4.addr} + push.work.euer IN A ${nets.internet.ip4.addr} + api.work.euer IN A ${nets.internet.ip4.addr} + maps.work.euer IN A ${nets.internet.ip4.addr} + play.work.euer IN A ${nets.internet.ip4.addr} + ul.work.euer IN A ${nets.internet.ip4.addr} ''; }; cores = 8; diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 97afb10f8..b404cb6c9 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "a058d005b3cbb370bf171ebce01839dd6ff52222", - "date": "2021-01-23T17:41:51-05:00", - "path": "/nix/store/6ps307ghgrp10q3mwgw4lq143pmz0h25-nixpkgs", - "sha256": "154mpqw0ya31hzgz9hggg1rb26yx8d00rsj9l90ndsdldrssgvbb", + "rev": "85abeab48b5feda4b163e5bb32f50aad1164e415", + "date": "2021-01-27T09:52:47+01:00", + "path": "/nix/store/la9l82nbilyhjjl2x294qpf7ki9lzkc3-nixpkgs", + "sha256": "1nslb5p6cf5z691pf52j8bf880sdgav1fcf7bxjk3rad92bniq5g", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false |