From 2ea539c80f48060aeb86b3522fde73c832b793cd Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 27 Feb 2016 13:10:59 +0100 Subject: krebs.setuid.*.mode: use mergeOneOption --- krebs/3modules/setuid.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs') diff --git a/krebs/3modules/setuid.nix b/krebs/3modules/setuid.nix index 1137788d8..cfb8382e8 100644 --- a/krebs/3modules/setuid.nix +++ b/krebs/3modules/setuid.nix @@ -46,6 +46,7 @@ let check = x: isString x && match "[0-7][0-7][0-7][0-7]" x != null; + merge = mergeOneOption; }; }; activate = mkOption { -- cgit v1.2.3 From f7165409a511582507f465162609676c7b6ef0df Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 27 Feb 2016 13:16:24 +0100 Subject: jq: rip --- krebs/5pkgs/default.nix | 2 +- krebs/5pkgs/jq/default.nix | 33 --------------------------------- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 krebs/5pkgs/jq/default.nix (limited to 'krebs') diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index d395fe00a..f7997dd63 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -17,7 +17,7 @@ with config.krebs.lib; }; push = pkgs.callPackage ./push { - inherit (subdirs) get jq; + inherit (subdirs) get; }; ReaktorPlugins = pkgs.callPackage ./Reaktor/plugins.nix {}; diff --git a/krebs/5pkgs/jq/default.nix b/krebs/5pkgs/jq/default.nix deleted file mode 100644 index 41db0f284..000000000 --- a/krebs/5pkgs/jq/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, fetchurl}: -let - s = # Generated upstream information - rec { - baseName="jq"; - version="1.5"; - name="${baseName}-${version}"; - url=https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz; - sha256="0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4"; - }; - buildInputs = [ - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; - - # jq is linked to libjq: - configureFlags = [ - "LDFLAGS=-Wl,-rpath,\\\${libdir}" - ]; - meta = { - inherit (s) version; - description = ''A lightweight and flexible command-line JSON processor''; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - }; -} - -- cgit v1.2.3 From 94154606cb011a53bfd81b52dbc60cbdf416371e Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 27 Feb 2016 15:13:10 +0100 Subject: tv wu-binary-cache: init --- krebs/3modules/tv/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 533502914..d8b5da007 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -286,7 +286,10 @@ with config.krebs.lib; nets = { gg23 = { addrs4 = ["10.23.1.37"]; - aliases = ["wu.gg23"]; + aliases = [ + "wu.gg23" + "cache.wu.gg23" + ]; ssh.port = 11423; }; retiolum = { -- cgit v1.2.3 From 9db6d9db717c6180ca3a0b3bcbf57d48c44ca855 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 27 Feb 2016 15:48:58 +0100 Subject: krebs.hosts.{gum,ire}.nets.retiolum.via = internet --- krebs/3modules/makefu/default.nix | 3 ++- krebs/3modules/tv/default.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'krebs') diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index d309c1714..ccf21c868 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -323,7 +323,7 @@ TNs2RYfwDy/r6H/hDeB/BSngPouedEVcPwIDAQAB cgit.euer IN A ${head nets.internet.addrs4} ''; }; - nets = { + nets = rec { internet = { addrs4 = ["195.154.108.70"]; aliases = [ @@ -331,6 +331,7 @@ TNs2RYfwDy/r6H/hDeB/BSngPouedEVcPwIDAQAB ]; }; retiolum = { + via = internet; addrs4 = ["10.243.0.211"]; addrs6 = ["42:f9f0:0000:0000:0000:0000:0000:70d2"]; aliases = [ diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index d8b5da007..a0237d361 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -104,7 +104,7 @@ with config.krebs.lib; ire 60 IN A ${elemAt nets.internet.addrs4 0} ''; }; - nets = { + nets = rec { internet = { addrs4 = ["198.147.22.115"]; aliases = [ @@ -115,6 +115,7 @@ with config.krebs.lib; ssh.port = 11423; }; retiolum = { + via = internet; addrs4 = ["10.243.231.66"]; addrs6 = ["42:b912:0f42:a82d:0d27:8610:e89b:490c"]; aliases = [ -- cgit v1.2.3 From 8c859335a879c515a1415bc8b15b5cb7eb519efc Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 27 Feb 2016 17:23:59 +0100 Subject: krebs.nginx: s/optionSet/submodule/ --- krebs/3modules/nginx.nix | 53 ++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 26 deletions(-) (limited to 'krebs') diff --git a/krebs/3modules/nginx.nix b/krebs/3modules/nginx.nix index 7b7163071..ec39715d8 100644 --- a/krebs/3modules/nginx.nix +++ b/krebs/3modules/nginx.nix @@ -13,33 +13,34 @@ let enable = mkEnableOption "krebs.nginx"; servers = mkOption { - type = with types; attrsOf optionSet; - options = singleton { - server-names = mkOption { - type = with types; listOf str; - # TODO use identity - default = [ - "${config.networking.hostName}" - "${config.networking.hostName}.retiolum" - ]; + type = types.attrsOf (types.submodule { + options = { + server-names = mkOption { + type = with types; listOf str; + # TODO use identity + default = [ + "${config.networking.hostName}" + "${config.networking.hostName}.retiolum" + ]; + }; + listen = mkOption { + type = with types; either str (listOf str); + default = "80"; + apply = x: + if typeOf x != "list" + then [x] + else x; + }; + locations = mkOption { + type = with types; listOf (attrsOf str); + default = []; + }; + extraConfig = mkOption { + type = with types; string; + default = ""; + }; }; - listen = mkOption { - type = with types; either str (listOf str); - default = "80"; - apply = x: - if typeOf x != "list" - then [x] - else x; - }; - locations = mkOption { - type = with types; listOf (attrsOf str); - default = []; - }; - extraConfig = mkOption { - type = with types; string; - default = ""; - }; - }; + }); default = {}; }; }; -- cgit v1.2.3