diff options
| -rw-r--r-- | lass/1systems/shodan.nix | 1 | ||||
| -rw-r--r-- | lass/2configs/buildbot-standalone.nix | 76 | ||||
| -rw-r--r-- | lass/2configs/default.nix | 1 | ||||
| -rw-r--r-- | lass/2configs/mail.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/nixpkgs.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/websites/domsen.nix | 5 |
6 files changed, 27 insertions, 60 deletions
diff --git a/lass/1systems/shodan.nix b/lass/1systems/shodan.nix index dca61693..044e2ccf 100644 --- a/lass/1systems/shodan.nix +++ b/lass/1systems/shodan.nix @@ -13,6 +13,7 @@ with import <stockholm/lib>; ../2configs/programs.nix ../2configs/fetchWallpaper.nix ../2configs/backups.nix + ../2configs/wine.nix #{ # users.extraUsers = { # root = { diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 449feb38..6c2a92c0 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -56,51 +56,6 @@ in { mode='full' ) - # TODO: get nixpkgs/stockholm paths from krebs - env_lass = { - "LOGNAME": "lass", - "NIX_REMOTE": "daemon", - "dummy_secrets": "true", - } - env_makefu = { - "LOGNAME": "makefu", - "NIX_REMOTE": "daemon", - "dummy_secrets": "true", - } - env_nin = { - "LOGNAME": "nin", - "NIX_REMOTE": "daemon", - "dummy_secrets": "true", - } - env_shared = { - "LOGNAME": "shared", - "NIX_REMOTE": "daemon", - "dummy_secrets": "true", - } - env_tv = { - "LOGNAME": "tv", - "NIX_REMOTE": "daemon", - "dummy_secrets": "true", - } - - # prepare nix-shell - # the dependencies which are used by the test script - deps = [ - "gnumake", - "jq", - "nix", - "(import <stockholm>).pkgs.populate", - "openssh" - ] - # TODO: --pure , prepare ENV in nix-shell command: - # SSL_CERT_FILE,LOGNAME,NIX_REMOTE - nixshell = [ - "nix-shell", - "-I", "/var/src", - "-I", "stockholm=.", - "-p" - ] + deps + [ "--run" ] - # prepare addShell function def addShell(factory,**kwargs): factory.addStep(steps.ShellCommand(**kwargs)) @@ -110,30 +65,35 @@ in { f = util.BuildFactory() f.addStep(grab_repo) - def build_host(env, host): - addShell(f,name="build-{}".format(i),env=env, - command=nixshell + ["mkdir -p $HOME/$LOGNAME && touch $HOME/$LOGNAME/.populate; \ - echo $HOME; echo $LOGNAME; \ - test -e $HOME/$LOGNAME/nixpkgs || cp -r /var/src/nixpkgs $HOME/$LOGNAME/; \ - make NIX_PATH=$HOME/$LOGNAME:secrets=/var/src/stockholm/null test method=build \ - target=buildbotworker@${config.krebs.build.host.name}$HOME/$LOGNAME \ - system={}".format(host)] + def build_host(user, host): + addShell(f, + name="{}".format(i), + env={ + "LOGNAME": user, + "NIX_PATH": "secrets=/var/src/stockholm/null:/var/src", + "NIX_REMOTE": "daemon", + "dummy_secrets": "true", + }, + command=[ + "nix-shell", "--run", + "test --system={} --target=buildbotworker@${config.krebs.build.host.name}$HOME/$LOGNAME".format(host) + ] ) for i in [ "mors", "uriel", "shodan", "icarus", "cloudkrebs", "echelon", "dishfire", "prism" ]: - build_host(env_lass, i) + build_host("lass", i) for i in [ "x", "wry", "vbob", "wbob", "shoney" ]: - build_host(env_makefu, i) + build_host("makefu", i) for i in [ "hiawatha", "onondaga" ]: - build_host(env_nin, i) + build_host("nin", i) for i in [ "test-minimal-deploy", "test-all-krebs-modules", "wolf", "test-centos7" ]: - build_host(env_shared, i) + build_host("shared", i) for i in [ "alnus", "mu", "nomic", "wu", "xu", "zu" ]: - build_host(env_tv, i) + build_host("tv", i) bu.append( util.BuilderConfig( diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index d7deb316..27b74a30 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -79,7 +79,6 @@ with import <stockholm/lib>; if getEnv "dummy_secrets" == "true" then toString <stockholm/lass/2configs/tests/dummy-secrets> else "/home/lass/secrets/${host.name}"; - stockholm.file = getEnv "PWD"; }; }; }; diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix index feb53270..e39c09b8 100644 --- a/lass/2configs/mail.nix +++ b/lass/2configs/mail.nix @@ -48,6 +48,8 @@ let set use_from=yes set envelope_from=yes + set sort=threads + set index_format="%4C %Z %?GI?%GI& ? %[%d/%b] %-16.15F %?M?(%3M)& ? %s %> %?g?%g?" virtual-mailboxes \ diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index 1c68d58d..151242e4 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://cgit.lassul.us/nixpkgs; - ref = "0a4db15"; + ref = "2e983f1"; }; } diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index aaf31157..36ded3b3 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -61,6 +61,11 @@ in { "karlaskop.ubikmedia.de" "nb.ubikmedia.de" "youthtube.ubikmedia.de" + "weirdwednesday.ubikmedia.de" + "weirdwednesday.de" + "www.weirdwednesday.de" + "freemonkey.ubikmedia.de" + "jarugadesign.ubikmedia.de" ]) ]; |