summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-02-28 02:26:44 +0100
committermakefu <github@syntax-fehler.de>2016-02-28 02:26:44 +0100
commitdb72d5911f1556d3b1cfbe8f1a2d8f6765728952 (patch)
treeab12aafd2994c265cd4fd604e554b2e8db2da021 /krebs
parent64a1dc64a3a7daf57e1ebc677e35c4dc89d9c36b (diff)
parent8c859335a879c515a1415bc8b15b5cb7eb519efc (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/nginx.nix53
-rw-r--r--krebs/3modules/setuid.nix1
-rw-r--r--krebs/3modules/tv/default.nix8
-rw-r--r--krebs/5pkgs/default.nix2
-rw-r--r--krebs/5pkgs/jq/default.nix33
5 files changed, 35 insertions, 62 deletions
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 = {};
};
};
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 {
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index 533502914..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 = [
@@ -286,7 +287,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 = {
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;
- };
-}
-