diff options
| author | makefu <github@syntax-fehler.de> | 2017-06-06 14:35:58 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-06-06 14:35:58 +0200 |
| commit | ef561203859ec58ebc8e907bb284872af6f4a9a6 (patch) | |
| tree | d66f0270b211c61b306c046595e49d3094138cb5 /tv/1systems | |
| parent | f430671a1b5fbbf10771d8b4066ef9213d87c746 (diff) | |
| parent | 28eeec46a374314fa2b9a339d506274defb072e5 (diff) | |
Merge branch 'master' of prism:stockholm
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 5469fff..9b95022 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 328e71f..60f9fa1 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 60d1af2..bfd5953 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 b1b2d58..5552ef0 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 |