summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-06-19 09:22:42 +0200
committerjeschli <jeschli@gmail.com>2018-06-19 09:22:42 +0200
commit8eca9165ce6ffaba1076a916bfa475eb935f0a6f (patch)
treeb2339ecdb48bd1135a1352b9993732ad0e35c02c
parent05c8cf3df5f6166c21dfd2dc316bf5de957dce94 (diff)
parentc19baeee138f9455ef570e609c045d312d6cc0f4 (diff)
Merge remote-tracking branch 'origin/master'
-rw-r--r--jeschli/2configs/zsh.nix4
-rw-r--r--krebs/0tests/data/secrets/grafana_security.nix (renamed from krebs/6tests/data/secrets/grafana_security.nix)0
-rw-r--r--krebs/0tests/data/secrets/hashedPasswords.nix (renamed from krebs/6tests/data/secrets/hashedPasswords.nix)0
-rw-r--r--krebs/0tests/data/secrets/retiolum.rsa_key.priv (renamed from krebs/6tests/data/secrets/retiolum.rsa_key.priv)0
-rw-r--r--krebs/0tests/data/secrets/shackspace-gitlab-ci-token.nix (renamed from krebs/6tests/data/secrets/shackspace-gitlab-ci-token.nix)0
-rw-r--r--krebs/0tests/data/secrets/ssh.id_ed25519 (renamed from krebs/6tests/data/secrets/ssh.id_ed25519)0
-rw-r--r--krebs/0tests/data/test-config.nix (renamed from krebs/6tests/data/test-config.nix)0
-rw-r--r--krebs/0tests/data/test-source.nix (renamed from krebs/6tests/data/test-source.nix)0
-rw-r--r--krebs/0tests/default.nix (renamed from krebs/6tests/default.nix)0
-rw-r--r--krebs/0tests/deploy.nix (renamed from krebs/6tests/deploy.nix)2
-rw-r--r--krebs/1systems/hotdog/config.nix4
-rw-r--r--krebs/2configs/buildbot-all.nix9
-rw-r--r--krebs/2configs/buildbot-krebs.nix12
-rw-r--r--krebs/2configs/buildbot-stockholm.nix178
-rw-r--r--krebs/2configs/default.nix1
-rw-r--r--krebs/2configs/news-spam.nix2
-rw-r--r--krebs/2configs/news.nix4
-rw-r--r--krebs/2configs/reaktor-krebs.nix11
-rw-r--r--krebs/2configs/reaktor-retiolum.nix4
-rw-r--r--krebs/3modules/ci.nix192
-rw-r--r--krebs/3modules/default.nix1
-rw-r--r--krebs/3modules/lass/default.nix42
-rw-r--r--krebs/3modules/lass/pgp/blue.pgp51
-rw-r--r--krebs/3modules/lass/pgp/icarus.pgp51
-rw-r--r--krebs/3modules/lass/ssh/blue.rsa1
-rw-r--r--krebs/3modules/tv/default.nix24
-rw-r--r--krebs/5pkgs/simple/Reaktor/plugins.nix42
-rw-r--r--krebs/5pkgs/simple/buildbot-classic/default.nix2
-rw-r--r--krebs/5pkgs/simple/ejabberd/default.nix3
-rw-r--r--krebs/5pkgs/simple/kops.nix7
-rw-r--r--krebs/5pkgs/simple/krops.nix7
-rw-r--r--krebs/5pkgs/simple/painload/default.nix2
-rw-r--r--krebs/5pkgs/simple/repo-sync/default.nix2
-rw-r--r--krebs/5pkgs/simple/retiolum-bootstrap/default.nix4
-rw-r--r--krebs/5pkgs/simple/thesauron/default.nix7
-rw-r--r--krebs/krops.nix (renamed from krebs/kops.nix)21
-rw-r--r--krebs/source.nix4
-rw-r--r--lass/1systems/blue/config.nix49
-rw-r--r--lass/1systems/blue/physical.nix8
-rw-r--r--lass/1systems/blue/source.nix4
-rw-r--r--lass/1systems/cabal/config.nix16
-rw-r--r--lass/1systems/cabal/physical.nix12
-rw-r--r--lass/1systems/daedalus/config.nix15
-rw-r--r--lass/1systems/daedalus/physical.nix20
-rw-r--r--lass/1systems/dishfire/config.nix34
-rw-r--r--lass/1systems/dishfire/physical.nix39
-rw-r--r--lass/1systems/helios/config.nix56
-rw-r--r--lass/1systems/helios/physical.nix64
-rw-r--r--lass/1systems/icarus/config.nix22
-rw-r--r--lass/1systems/icarus/physical.nix20
-rw-r--r--lass/1systems/littleT/config.nix15
-rw-r--r--lass/1systems/littleT/physical.nix7
-rw-r--r--lass/1systems/mors/config.nix52
-rw-r--r--lass/1systems/mors/physical.nix44
-rw-r--r--lass/1systems/prism/config.nix153
-rw-r--r--lass/1systems/prism/physical.nix85
-rw-r--r--lass/1systems/red/config.nix3
-rw-r--r--lass/1systems/red/physical.nix8
-rw-r--r--lass/1systems/shodan/config.nix42
-rw-r--r--lass/1systems/shodan/physical.nix47
-rw-r--r--lass/1systems/skynet/config.nix15
-rw-r--r--lass/1systems/skynet/physical.nix12
-rw-r--r--lass/1systems/uriel/config.nix55
-rw-r--r--lass/1systems/uriel/physical.nix59
-rw-r--r--lass/1systems/xerxes/config.nix24
-rw-r--r--lass/1systems/xerxes/physical.nix29
-rw-r--r--lass/2configs/AP.nix22
-rw-r--r--lass/2configs/IM.nix73
-rw-r--r--lass/2configs/backup.nix1
-rw-r--r--lass/2configs/baseX.nix12
-rw-r--r--lass/2configs/bitlbee.nix15
-rw-r--r--lass/2configs/blue-host.nix22
-rw-r--r--lass/2configs/blue.nix60
-rw-r--r--lass/2configs/container-networking.nix15
-rw-r--r--lass/2configs/default.nix7
-rw-r--r--lass/2configs/exim-smarthost.nix5
-rw-r--r--lass/2configs/games.nix1
-rw-r--r--lass/2configs/git.nix14
-rw-r--r--lass/2configs/libvirt.nix3
-rw-r--r--lass/2configs/monitoring/prometheus-server.nix1
-rw-r--r--lass/2configs/repo-sync.nix4
-rw-r--r--lass/2configs/steam.nix2
-rw-r--r--lass/2configs/websites/domsen.nix14
-rw-r--r--lass/2configs/websites/util.nix16
-rw-r--r--lass/3modules/default.nix1
-rw-r--r--lass/3modules/nichtparasoup.nix48
-rw-r--r--lass/5pkgs/custom/xmonad-lass/default.nix2
-rw-r--r--lass/5pkgs/l-gen-secrets/default.nix4
-rw-r--r--lass/5pkgs/nichtparasoup/default.nix15
-rw-r--r--lass/5pkgs/nichtparasoup/exception.patch13
-rw-r--r--lass/krops.nix (renamed from lass/kops.nix)19
-rw-r--r--lass/source.nix2
-rw-r--r--makefu/0tests/data/secrets/auth.nix (renamed from makefu/6tests/data/secrets/auth.nix)0
-rw-r--r--makefu/0tests/data/secrets/bepasty-secret.nix (renamed from makefu/6tests/data/secrets/bepasty-secret.nix)0
-rw-r--r--makefu/0tests/data/secrets/bgt_cyberwar_hidden_service/hostname (renamed from makefu/6tests/data/secrets/bgt_cyberwar_hidden_service/hostname)0
-rw-r--r--makefu/0tests/data/secrets/daemon-pw (renamed from makefu/6tests/data/secrets/daemon-pw)0
-rw-r--r--makefu/0tests/data/secrets/dl.euer.krebsco.de-auth.nix (renamed from makefu/6tests/data/secrets/dl.euer.krebsco.de-auth.nix)0
-rw-r--r--makefu/0tests/data/secrets/extra-hosts.nix (renamed from makefu/6tests/data/secrets/extra-hosts.nix)0
-rw-r--r--makefu/0tests/data/secrets/grafana_security.nix (renamed from makefu/6tests/data/secrets/grafana_security.nix)0
-rw-r--r--makefu/0tests/data/secrets/hashedPasswords.nix (renamed from makefu/6tests/data/secrets/hashedPasswords.nix)0
-rw-r--r--makefu/0tests/data/secrets/iodinepw.nix (renamed from makefu/6tests/data/secrets/iodinepw.nix)0
-rw-r--r--makefu/0tests/data/secrets/kibana-auth.nix (renamed from makefu/6tests/data/secrets/kibana-auth.nix)0
-rw-r--r--makefu/0tests/data/secrets/nsupdate-data.nix (renamed from makefu/6tests/data/secrets/nsupdate-data.nix)0
-rw-r--r--makefu/0tests/data/secrets/nsupdate-search.nix (renamed from makefu/6tests/data/secrets/nsupdate-search.nix)0
-rw-r--r--makefu/0tests/data/secrets/retiolum-ci.rsa_key.priv (renamed from makefu/6tests/data/secrets/retiolum-ci.rsa_key.priv)0
-rw-r--r--makefu/0tests/data/secrets/retiolum.rsa_key.priv (renamed from makefu/6tests/data/secrets/retiolum.rsa_key.priv)0
-rw-r--r--makefu/0tests/data/secrets/retiolum.rsa_key.pub (renamed from makefu/6tests/data/secrets/retiolum.rsa_key.pub)0
-rw-r--r--makefu/0tests/data/secrets/sambacred (renamed from makefu/6tests/data/secrets/sambacred)0
-rw-r--r--makefu/0tests/data/secrets/shackspace-gitlab-ci-token.nix (renamed from makefu/6tests/data/secrets/shackspace-gitlab-ci-token.nix)0
-rw-r--r--makefu/0tests/data/secrets/ssh.id_ed25519 (renamed from makefu/6tests/data/secrets/ssh.id_ed25519)0
-rw-r--r--makefu/0tests/data/secrets/ssh.makefu.id_rsa (renamed from makefu/6tests/data/secrets/ssh.makefu.id_rsa)0
-rw-r--r--makefu/0tests/data/secrets/ssh.makefu.id_rsa.pub (renamed from makefu/6tests/data/secrets/ssh.makefu.id_rsa.pub)0
-rw-r--r--makefu/0tests/data/secrets/ssh_host_ed25519_key (renamed from makefu/6tests/data/secrets/ssh_host_ed25519_key)0
-rw-r--r--makefu/0tests/data/secrets/ssh_host_rsa_key (renamed from makefu/6tests/data/secrets/ssh_host_rsa_key)0
-rw-r--r--makefu/0tests/data/secrets/tinc.krebsco.de.crt (renamed from makefu/6tests/data/secrets/tinc.krebsco.de.crt)0
-rw-r--r--makefu/0tests/data/secrets/tinc.krebsco.de.key (renamed from makefu/6tests/data/secrets/tinc.krebsco.de.key)0
-rw-r--r--makefu/0tests/data/secrets/tw-pass.ini (renamed from makefu/6tests/data/secrets/tw-pass.ini)0
-rw-r--r--makefu/0tests/data/secrets/wildcard.krebsco.de.crt (renamed from makefu/6tests/data/secrets/wildcard.krebsco.de.crt)0
-rw-r--r--makefu/0tests/data/secrets/wildcard.krebsco.de.key (renamed from makefu/6tests/data/secrets/wildcard.krebsco.de.key)0
-rw-r--r--makefu/1systems/omo/source.nix1
-rw-r--r--makefu/1systems/wbob/config.nix2
-rw-r--r--makefu/1systems/x/config.nix47
-rw-r--r--makefu/2configs/hw/bluetooth.nix39
-rw-r--r--makefu/2configs/hw/irtoy.nix15
-rw-r--r--makefu/2configs/hw/rad1o.nix (renamed from makefu/2configs/rad1o.nix)0
-rw-r--r--makefu/2configs/tools/all.nix1
-rw-r--r--makefu/2configs/tools/core.nix9
-rw-