diff options
author | makefu <github@syntax-fehler.de> | 2015-07-24 10:57:53 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-07-24 10:57:53 +0200 |
commit | fa626593510aad9baa7a23688596494899ef8340 (patch) | |
tree | 42d2311ad60dfe545052b6a8bc0d7e0df14adc25 | |
parent | cc7fee4889a648076835f6b57dc7a54bde8ed42c (diff) | |
parent | bbdfb268e701519ff172b43bd01d3740a47a8ef6 (diff) |
Merge remote-tracking branch 'cd/master'
Conflicts:
3modules/tv/retiolum.nix
-rw-r--r-- | 1systems/tv/wu.nix | 2 | ||||
-rw-r--r-- | 2configs/tv/git-public.nix | 141 | ||||
-rw-r--r-- | 3modules/tv/retiolum.nix | 9 |
3 files changed, 72 insertions, 80 deletions
diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix index 400005c..76bb43e 100644 --- a/1systems/tv/wu.nix +++ b/1systems/tv/wu.nix @@ -168,7 +168,7 @@ in # then we have to update the package # ref src/nixpkgs/pkgs/tools/admin/sec/default.nix - http://simple-evcorr.sourceforge.net/ + https://api.github.com/repos/simple-evcorr/sec/tags # ref src/nixpkgs/pkgs/tools/networking/urlwatch/default.nix https://thp.io/2008/urlwatch/ diff --git a/2configs/tv/git-public.nix b/2configs/tv/git-public.nix index aef8366..7222f99 100644 --- a/2configs/tv/git-public.nix +++ b/2configs/tv/git-public.nix @@ -1,87 +1,80 @@ { config, lib, pkgs, ... }: - -with lib; +with import ../../4lib/tv { inherit lib pkgs; }; let - inherit (builtins) map readFile; - inherit (lib) concatMap listToAttrs; - # TODO lib should already include our stuff - inherit (import ../../4lib/tv { inherit lib pkgs; }) addNames git; - - public-git-repos = [ - (public "cgserver") - (public "crude-mail-setup") - (public "dot-xmonad") - (public "hack") - (public "load-env") - (public "make-snapshot") - (public "mime") - (public "much") - (public "nixos-infest") - (public "nixpkgs") - (public "painload") - (public "quipper") - (public "regfish") - (public' { - name = "shitment"; - desc = "turn all the computers into one computer!"; - }) - (public "wai-middleware-time") - (public "web-routes-wai-custom") - (public "xintmap") - ]; - users = addNames { - tv = { pubkey = readFile ../../Zpubkeys/tv_wu.ssh.pub; }; - lass = { pubkey = readFile ../../Zpubkeys/lass.ssh.pub; }; - uriel = { pubkey = readFile ../../Zpubkeys/uriel.ssh.pub; }; - makefu = { pubkey = readFile ../../Zpubkeys/makefu.ssh.pub; }; + out = { + imports = [ ../../3modules/tv/git.nix ]; + tv.git = { + enable = true; + root-title = "public repositories at ${config.tv.identity.self.name}"; + root-desc = "keep calm and engage"; + inherit repos rules users; + }; }; - repos = listToAttrs (map ({ repo, ... }: { name = repo.name; value = repo; }) public-git-repos); + repos = public-repos; + rules = concatMap make-rules (attrValues repos); - rules = concatMap ({ rules, ... }: rules) public-git-repos; + public-repos = mapAttrs make-public-repo { + cgserver = {}; + crude-mail-setup = {}; + dot-xmonad = {}; + hack = {}; + load-env = {}; + make-snapshot = {}; + mime = {}; + much = {}; + nixos-infest = {}; + nixpkgs = {}; + painload = {}; + quipper = {}; + regfish = {}; + stockholm = { + desc = "take all the computers hostage, they'll love you!"; + }; + wai-middleware-time = {}; + web-routes-wai-custom = {}; + xintmap = {}; + }; - public' = { name, desc }: - let - x = public name; - in - x // { repo = x.repo // { inherit desc; }; }; + # TODO move users to separate module + users = mapAttrs make-user { + tv = ../../Zpubkeys/tv_wu.ssh.pub; + lass = ../../Zpubkeys/lass.ssh.pub; + uriel = ../../Zpubkeys/uriel.ssh.pub; + makefu = ../../Zpubkeys/makefu.ssh.pub; + }; - public = repo-name: - rec { - repo = { - name = repo-name; - hooks = { - post-receive = git.irc-announce { - nick = config.networking.hostName; # TODO make this the default - channel = "#retiolum"; - server = "cd.retiolum"; - }; - }; - public = true; + make-public-repo = name: { desc ? null, ... }: { + inherit name desc; + public = true; + hooks = { + post-receive = git.irc-announce { + # TODO make nick = config.tv.identity.self.name the default + nick = config.tv.identity.self.name; + channel = "#retiolum"; + server = "cd.retiolum"; }; - rules = with git; with users; [ - { user = tv; - repo = [ repo ]; - perm = push "refs/*" [ non-fast-forward create delete merge ]; - } - { user = [ lass makefu uriel ]; - repo = [ repo ]; - perm = fetch; - } - ]; }; + }; -in + make-rules = + with git // users; + repo: + singleton { + user = tv; + repo = [ repo ]; + perm = push "refs/*" [ non-fast-forward create delete merge ]; + } ++ + optional repo.public { + user = [ lass makefu uriel ]; + repo = [ repo ]; + perm = fetch; + }; -{ - imports = [ - ../../3modules/tv/git.nix - ]; - tv.git = { - enable = true; - inherit repos rules users; - root-title = "public repositories at ${config.networking.hostName}"; - root-desc = "keep calm and engage"; + make-user = name: pubkey-file: { + inherit name; + pubkey = readFile pubkey-file; }; -} + +in out diff --git a/3modules/tv/retiolum.nix b/3modules/tv/retiolum.nix index 7a5ab70..e8a1f6c 100644 --- a/3modules/tv/retiolum.nix +++ b/3modules/tv/retiolum.nix @@ -83,11 +83,10 @@ let type = types.listOf types.str; default = [ "fastpoke" "pigstarter" "kheurop" ]; description = '' - The list of hosts in the network which the client will try to connect to. - These hosts should have an 'Address' configured which points to a routeable - IPv4 or IPv6 address - '' - ; + The list of hosts in the network which the client will try to connect + to. These hosts should have an 'Address' configured which points to a + routeable IPv4 or IPv6 address. + ''; }; }; |