From 421c27332a69708afd81a5fb07a28fdc93449338 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 13:31:04 +0200 Subject: puyak: disable sound --- krebs/1systems/puyak/config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index 19ee2343d..847f51161 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -13,6 +13,7 @@ ]; krebs.build.host = config.krebs.hosts.puyak; + sound.enable = false; boot = { loader.systemd-boot.enable = true; -- cgit v1.2.3 From 31ff7157ef033d4fee253b848c434a0bd0c8c457 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 15:44:43 +0200 Subject: ma darth: fix path to samba share config --- makefu/1systems/darth/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/1systems/darth/config.nix b/makefu/1systems/darth/config.nix index c8d17ca70..e0f90b8dd 100644 --- a/makefu/1systems/darth/config.nix +++ b/makefu/1systems/darth/config.nix @@ -18,7 +18,7 @@ in { - + ]; services.samba.shares = { isos = { -- cgit v1.2.3 From 059b2e3477c9de2a6e69573c16bcf8b2826e0ae9 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 21:57:25 +0200 Subject: ma dummy-secrets: add kibana-auth --- makefu/6tests/data/secrets/kibana-auth.nix | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 makefu/6tests/data/secrets/kibana-auth.nix diff --git a/makefu/6tests/data/secrets/kibana-auth.nix b/makefu/6tests/data/secrets/kibana-auth.nix new file mode 100644 index 000000000..80e8f44c1 --- /dev/null +++ b/makefu/6tests/data/secrets/kibana-auth.nix @@ -0,0 +1,4 @@ +{ + "dick" = "butt"; +} + -- cgit v1.2.3 From 6919ec53cc640e0b813989012eecc58665887e19 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 21:59:28 +0200 Subject: ma tsp: fix rewrite to stockholm --- makefu/1systems/tsp/config.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/makefu/1systems/tsp/config.nix b/makefu/1systems/tsp/config.nix index 7169638d4..75a11d3a7 100644 --- a/makefu/1systems/tsp/config.nix +++ b/makefu/1systems/tsp/config.nix @@ -10,7 +10,8 @@ # hardware specifics are in here - + # imports tp-x2x0.nix + -- cgit v1.2.3 From 7c34ba4bbf3446a8ead66bed7a42bed6a12d72a6 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 22:05:09 +0200 Subject: ma dummy-secrets: add ssh.id_ed25519 --- makefu/6tests/data/secrets/ssh.id_ed25519 | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 makefu/6tests/data/secrets/ssh.id_ed25519 diff --git a/makefu/6tests/data/secrets/ssh.id_ed25519 b/makefu/6tests/data/secrets/ssh.id_ed25519 new file mode 100644 index 000000000..e69de29bb -- cgit v1.2.3 From 97783ee360f3e9e59fbfaaea4a03ae96f187eb64 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 22:06:19 +0200 Subject: ma pnp: remove Reaktor path --- makefu/1systems/pnp/config.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/makefu/1systems/pnp/config.nix b/makefu/1systems/pnp/config.nix index cc6326f19..de920cc3f 100644 --- a/makefu/1systems/pnp/config.nix +++ b/makefu/1systems/pnp/config.nix @@ -8,7 +8,6 @@ [ - ../../krebs/3modules/Reaktor.nix # these will be overwritten by qemu-vm.nix but will be used if the system # is directly deployed -- cgit v1.2.3 From 88fb3eedd6791e05a0df6cae46d53f838e3d2918 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 22:43:30 +0200 Subject: ma dummy-secrets: add grafana_security --- makefu/6tests/data/secrets/grafana_security.nix | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 makefu/6tests/data/secrets/grafana_security.nix diff --git a/makefu/6tests/data/secrets/grafana_security.nix b/makefu/6tests/data/secrets/grafana_security.nix new file mode 100644 index 000000000..f9096b7cf --- /dev/null +++ b/makefu/6tests/data/secrets/grafana_security.nix @@ -0,0 +1,5 @@ +{ + adminUser = "dick"; + adminPassword = "butt"; +} + -- cgit v1.2.3 From 0367927ec8f8279b984194b5a170d0e04f0f55b0 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 23:00:57 +0200 Subject: ma dummy-secrets: add nsupdate-search.nix --- makefu/6tests/data/secrets/nsupdate-search.nix | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 makefu/6tests/data/secrets/nsupdate-search.nix diff --git a/makefu/6tests/data/secrets/nsupdate-search.nix b/makefu/6tests/data/secrets/nsupdate-search.nix new file mode 100644 index 000000000..a9646aeb7 --- /dev/null +++ b/makefu/6tests/data/secrets/nsupdate-search.nix @@ -0,0 +1,3 @@ +{ + "dick.nsupdate.info" = "butt"; +} -- cgit v1.2.3 From 8e3b4fec4485003898eec51f431a7cca6a2d907e Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 23:03:19 +0200 Subject: ma filepimp: fix disk builder (again) --- makefu/1systems/filepimp/config.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/makefu/1systems/filepimp/config.nix b/makefu/1systems/filepimp/config.nix index 65e81af66..7e5d7d0eb 100644 --- a/makefu/1systems/filepimp/config.nix +++ b/makefu/1systems/filepimp/config.nix @@ -73,9 +73,9 @@ in { xfsmount = name: dev: { "/media/${name}" = { device = dev; fsType = "xfs"; }; }; in - # (xfsmount "j0" (part1 jDisk0)) - (xfsmount "j1" (part1 jDisk1)) - (xfsmount "j2" (part1 jDisk2)) + # (xfsmount "j0" (part1 jDisk0)) // + (xfsmount "j1" (part1 jDisk1)) // + (xfsmount "j2" (part1 jDisk2)) // (xfsmount "par0" (part1 jDisk3)) ; -- cgit v1.2.3 From b28d64255a9d61f89e375dc8f6d39e1c34aa6900 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 23:05:16 +0200 Subject: ma owncloud: disable mysql.dataDir rootPassword deployment for now --- makefu/2configs/deployment/owncloud.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/makefu/2configs/deployment/owncloud.nix b/makefu/2configs/deployment/owncloud.nix index c6fb9c8e5..65ac5c184 100644 --- a/makefu/2configs/deployment/owncloud.nix +++ b/makefu/2configs/deployment/owncloud.nix @@ -140,10 +140,10 @@ in { enable = false; databases = [ "nextcloud" ]; }; - - krebs.secret.files.mysql_rootPassword = { - path = "${config.services.mysql.dataDir}/mysql_rootPassword"; - owner.name = "root"; - source-path = toString + "/mysql_rootPassword"; - }; + # dataDir is only defined after mysql is enabled + # krebs.secret.files.mysql_rootPassword = { + # path = "${config.services.mysql.dataDir}/mysql_rootPassword"; + # owner.name = "root"; + # source-path = toString + "/mysql_rootPassword"; + # }; } -- cgit v1.2.3 From 9884b522fe922a1f20cc1217ece0e79a49a64e92 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 23:06:40 +0200 Subject: Reaktor: introduce .workdir --- krebs/3modules/Reaktor.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/krebs/3modules/Reaktor.nix b/krebs/3modules/Reaktor.nix index a70f1ef5d..99a7a55ef 100644 --- a/krebs/3modules/Reaktor.nix +++ b/krebs/3modules/Reaktor.nix @@ -4,8 +4,7 @@ with import ; let cfg = config.krebs.Reaktor; - - workdir = "/var/lib/Reaktor"; + homedir = "/var/lib/Reaktor"; out = { options.krebs.Reaktor = api; @@ -38,6 +37,14 @@ let default = [pkgs.ReaktorPlugins.nixos-version]; }; + workdir = mkOption { + default = "/var/lib/Reaktor"; + type = types.path; + description = '' + path to be used as workdir (home dir is still /var/lib/Reaktor) + ''; + }; + extraConfig = mkOption { default = ""; type = types.string; @@ -84,7 +91,7 @@ let name = "Reaktor"; uid = genid name; description = "Reaktor user"; - home = workdir; + home = homedir; createHome = true; }; @@ -118,7 +125,7 @@ let REAKTOR_NICKNAME = botcfg.nickname; REAKTOR_DEBUG = (if botcfg.debug then "True" else "False"); REAKTOR_CHANNELS = lib.concatStringsSep "," botcfg.channels; - state_dir = workdir; + state_dir = botcfg.workdir; } // botcfg.extraEnviron; serviceConfig= { @@ -129,6 +136,7 @@ let else ''(${pkgs.Reaktor}/bin/reaktor get-config;cat "${ReaktorConfig}" ) > /tmp/reaktor-${name}-config.py'' } + mkdir -p ${botcfg.workdir} ''; ExecStart = "${pkgs.Reaktor}/bin/reaktor run /tmp/reaktor-${name}-config.py"; PrivateTmp = "true"; -- cgit v1.2.3 From a4382f83ec341f664b49995653ebc96a38c850df Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 23:47:07 +0200 Subject: buildbot-classic: guess version name with git --- krebs/5pkgs/simple/buildbot-classic/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/krebs/5pkgs/simple/buildbot-classic/default.nix b/krebs/5pkgs/simple/buildbot-classic/default.nix index a3d924c4a..3cb766e92 100644 --- a/krebs/5pkgs/simple/buildbot-classic/default.nix +++ b/krebs/5pkgs/simple/buildbot-classic/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, fetchFromGitHub, python2Packages, ... }: +{ fetchgit, fetchFromGitHub, python2Packages, git, ... }: let # https://github.com/NixOS/nixpkgs/issues/14026 nixpkgs-fix = import (fetchgit { @@ -8,7 +8,7 @@ let }) {}; in nixpkgs-fix.buildPythonApplication { - name = "buildbot-classic-0.8.12"; + name = "buildbot-classic-0.8.13"; namePrefix = ""; patches = []; @@ -19,7 +19,7 @@ in nixpkgs-fix.buildPythonApplication { sha256 = "1j3xn1gjzvsf90jvfmyln71fzlhjx642ivrqf47zfxpkacljja93"; }; postUnpack = "sourceRoot=\${sourceRoot}/master"; - + nativeBuildInputs = [ nixpkgs-fix.git ]; patchPhase = # The code insists on /usr/bin/tail, /usr/bin/make, etc. '' echo "patching erroneous absolute path references..." @@ -32,11 +32,11 @@ in nixpkgs-fix.buildPythonApplication { sed -i 's/==/>=/' setup.py ''; - propagatedBuildInputs = [ - python2Packages.jinja2 - python2Packages.twisted - nixpkgs-fix.pythonPackages.dateutil_1_5 - nixpkgs-fix.pythonPackages.sqlalchemy_migrate_0_7 + propagatedBuildInputs = with nixpkgs-fix.pythonPackages; [ + jinja2 + twisted + dateutil_1_5 + sqlalchemy_migrate_0_7 ]; doCheck = false; postInstall = '' -- cgit v1.2.3 From d761743c4bb8149c8c962967108a0ff955b86c5f Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 23:50:36 +0200 Subject: ma filepimp: use nondistributableFirmware --- makefu/1systems/filepimp/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/1systems/filepimp/config.nix b/makefu/1systems/filepimp/config.nix index 7e5d7d0eb..e9058ec85 100644 --- a/makefu/1systems/filepimp/config.nix +++ b/makefu/1systems/filepimp/config.nix @@ -44,7 +44,7 @@ in { kernelModules = [ "kvm-amd" ]; extraModulePackages = [ ]; }; - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; hardware.cpu.amd.updateMicrocode = true; zramSwap.enable = true; -- cgit v1.2.3 From 1b5ab3384c7f1b695551d288a7464c6e838fee1f Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 29 Jul 2017 00:20:50 +0200 Subject: buildbot-classic: use fetchgit for version detection --- krebs/5pkgs/simple/buildbot-classic/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/krebs/5pkgs/simple/buildbot-classic/default.nix b/krebs/5pkgs/simple/buildbot-classic/default.nix index 3cb766e92..ab98c9fd6 100644 --- a/krebs/5pkgs/simple/buildbot-classic/default.nix +++ b/krebs/5pkgs/simple/buildbot-classic/default.nix @@ -12,14 +12,15 @@ in nixpkgs-fix.buildPythonApplication { namePrefix = ""; patches = []; - src = fetchFromGitHub { - owner = "krebscode"; - repo = "buildbot-classic"; - rev = "5b4f5f6f1"; - sha256 = "1j3xn1gjzvsf90jvfmyln71fzlhjx642ivrqf47zfxpkacljja93"; + src = fetchgit { + url = "https://github.com/krebscode/buildbot-classic"; + rev = "211ec7815"; + sha256 = "09q8wyci7p07lrngjblwnpyxk0wddf8jzabwf598a7yiam6yc4cm"; + leaveDotGit = true; + }; postUnpack = "sourceRoot=\${sourceRoot}/master"; - nativeBuildInputs = [ nixpkgs-fix.git ]; + buildInputs = [ git ]; patchPhase = # The code insists on /usr/bin/tail, /usr/bin/make, etc. '' echo "patching erroneous absolute path references..." -- cgit v1.2.3 From ca33cce6101091075fdffbb866eda58b40b0334e Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 29 Jul 2017 00:28:54 +0200 Subject: buildbot-classic-slave: version detection with git --- krebs/5pkgs/simple/buildbot-classic-slave/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/krebs/5pkgs/simple/buildbot-classic-slave/default.nix b/krebs/5pkgs/simple/buildbot-classic-slave/default.nix index c316889e4..bbc824a6a 100644 --- a/krebs/5pkgs/simple/buildbot-classic-slave/default.nix +++ b/krebs/5pkgs/simple/buildbot-classic-slave/default.nix @@ -1,16 +1,15 @@ -{ coreutils, fetchgit, fetchFromGitHub, buildbot-classic, python2Packages, ... }: +{ coreutils, fetchgit, git, buildbot-classic, python2Packages, ... }: python2Packages.buildPythonApplication { - name = "buildbot-classic-slave-0.8.12"; + name = "buildbot-classic-slave-0.8.13"; namePrefix = ""; src = buildbot-classic.src; postUnpack = "sourceRoot=\${sourceRoot}/slave"; - patchPhase = '' - substituteInPlace buildslave/scripts/logwatcher.py --replace /usr/bin/tail ${coreutils}/bin/tail - ''; + patchPhase = ":"; + nativeBuildInputs = [ git ]; propagatedBuildInputs = [ python2Packages.twisted ]; doCheck = false; -- cgit v1.2.3 From 17497235e84985f9b2ec4acda47f15a9fe68453e Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 29 Jul 2017 00:38:07 +0200 Subject: buildbot-classic: fix hash of src --- krebs/5pkgs/simple/buildbot-classic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/5pkgs/simple/buildbot-classic/default.nix b/krebs/5pkgs/simple/buildbot-classic/default.nix index ab98c9fd6..353972109 100644 --- a/krebs/5pkgs/simple/buildbot-classic/default.nix +++ b/krebs/5pkgs/simple/buildbot-classic/default.nix @@ -15,7 +15,7 @@ in nixpkgs-fix.buildPythonApplication { src = fetchgit { url = "https://github.com/krebscode/buildbot-classic"; rev = "211ec7815"; - sha256 = "09q8wyci7p07lrngjblwnpyxk0wddf8jzabwf598a7yiam6yc4cm"; + sha256 = "0cyn406r31qdqhpsih7w83x47b443svpgfhxqd6w3iryv0y1z95i"; leaveDotGit = true; }; -- cgit v1.2.3