diff options
| -rw-r--r-- | krebs/5pkgs/simple/krebszones/default.nix | 36 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/ovh-zone/default.nix | 25 | ||||
| -rw-r--r-- | lass/1systems/mors.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/buildbot-standalone.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/tools/dev.nix | 2 | ||||
| -rw-r--r-- | tv/2configs/default.nix | 2 |
6 files changed, 41 insertions, 28 deletions
diff --git a/krebs/5pkgs/simple/krebszones/default.nix b/krebs/5pkgs/simple/krebszones/default.nix index 9230192bd..b54c95d88 100644 --- a/krebs/5pkgs/simple/krebszones/default.nix +++ b/krebs/5pkgs/simple/krebszones/default.nix @@ -1,25 +1,13 @@ -{ lib, pkgs,python3Packages,fetchurl, ... }: +{ pkgs, ... }: -# TODO: Prepare a diff of future and current -## ovh-zone export krebsco.de --config ~/secrets/krebs/cfg.json |sed 's/[ ]\+/ /g' | sort current -## sed 's/[ ]\+/ /g'/etc/zones/krebsco.de | sort > future -## diff future.sorted current.sorted - -python3Packages.buildPythonPackage rec { - name = "krebszones-${version}"; - version = "0.4.4"; - propagatedBuildInputs = with pkgs.python3Packages;[ - d2to1 # for setup to work - ovh - docopt - ]; - src = fetchurl { - url = "https://pypi.python.org/packages/source/k/krebszones/krebszones-${version}.tar.gz"; - sha256 = "1bzfc2b9468769j1yj93j12zdlccqbjiqfhql2larximh491sg4d"; - }; - meta = { - homepage = http://krebsco.de/; - description = "OVH Zone Upload"; - license = lib.licenses.wtfpl; - }; -} +pkgs.writeDashBin "krebszones" '' + set -efu + export OVH_ZONE_CONFIG=$HOME/.secrets/krebs/ovh-zone.conf + case $* in + import) + set -- import /etc/zones/krebsco.de krebsco.de + echo "+ krebszones $*" >&2 + ;; + esac + exec ${pkgs.ovh-zone}/bin/ovh-zone "$@" +'' diff --git a/krebs/5pkgs/simple/ovh-zone/default.nix b/krebs/5pkgs/simple/ovh-zone/default.nix new file mode 100644 index 000000000..051a14e8d --- /dev/null +++ b/krebs/5pkgs/simple/ovh-zone/default.nix @@ -0,0 +1,25 @@ +{ lib, pkgs,python3Packages,fetchurl, ... }: + +# TODO: Prepare a diff of future and current +## ovh-zone export krebsco.de --config ~/secrets/krebs/cfg.json |sed 's/[ ]\+/ /g' | sort current +## sed 's/[ ]\+/ /g'/etc/zones/krebsco.de | sort > future +## diff future.sorted current.sorted + +python3Packages.buildPythonPackage rec { + name = "ovh-zone-${version}"; + version = "0.4.4"; + propagatedBuildInputs = with pkgs.python3Packages;[ + d2to1 # for setup to work + ovh + docopt + ]; + src = fetchurl { + url = "https://pypi.python.org/packages/source/k/krebszones/krebszones-${version}.tar.gz"; + sha256 = "1bzfc2b9468769j1yj93j12zdlccqbjiqfhql2larximh491sg4d"; + }; + meta = { + homepage = http://krebsco.de/; + description = "OVH Zone Upload"; + license = lib.licenses.wtfpl; + }; +} diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index dd3777c64..a5305c07c 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -76,7 +76,7 @@ with import <stockholm/lib>; } { environment.systemPackages = [ - pkgs.krebszones + pkgs.ovh-zone ]; } { diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 227152482..5edd1075d 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -178,11 +178,11 @@ in { "haskellPackages.scanner", "haskellPackages.xmonad-stockholm", "krebspaste", - "krebszones", "logf", "much", "newsbot-js", "noVNC", + "ovh-zone", "passwdqc-utils", "populate", "posix-array", diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix index 8e4e3270d..4fe7f8bf4 100644 --- a/makefu/2configs/tools/dev.nix +++ b/makefu/2configs/tools/dev.nix @@ -11,6 +11,6 @@ esptool cac-api cac-panel - krebszones + ovh-zone ]; } diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index b2560084d..b1d739ef3 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -155,7 +155,7 @@ with import <stockholm/lib>; environment.systemPackages = [ pkgs.get pkgs.krebspaste - pkgs.krebszones + pkgs.ovh-zone pkgs.nix-prefetch-scripts pkgs.push ]; |