diff options
| author | tv <tv@krebsco.de> | 2017-12-05 18:42:27 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-12-05 18:42:27 +0100 |
| commit | 18fad9c618be468d3a8e902ee2e23143e598163c (patch) | |
| tree | 06de87b60aa8a783b27477e9d472b1193dbec50d /krebs | |
| parent | e5ab9b686ad7337d54e5d2b2ff6e8f88ac7a68f1 (diff) | |
| parent | e37ca2ceaf83adfdf93f512dd5e5849ddba4e7fb (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 1 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/krebszones/default.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 29f188bbe..080b8fced 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -540,6 +540,7 @@ with import <stockholm/lib>; wiki.euer IN A ${nets.internet.ip4.addr} graph IN A ${nets.internet.ip4.addr} ghook IN A ${nets.internet.ip4.addr} + dockerhub IN A ${nets.internet.ip4.addr} io IN NS gum.krebsco.de. ''; }; diff --git a/krebs/5pkgs/simple/krebszones/default.nix b/krebs/5pkgs/simple/krebszones/default.nix index b54c95d88..32608e7fa 100644 --- a/krebs/5pkgs/simple/krebszones/default.nix +++ b/krebs/5pkgs/simple/krebszones/default.nix @@ -2,7 +2,7 @@ pkgs.writeDashBin "krebszones" '' set -efu - export OVH_ZONE_CONFIG=$HOME/.secrets/krebs/ovh-zone.conf + export OVH_ZONE_CONFIG=''${OVH_ZONE_CONFIG:-$HOME/.secrets/krebs/ovh-zone.conf} case $* in import) set -- import /etc/zones/krebsco.de krebsco.de |