3: {tv -> krebs}.github-hosts-sync

This commit is contained in:
tv 2015-07-24 12:03:51 +02:00
parent b6987329fe
commit e3b72bb66e
6 changed files with 18 additions and 9 deletions

View File

@ -29,10 +29,10 @@ in
};
}
{
imports = [ ../../3modules/tv/github-hosts-sync.nix ];
tv.github-hosts-sync.enable = true;
imports = [ ../../3modules/krebs/github-hosts-sync.nix ];
krebs.github-hosts-sync.enable = true;
tv.iptables.input-internet-accept-new-tcp =
singleton config.tv.github-hosts-sync.port;
singleton config.krebs.github-hosts-sync.port;
}
{
imports = [ ../../2configs/tv/identity.nix ];

View File

@ -3,15 +3,15 @@
with builtins;
with lib;
let
cfg = config.tv.github-hosts-sync;
cfg = config.krebs.github-hosts-sync;
out = {
options.tv.github-hosts-sync = api;
options.krebs.github-hosts-sync = api;
config = mkIf cfg.enable imp;
};
api = {
enable = mkEnableOption "tv.github-hosts-sync";
enable = mkEnableOption "krebs.github-hosts-sync";
port = mkOption {
type = types.int; # TODO port type
default = 1028;
@ -78,6 +78,6 @@ let
uid = 3220554646; # genid github-hosts-sync
};
Zpkgs = import ../../Zpkgs/tv { inherit pkgs; };
Zpkgs = import ../../Zpkgs/krebs { inherit pkgs; };
in
out

11
Zpkgs/krebs/default.nix Normal file
View File

@ -0,0 +1,11 @@
{ pkgs, ... }:
let
inherit (pkgs) callPackage;
in
pkgs //
{
github-hosts-sync = callPackage ./github-hosts-sync.nix {};
github-known_hosts = callPackage ./github-known_hosts.nix {};
}

View File

@ -9,8 +9,6 @@ pkgs //
charybdis = callPackage ./charybdis {};
dic = callPackage ./dic.nix {};
genid = callPackage ./genid.nix {};
github-hosts-sync = callPackage ./github-hosts-sync.nix {};
github-known_hosts = callPackage ./github-known_hosts.nix {};
lentil = callPackage ./lentil {};
much = callPackage ./much.nix {};
viljetic-pages = callPackage ./viljetic-pages {};