diff options
| author | lassulus <lass@lassul.us> | 2017-06-06 14:31:53 +0200 |
|---|---|---|
| committer | lassulus <lass@lassul.us> | 2017-06-06 14:31:53 +0200 |
| commit | 6d96297a9d6bcddc8b545585d9e4180e493b899f (patch) | |
| tree | f2652c987a396238c257b637d8b8422e03aa9072 /tv/1systems | |
| parent | 1ebd26d96de5714f35f31fcefc89cbb414c21093 (diff) | |
| parent | d18eb5ccd1ec6cc0b7797ac72d8bb258689a544b (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/1systems')
| -rw-r--r-- | tv/1systems/nomic.nix | 2 | ||||
| -rw-r--r-- | tv/1systems/wu.nix | 2 | ||||
| -rw-r--r-- | tv/1systems/xu.nix | 15 | ||||
| -rw-r--r-- | tv/1systems/zu.nix | 2 |
4 files changed, 17 insertions, 4 deletions
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix index 5469fffd5..9b9502254 100644 --- a/tv/1systems/nomic.nix +++ b/tv/1systems/nomic.nix @@ -9,7 +9,7 @@ with import <stockholm/lib>; ../. ../2configs/hw/x220.nix ../2configs/exim-retiolum.nix - ../2configs/git.nix + ../2configs/gitrepos.nix ../2configs/im.nix ../2configs/mail-client.nix ../2configs/nginx/public_html.nix diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 328e71fdc..60f9fa100 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -9,7 +9,7 @@ with import <stockholm/lib>; ../. ../2configs/hw/w110er.nix ../2configs/exim-retiolum.nix - ../2configs/git.nix + ../2configs/gitrepos.nix ../2configs/im.nix ../2configs/mail-client.nix ../2configs/man.nix diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix index 60d1af23e..bfd59531a 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -9,7 +9,8 @@ with import <stockholm/lib>; ../. ../2configs/hw/x220.nix ../2configs/exim-retiolum.nix - ../2configs/git.nix + ../2configs/gitconfig.nix + ../2configs/gitrepos.nix ../2configs/mail-client.nix ../2configs/man.nix ../2configs/nginx/public_html.nix @@ -46,6 +47,18 @@ with import <stockholm/lib>; texlive.combined.scheme-full tmux + (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.krebszones}/bin/ovh-zone "$@" + '') + #ack #apache-httpd #ascii diff --git a/tv/1systems/zu.nix b/tv/1systems/zu.nix index b1b2d58ce..5552ef065 100644 --- a/tv/1systems/zu.nix +++ b/tv/1systems/zu.nix @@ -15,7 +15,7 @@ with import <stockholm/lib>; ../. ../2configs/hw/x220.nix ../2configs/exim-retiolum.nix - ../2configs/git.nix + ../2configs/gitrepos.nix ../2configs/mail-client.nix ../2configs/man.nix ../2configs/nginx/public_html.nix |