From 4ab161be0aed7598ebbc32ed95d13e979ab2dbcf Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 28 Dec 2017 16:01:57 +0100 Subject: pkgs.Reaktor: add help for shack-correct --- krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh b/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh index 3b4d04f80..d500b3cb3 100644 --- a/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh +++ b/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh @@ -2,5 +2,5 @@ set -eu printf "Sie meinten wohl \"" echo -n $@ | sed 's/Shack/shack/g' -echo "\"" +echo "\" check out https://wiki.shackspace.de/project/logo_and_ci#name_ci" echo "${_from}--" -- cgit v1.2.3 From 161c810b7470727da320b617b874002f43c8fd6f Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 28 Dec 2017 16:02:32 +0100 Subject: forticlientsslvpn: use archive.org --- krebs/5pkgs/simple/fortclientsslvpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'krebs') diff --git a/krebs/5pkgs/simple/fortclientsslvpn/default.nix b/krebs/5pkgs/simple/fortclientsslvpn/default.nix index cbcfab05f..1f86d6fe4 100644 --- a/krebs/5pkgs/simple/fortclientsslvpn/default.nix +++ b/krebs/5pkgs/simple/fortclientsslvpn/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { src = fetchurl { # archive.org mirror: - # https://archive.org/download/ForticlientsslvpnLinux4.4.23171.tar/forticlientsslvpn_linux_4.4.2317.tar.gz - url = http://www.zen.co.uk/userfiles/knowledgebase/FortigateSSLVPNClient/forticlientsslvpn_linux_4.4.2317.tar.gz; + url = https://archive.org/download/ForticlientsslvpnLinux4.4.23171.tar/forticlientsslvpn_linux_4.4.2317.tar.gz; + # url = http://www.zen.co.uk/userfiles/knowledgebase/FortigateSSLVPNClient/forticlientsslvpn_linux_4.4.2317.tar.gz; sha256 = "19clnf9rgrnwazlpah8zz5kvz6kc8lxawrgmksx25k5ywflmbcrr"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; -- cgit v1.2.3 From a1a2ab22950e3217a4a0496b3ae350de861e595e Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 31 Dec 2017 02:37:32 +0100 Subject: hw x220: force rngd off --- krebs/2configs/hw/x220.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/2configs/hw/x220.nix b/krebs/2configs/hw/x220.nix index 44743b87d..09b10fcbb 100644 --- a/krebs/2configs/hw/x220.nix +++ b/krebs/2configs/hw/x220.nix @@ -23,7 +23,7 @@ with import ; pkgs.vaapiVdpau ]; - security.rngd.enable = true; + security.rngd.enable = mkForce true; services.xserver = { videoDriver = "intel"; -- cgit v1.2.3 From 9babbab936696b12ee850274529492a57cff523b Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 31 Dec 2017 02:39:22 +0100 Subject: init bitlbee-discord --- krebs/5pkgs/simple/bitlbee-discord/default.nix | 29 ++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 krebs/5pkgs/simple/bitlbee-discord/default.nix (limited to 'krebs') diff --git a/krebs/5pkgs/simple/bitlbee-discord/default.nix b/krebs/5pkgs/simple/bitlbee-discord/default.nix new file mode 100644 index 000000000..da6a58801 --- /dev/null +++ b/krebs/5pkgs/simple/bitlbee-discord/default.nix @@ -0,0 +1,29 @@ +{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "bitlbee-discord-2017-12-27"; + + src = fetchFromGitHub { + rev = "6a03db169ad44fee55609ecd16e19f3c0f99a182"; + owner = "sm00th"; + repo = "bitlbee-discord"; + sha256 = "1ci9a12c6zg8d6i9f95pq6dal79cp4klmmsyj8ag2gin90kl3x95"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bitlbee autoconf automake libtool glib ]; + + preConfigure = '' + export BITLBEE_PLUGINDIR=$out/lib/bitlbee + ./autogen.sh + ''; + + meta = { + description = "Bitlbee plugin for Discord"; + + homepage = https://github.com/sm00th/bitlbee-discord; + license = licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + }; +} -- cgit v1.2.3 From 073c2a9cb18725f82e45c9e74e51fdea17c73fa3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 31 Dec 2017 03:47:15 +0100 Subject: tests: add default.nix --- krebs/6tests/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 krebs/6tests/default.nix (limited to 'krebs') diff --git a/krebs/6tests/default.nix b/krebs/6tests/default.nix new file mode 100644 index 000000000..c0ca00296 --- /dev/null +++ b/krebs/6tests/default.nix @@ -0,0 +1,6 @@ +with import ; +{ ... }: + +{ + deploy = import ./deploy.nix; +} -- cgit v1.2.3 From 76e1b56c841937fa4b12b8a94aff6e21b8cd27dd Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 31 Dec 2017 03:59:13 +0100 Subject: tests deploy: get pkgs with overlays --- krebs/6tests/deploy.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/6tests/deploy.nix b/krebs/6tests/deploy.nix index 842bbc22a..99a66dd59 100644 --- a/krebs/6tests/deploy.nix +++ b/krebs/6tests/deploy.nix @@ -1,7 +1,8 @@ with import ; -import ({ pkgs, ... }: +import ({ ... }: let + pkgs = import { overlays = [(import ../5pkgs)]; }; test-config = ; privKey = '' -----BEGIN OPENSSH PRIVATE KEY----- -- cgit v1.2.3 From 9ee5c02e755799e50f265e31c1694190cc2e703a Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 31 Dec 2017 04:14:30 +0100 Subject: tests deploy: cleanup --- krebs/6tests/deploy.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'krebs') diff --git a/krebs/6tests/deploy.nix b/krebs/6tests/deploy.nix index 99a66dd59..156e9239f 100644 --- a/krebs/6tests/deploy.nix +++ b/krebs/6tests/deploy.nix @@ -42,15 +42,12 @@ let cd ${} export NIX_PATH=stockholm=${}:nixpkgs=${}:$NIX_PATH exec >&2 - : ${minimalSystem} source=${pkgs.writeJSON "source.json" populate-source} - cat > /tmp/derp < { @@ -71,22 +68,20 @@ in { imports = [ test-config ]; environment.variables = { NIX_PATH = mkForce "nixpkgs=${}"; - #LOL = minimalSystem; }; services.openssh.enable = true; users.extraUsers.root.openssh.authorizedKeys.keys = [ pubKey ]; - #virtualisation.writableStore = true; virtualisation.pathsInNixDB = [ minimalSystem - pkgs.stockholm ]; + environment.systemPackages = [ pkgs.git ]; }; client = - { config, pkgs, ... }: { }; - + { config, pkgs, ... }: + { }; }; testScript = '' -- cgit v1.2.3 From c4a8cc56ef8e900ffa934d965f15d77e23aedc43 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 31 Dec 2017 13:30:17 +0100 Subject: ci: add tests option --- krebs/3modules/ci.nix | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) (limited to 'krebs') diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix index b56f5c543..bb19f0602 100644 --- a/krebs/3modules/ci.nix +++ b/krebs/3modules/ci.nix @@ -24,6 +24,13 @@ in List of hosts that should be build ''; }; + tests = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of tests that should be build + ''; + }; }; config = mkIf cfg.enable { @@ -56,14 +63,14 @@ in ''; scheduler = { build-scheduler = '' - # build all hosts sched.append( schedulers.SingleBranchScheduler( change_filter=util.ChangeFilter(branch_re=".*"), treeStableTimer=${toString cfg.treeStableTimer}*60, name="build-all-branches", builderNames=[ - "build-hosts" + ${optionalString (cfg.hosts != []) ''"hosts",''} + ${optionalString (cfg.tests != []) ''"tests",''} ] ) ) @@ -73,7 +80,8 @@ in schedulers.ForceScheduler( name="force", builderNames=[ - "build-hosts" + ${optionalString (cfg.hosts != []) ''"hosts",''} + ${optionalString (cfg.tests != []) ''"tests",''} ] ) ) @@ -91,7 +99,7 @@ in factory.addStep(steps.ShellCommand(**kwargs)) ''; builder = { - build-hosts = '' + hosts = mkIf (cfg.hosts != []) '' f = util.BuildFactory() f.addStep(grab_repo) @@ -120,12 +128,42 @@ in bu.append( util.BuilderConfig( - name="build-hosts", + name="hosts", slavenames=slavenames, factory=f ) ) + ''; + tests = mkIf (cfg.tests != []) '' + f = util.BuildFactory() + f.addStep(grab_repo) + def run_test(test): + addShell(f, + name="{}".format(test), + env={ + "NIX_PATH": "secrets=/var/src/stockholm/null:/var/src", + "NIX_REMOTE": "daemon", + "dummy_secrets": "true", + }, + command=[ + "nix-build", "-I", "stockholm=.", "krebs/6tests", + "-A", "{}".format(test) + ], + timeout=90001 + ) + + ${concatMapStringsSep "\n" (test: + "run_test(\"${test}\")" + ) cfg.tests} + + bu.append( + util.BuilderConfig( + name="tests", + slavenames=slavenames, + factory=f + ) + ) ''; }; enable = true; -- cgit v1.2.3 From fb778e69a208eb8cb2feb2a1c4585e5a12d2efb6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 31 Dec 2017 13:30:35 +0100 Subject: buildbot-all: run deploy test --- krebs/2configs/buildbot-all.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs') diff --git a/krebs/2configs/buildbot-all.nix b/krebs/2configs/buildbot-all.nix index 8a647012f..ca994e996 100644 --- a/krebs/2configs/buildbot-all.nix +++ b/krebs/2configs/buildbot-all.nix @@ -9,5 +9,6 @@ with import ; krebs.ci.enable = true; krebs.ci.treeStableTimer = 1; krebs.ci.hosts = filter (getAttr "ci") (attrValues config.krebs.hosts); + krebs.ci.tests = [ "deploy" ]; } -- cgit v1.2.3 From bfde8bea27144c441f023fca6ac888c3baec0aeb Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 2 Jan 2018 12:53:44 +0100 Subject: bitlbee-discord: cleanup --- krebs/5pkgs/simple/bitlbee-discord/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'krebs') diff --git a/krebs/5pkgs/simple/bitlbee-discord/default.nix b/krebs/5pkgs/simple/bitlbee-discord/default.nix index da6a58801..c01b87d6b 100644 --- a/krebs/5pkgs/simple/bitlbee-discord/default.nix +++ b/krebs/5pkgs/simple/bitlbee-discord/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib }: +{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }: with stdenv.lib; stdenv.mkDerivation rec { @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1ci9a12c6zg8d6i9f95pq6dal79cp4klmmsyj8ag2gin90kl3x95"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bitlbee autoconf automake libtool glib ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ bitlbee glib ]; preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee -- cgit v1.2.3 From c25054b4a0c034b9c410799bf29486820d9778d7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 2 Jan 2018 12:59:01 +0100 Subject: writers: add deps & flake8 to writePython{2,3} --- krebs/5pkgs/writers.nix | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'krebs') diff --git a/krebs/5pkgs/writers.nix b/krebs/5pkgs/writers.nix index 6e67ed699..0cc4efb51 100644 --- a/krebs/5pkgs/writers.nix +++ b/krebs/5pkgs/writers.nix @@ -283,27 +283,27 @@ with import ; ${pkgs.cabal2nix}/bin/cabal2nix ${path} > $out ''); - writePython2 = name: text: - assert (with types; either absolute-pathname filename).check name; - pkgs.writeOut (baseNameOf name) { - ${optionalString (types.absolute-pathname.check name) name} = { - check = pkgs.writeDash "python2check.sh" '' - exec ${pkgs.python2}/bin/python -m py_compile "$1" - ''; - inherit text; - }; - }; + writePython2 = deps: + let + py = pkgs.python2.withPackages(ps: attrVals deps ps); + in + pkgs.makeScriptWriter { + interpreter = "${py}/bin/python"; + check = pkgs.writeDash "python2check.sh" '' + exec ${pkgs.python2Packages.flake8}/bin/flake8 --show-source "$1" + ''; + }; - writePython3 = name: text: - assert (with types; either absolute-pathname filename).check name; - pkgs.writeOut (baseNameOf name) { - ${optionalString (types.absolute-pathname.check name) name} = { - check = pkgs.writeDash "python3check.sh" '' - exec ${pkgs.python3}/bin/python -m py_compile "$textPath" - ''; - inherit text; - }; - }; + writePython3 = deps: + let + py = pkgs.python3.withPackages(ps: attrVals deps ps); + in + pkgs.makeScriptWriter { + interpreter = "${py}/bin/python"; + check = pkgs.writeDash "python3check.sh" '' + exec ${pkgs.python3Packages.flake8}/bin/flake8 --show-source "$1" + ''; + }; writeSed = pkgs.makeScriptWriter { interpreter = "${pkgs.gnused}/bin/sed -f"; -- cgit v1.2.3 From 5d7c8bf5b4e718772e56512a878c0e65c154c190 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 2 Jan 2018 12:59:18 +0100 Subject: writers: add writePython{2,3}Bin --- krebs/5pkgs/writers.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'krebs') diff --git a/krebs/5pkgs/writers.nix b/krebs/5pkgs/writers.nix index 0cc4efb51..a48fc0f87 100644 --- a/krebs/5pkgs/writers.nix +++ b/krebs/5pkgs/writers.nix @@ -294,6 +294,9 @@ with import ; ''; }; + writePython2Bin = d: name: + pkgs.writePython2 d "/bin/${name}"; + writePython3 = deps: let py = pkgs.python3.withPackages(ps: attrVals deps ps); @@ -305,6 +308,9 @@ with import ; ''; }; + writePython3Bin = d: name: + pkgs.writePython3 d "/bin/${name}"; + writeSed = pkgs.makeScriptWriter { interpreter = "${pkgs.gnused}/bin/sed -f"; }; -- cgit v1.2.3 From 67458e15f442d16d645f92b8f3de5f226212696a Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 2 Jan 2018 18:24:40 +0100 Subject: iptables: set empty default rules --- krebs/3modules/iptables.nix | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'krebs') diff --git a/krebs/3modules/iptables.nix b/krebs/3modules/iptables.nix index d64ed86de..6298a05a5 100644 --- a/krebs/3modules/iptables.nix +++ b/krebs/3modules/iptables.nix @@ -61,6 +61,15 @@ let }; }; }))); + default = { + filter.INPUT.policy = "ACCEPT"; + filter.FORWARD.policy = "ACCEPT"; + filter.OUTPUT.policy = "ACCEPT"; + nat.PREROUTING.policy = "ACCEPT"; + nat.INPUT.policy = "ACCEPT"; + nat.OUTPUT.policy = "ACCEPT"; + nat.POSTROUTING.policy = "ACCEPT"; + }; }; }; -- cgit v1.2.3 From e48b4eb4606f6d0ec0b930016a53e7e7cfcbfb64 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 2 Jan 2018 20:58:32 +0100 Subject: hw x220 rngd: mkForce -> mkDefault --- krebs/2configs/hw/x220.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/2configs/hw/x220.nix b/krebs/2configs/hw/x220.nix index 09b10fcbb..90a1a111f 100644 --- a/krebs/2configs/hw/x220.nix +++ b/krebs/2configs/hw/x220.nix @@ -23,7 +23,7 @@ with import ; pkgs.vaapiVdpau ]; - security.rngd.enable = mkForce true; + security.rngd.enable = mkDefault true; services.xserver = { videoDriver = "intel"; -- cgit v1.2.3